diff --git a/Makefile b/Makefile
index 1a341364..54a7e01b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,9 @@
 
 test:
 	sudo nixos-rebuild test --flake .
-	make hyprland
-	make waybar
 
 switch:
 	sudo nixos-rebuild switch --flake .
-	make hyprland
-	make waybar
 
 build:
 	sudo nixos-rebuild build --flake .
@@ -30,4 +26,4 @@ waybar:
 	-hyprctl dispatch exec waybar
 
 home:
-	home-manager switch --flake .
+	nix run nixpkgs#home-manager switch --flake .
diff --git a/home/tui/default.nix b/home/tui/default.nix
index c7bc72b6..18514eac 100644
--- a/home/tui/default.nix
+++ b/home/tui/default.nix
@@ -1,4 +1,5 @@
 {pkgs, ...}: {
+  imports = [./gitui.nix];
   home.packages = with pkgs; [
     curl
     dig
diff --git a/home/tui/gitui.nix b/home/tui/gitui.nix
new file mode 100644
index 00000000..0c9d88f7
--- /dev/null
+++ b/home/tui/gitui.nix
@@ -0,0 +1,19 @@
+{pkgs, ...}: {
+  programs.gitui = {
+    enable = true;
+    keyConfig = builtins.readFile (pkgs.fetchFromGitHub {
+        owner = "extrawurst";
+        repo = "gitui";
+        rev = "8f7f35b8a97e38a0e181032285554cd0961d588e";
+        sha256 = "sha256-zJDf6WhaUe8QTPCoVAdfCdUvYEcQpm2qddQiKw41kjY=";
+      }
+      + "/vim_style_key_config.ron");
+    theme = builtins.readFile (pkgs.fetchFromGitHub {
+        owner = "catppuccin";
+        repo = "gitui";
+        rev = "3c97c7af7247b1e0f4366a4d8fab650bcce54100";
+        sha256 = "sha256-m6Tjch6A2ZPZ3/muvb/9sEAQUZfjnWqcwyhNVeqPS2c=";
+      }
+      + "/theme/macchiato.ron");
+  };
+}