diff --git a/Makefile b/Makefile
index 2e9921b..78d036b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: init install link unlink rebuild update purge edit gen-hardware help
+.PHONY: init install link unlink rebuild update purge edit hw help
 
 NIXOS_DIR := /etc/nixos
 REPO_DIR := $(shell pwd)
@@ -14,7 +14,7 @@ help:
 	@echo "NixOS Config"
 	@echo ""
 	@echo "  make init     - first time setup"
-	@echo "  make gen-hardware - generate hardware-configuration.nix"
+	@echo "  make hw       - generate hardware-configuration.nix"
 	@echo "  make rebuild  - rebuild nixos"
 	@echo "  make update   - upgrade + rebuild"
 	@echo "  make purge    - garbage collect"
@@ -23,7 +23,7 @@ help:
 	@echo "  make edit     - edit settings.nix"
 
 init:
-	@$(MAKE) --no-print-directory gen-hardware
+	@$(MAKE) --no-print-directory hw
 	@$(MAKE) --no-print-directory link
 	@echo ""
 	@echo "done. run 'make rebuild' when ready"
@@ -60,7 +60,7 @@ purge:
 check:
 	nix-instantiate '<nixpkgs/nixos>' -A system --dry-run
 
-gen-hardware:
+hw:
 	sudo nixos-generate-config --show-hardware-config > hardware-configuration.nix
 
 edit:
diff --git a/configuration.nix b/configuration.nix
index dce9557..2666c62 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -16,7 +16,7 @@
     ./modules/services.nix
     ./modules/aliases.nix
     ./modules/assets.nix
-    ./modules/home-manager.nix
+    ./modules/home.nix
   ];
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
diff --git a/modules/aliases.nix b/modules/aliases.nix
index 5557cc4..a98e140 100644
--- a/modules/aliases.nix
+++ b/modules/aliases.nix
@@ -9,7 +9,7 @@
     "nix:edit" = "$EDITOR /etc/nixos";
     "nix:push" = "cd /etc/nixos && git add -A && git commit -m \"$(date -u +%s)\" && git push";
     "nix:pull" = "cd /etc/nixos && git pull";
-    "nix:gen-hardware" = "sudo nixos-generate-config --show-hardware-config > /etc/nixos/hardware-configuration.nix";
+    "nix:hw" = "sudo nixos-generate-config --show-hardware-config > /etc/nixos/hardware-configuration.nix";
 
     # Utilities
     "fixaudio" = "systemctl --user restart pipewire pipewire-pulse wireplumber";
diff --git a/modules/home-manager.nix b/modules/home.nix
similarity index 97%
rename from modules/home-manager.nix
rename to modules/home.nix
index f2ff3ef..0dd59ff 100644
--- a/modules/home-manager.nix
+++ b/modules/home.nix
@@ -11,6 +11,7 @@ let
     ./home/packages.nix
     ./home/git.nix
     ./home/gnome.nix
+    ./home/cli.nix
     ./home/librewolf.nix
     ./home/zed.nix
     ./home/ghostty.nix
diff --git a/modules/home/cli.nix b/modules/home/cli.nix
new file mode 100644
index 0000000..8fa96ff
--- /dev/null
+++ b/modules/home/cli.nix
@@ -0,0 +1,44 @@
+{ pkgs, ... }:
+
+{
+  programs.starship = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    settings = {
+      add_newline = false;
+      character = {
+        success_symbol = "[➜](bold green)";
+        error_symbol = "[➜](bold red)";
+      };
+    };
+  };
+
+  programs.zoxide = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+  };
+
+  programs.eza = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    git = true;
+    icons = "auto";
+  };
+
+  programs.bat = {
+    enable = true;
+    config = {
+      theme = "Catppuccin Macchiato";
+    };
+  };
+
+  programs.direnv = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    nix-direnv.enable = true;
+  };
+}
diff --git a/modules/home/gnome.nix b/modules/home/gnome.nix
index ae32ad6..4a08fd7 100644
--- a/modules/home/gnome.nix
+++ b/modules/home/gnome.nix
@@ -5,6 +5,7 @@
     "org/gnome/desktop/interface" = {
       color-scheme = "prefer-dark";
       accent-color = "pink";
+      clock-show-weekday = true;
     };
 
     "org/gnome/system/location" = {
@@ -15,5 +16,14 @@
       picture-uri = "file://${config.home.homeDirectory}/Assets/wallpapers/unicat.png";
       picture-uri-dark = "file://${config.home.homeDirectory}/Assets/wallpapers/unicat.png";
     };
+
+    "org/gnome/desktop/peripherals/mouse" = {
+      accel-profile = "flat";
+    };
+
+    "org/gnome/settings-daemon/plugins/media-keys" = {
+      home = [ "<Super>e" ];
+      www = [ "<Super>b" ];
+    };
   };
 }