diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..3550a30
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.gitignore b/.gitignore
index 1df9283..e81be07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,7 @@ result-*
 # ---> Kate
 # Ignore kate's swap files
 *.kate-swp
+
+
+# ---> Direnv
+.direnv
diff --git a/.justfile b/.justfile
new file mode 100644
index 0000000..64c0604
--- /dev/null
+++ b/.justfile
@@ -0,0 +1,17 @@
+# Hide the default option from the recipes list
+_default: print-recipes
+
+find-results:
+    find . -name '*result*'
+
+print-recipes:
+    @just --list
+
+alias build := build-nixos
+# Build a NixOS configuration
+build-nixos host=`hostname`:
+    nixos-rebuild build --flake .#{{host}}
+
+# nix-diff with some parameters piped to less
+nix-diff left right:
+    nix-diff --color=always --skip-already-compared {{left}} {{right}} | less -F
diff --git a/flake.nix b/flake.nix
index c38ecab..283a6e4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -101,13 +101,15 @@
 	in
 	{
 		devShells.x86_64-linux.default = nixpkgs.legacyPackages.x86_64-linux.mkShell {
-			name = "Environment for toast's nixos configurations";
+			name = "toast-devshell";
 			# The agenix cli is not needed to activate a configuration, so instead of installing it
 			# I'll just add it to de devShell, since that's the only real time I'm going to use it.
 			packages = with nixpkgs.legacyPackages.x86_64-linux; [
 				agenix.packages.x86_64-linux.default
 				git
 				nix-diff
+				just
+				nix-diff
 			];
 			shellHook =''
 				export PS1="$PS1(toast-configs)> "
diff --git a/roles/common/programs/bash.nix b/roles/common/programs/bash.nix
index c1684bf..a87dea5 100644
--- a/roles/common/programs/bash.nix
+++ b/roles/common/programs/bash.nix
@@ -2,6 +2,9 @@
 
 {
 	home-manager.users.toast = { config, ... }: {
-			programs.bash.enable = true;
+		programs.bash = {
+			enable = true;
+			enableVteIntegration = true;
 		};
+	};
 }
diff --git a/roles/common/programs/default.nix b/roles/common/programs/default.nix
index 8641b50..bc89f3a 100755
--- a/roles/common/programs/default.nix
+++ b/roles/common/programs/default.nix
@@ -14,6 +14,7 @@
 		./bat.nix
 		./btop.nix
 		./helix.nix
+		./direnv.nix
 	];
 	# Some programs dont have a programs.*.enable option, so I install their package here
 	environment.systemPackages = with pkgs; [
diff --git a/roles/common/programs/direnv.nix b/roles/common/programs/direnv.nix
new file mode 100644
index 0000000..c0ab11a
--- /dev/null
+++ b/roles/common/programs/direnv.nix
@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+  programs.direnv = {
+    enable = true;
+    nix-direnv = {
+      enable = true;
+    };
+  };
+}