diff --git a/flake.lock b/flake.lock
index e470f95..7404279 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,23 @@
 {
   "nodes": {
+    "catppuccin": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1789553013,
+        "narHash": "sha256-W5dvgFOuVs24X3G5tUb8C2IHU7ICXNvyGPiWWFjfbuo=",
+        "owner": "catppuccin",
+        "repo": "nix",
+        "rev": "89b3eacf59d6b5eefbc2d69c3a4eb5aaf66d63bc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -58,6 +76,19 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1789044656,
+        "narHash": "sha256-sDGcZgdRVR58ceKz0RmkBtdUomBvu5vzbf6Aw5rUCo0=",
+        "rev": "1927682e0d808b4a695910f76562b11e2ddecab4",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1070934.1927682e0d80/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1790463110,
         "narHash": "sha256-hKlVl12B1dF0Q5vd9dY3lIJM5mFGWYSlXwSLAqHZ1+s=",
@@ -92,10 +123,11 @@
     },
     "root": {
       "inputs": {
+        "catppuccin": "catppuccin",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",
         "nix4nvchad": "nix4nvchad",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "sops-nix": "sops-nix"
       }
     },
diff --git a/flake.nix b/flake.nix
index b92ed8f..df7e5d4 100755
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,7 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest";
+    catppuccin.url = "github:catppuccin/nix";
 
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -28,9 +29,11 @@
         nixpkgs.lib.nixosSystem {
           specialArgs = { inherit inputs; };
           modules = [
-            inputs.home-manager.nixosModules.default
+            inputs.home-manager.nixosModules.home-manager
             inputs.nix-flatpak.nixosModules.nix-flatpak
             inputs.sops-nix.nixosModules.sops
+            inputs.catppuccin.nixosModules.catppuccin
+            { home-manager.sharedModules = [inputs.catppuccin.homeModules.catppuccin];}
             ./hosts/${hostname}
           ];
         };
diff --git a/modules/base.nix b/modules/base.nix
index 04ad48b..18a267a 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -82,6 +82,13 @@
           STARSHIP_LOG = "error";
         };
       };
+
     };
   };
+  catppuccin = {
+    accent = "mauve";
+    autoEnable = true;
+    enable = true;
+    flavor = "macchiato";
+  };
 }
diff --git a/modules/terminal/fish-functions/ranger.fish b/modules/terminal/fish-functions/ranger.fish
deleted file mode 100644
index 3ff72eb..0000000
--- a/modules/terminal/fish-functions/ranger.fish
+++ /dev/null
@@ -1,12 +0,0 @@
-
-set tempfile '/tmp/chosendir'
-command ranger --choosedir=$tempfile (pwd) $argv
-
-if test -f $tempfile
- if [ (cat $tempfile) != (pwd) ]
-  cd (cat $tempfile)
- end
-end
-
-rm -f $tempfile
-
diff --git a/modules/terminal/fish.nix b/modules/terminal/fish.nix
index d782b25..7fae89e 100644
--- a/modules/terminal/fish.nix
+++ b/modules/terminal/fish.nix
@@ -16,11 +16,11 @@ in
   home-manager.users.djai.programs.fish = {
     enable = true;
     binds = {
-      "\cf" = {
+      "ctrl-f" = {
         command = "forward-char";
         mode = "insert";
       };
-      "\ef" = {
+      "alt-f" = {
         command = "forward-word";
         mode = "insert";
       };
@@ -32,12 +32,12 @@ in
       end
 
       [ -d "$HOME/.cargo/env.fish" ] && source "$HOME/.cargo/env.fish"
+      set -g fish_greeting
     '';
 
     interactiveShellInit = ''
       fish_vi_key_bindings
       starship init fish | source
-      fish_config theme choose "Catppuccin Macchiato"
 
       if test -n "$TMUX"
         ascii.sh
diff --git a/modules/terminal/kitty.nix b/modules/terminal/kitty.nix
index 672f53d..133c537 100644
--- a/modules/terminal/kitty.nix
+++ b/modules/terminal/kitty.nix
@@ -15,7 +15,7 @@
 
       "ctrl+shift+n" = "new_os_window_with_cwd";
     };
-    themeFile = "Catppuccin-Macchiato";
+    themeFile = "Catppuccin-Macchiato"; # FIXME: borked in home manager?
 
     settings = {
       shell = "${pkgs.fish}/bin/fish";