diff --git a/home/christoph/default.nix b/home/christoph/default.nix
index 00d5bc5d..fec871a0 100644
--- a/home/christoph/default.nix
+++ b/home/christoph/default.nix
@@ -23,50 +23,52 @@ rec {
     # inputs.nixvim.homeManagerModules.nixvim
   ];
 
-  # Config my modules
-  modules.emacs = {
-    enable = true;
-    pgtkNativeComp = true;
+  modules = {
+    # Config my modules
+    emacs = {
+      enable = true;
+      pgtkNativeComp = true;
 
-    doom.enable = true;
-    doom.autoSync = true;
-    doom.autoUpgrade = false; # Very volatile as the upgrade fails sometimes with bleeding edge emacs
-  };
+      doom.enable = true;
+      doom.autoSync = true;
+      doom.autoUpgrade = false; # Very volatile as the upgrade fails sometimes with bleeding edge emacs
+    };
 
-  modules.firefox = {
-    enable = true;
-    wayland = true;
-    vaapi = true;
-    disableTabBar = true;
-  };
+    firefox = {
+      enable = true;
+      wayland = true;
+      vaapi = true;
+      disableTabBar = true;
+    };
 
-  modules.flatpak = {
-    enable = true;
-    autoUpdate = true;
-    autoPrune = true;
+    fish.enable = true;
 
-    discord.enable = false;
-    spotify.enable = true;
-  };
+    flatpak = {
+      enable = true;
+      autoUpdate = true;
+      autoPrune = true;
 
-  modules.kitty = {
-    enable = true;
-  };
+      discord.enable = false;
+      spotify.enable = true;
+    };
 
-  modules.misc = {
-    enable = true;
+    kitty.enable = true;
 
-    keepass = {
+    misc = {
+      enable = true;
+
+      keepass = {
+        enable = true;
+        autostart = true;
+      };
+    };
+
+    nextcloud = {
       enable = true;
       autostart = true;
     };
   };
 
-  modules.nextcloud = {
-    enable = true;
-    autostart = true;
-  };
-
   # TODO: Gnome terminal config
   # TODO: Autostart keepass
   # TODO: Store the external binaries for my derivations in GitHub LFS (Vital, NeuralDSP, other plugins etc.)
@@ -283,77 +285,6 @@ rec {
 
     # feh.enable = true; # Use gnome apps for now
 
-    fish = {
-      enable = true;
-      # functions = {};
-      # plugins = [];
-      shellAbbrs = {
-        c = "clear";
-        q = "exit";
-        h = "history | bat";
-        r = "ranger --choosedir=$HOME/.rangerdir; set LASTDIR (cat $HOME/.rangerdir); cd $LASTDIR";
-
-        cd = "z";
-        cp = "cp -i";
-        ls = "exa --color always --group-directories-first -F --git --icons"; # color-ls
-        lsl = "exa --color always --group-directories-first -F -l --git --icons";
-        lsa = "exa --color always --group-directories-first -F -l -a --git --icons";
-        tre = "exa --color always --group-directories-first -F -T -L 2 ---icons";
-        mkd = "mkdir -p";
-
-        blk = "lsblk -o NAME,LABEL,UUID,FSTYPE,SIZE,FSUSE%,MOUNTPOINT,MODEL | bat";
-        fsm = "df -h | bat";
-        grp = "grep --color=auto -E";
-        fzp = "fzf --preview 'bat --color=always --style=numbers --line-range=:500 {}'";
-        fre = "free -m";
-        wat = "watch -d -c -n -0.5";
-        dus = "sudo dust -r";
-        dsi = "sudo du -sch . | bat";
-        prc = "procs -t";
-
-        lg = "lazygit";
-        gs = "git status";
-        gcm = "git commit -m";
-        ga = "git add";
-        glg = "git log --graph --decorate --oneline";
-        gcl = "git clone";
-
-        vpnat = "protonvpn-cli c --cc at";
-        vpnch = "protonvpn-cli c --cc ch";
-        vpnlu = "protonvpn-cli c --cc lu";
-        vpnus = "protonvpn-cli c --cc us";
-        vpnhk = "protonvpn-cli c --cc hk";
-        vpnkr = "protonvpn-cli c --cc kr";
-        vpnoff = "protonvpn-cli d";
-
-        # This doesn't work at all, many things crash, no internet etc.
-        # gnome = "dbus-run-session gnome-session"; # Requires XDG_SESSION_TYPE to be set for wayland
-
-        failed = "systemctl --failed";
-        errors = "journalctl -p 3 -xb";
-
-        rsync = "rsync -chavzP --info=progress2";
-        performance = "sudo cpupower frequency-set -g performance && nvidia-settings -a [gpu:0]/GPUPowerMizerMode=1";
-        powersave = "sudo cpupower frequency-set -g powersave && nvidia-settings -a [gpu:0]/GPUPowerMizerMode=0";
-
-        xxhamster = "TERM=ansi ssh christoph@217.160.142.51";
-
-        mp4 = "yt-dlp -f 'bv*[ext=mp4]+ba[ext=m4a]/b[ext=mp4] / bv*+ba/b' --recode-video mp4"; # the -f options are yt-dlp defaults
-        mp3 = "yt-dlp -f 'ba' --extract-audio --audio-format mp3";
-      };
-      shellAliases = {
-        # ".." = "cd ..";
-        "please" = "sudo !!";
-        "yeet" = "rm -rf";
-      };
-      shellInit = ''
-        set -e fish_greeting
-      '';
-      # promptInit = ''
-      #   any-nix-shell fish --info-right | source
-      # '';
-    };
-
     fzf = {
       enable = true;
       enableFishIntegration = true;
diff --git a/home/christoph/nixinator/default.nix b/home/christoph/nixinator/default.nix
index f6f18724..762eadea 100644
--- a/home/christoph/nixinator/default.nix
+++ b/home/christoph/nixinator/default.nix
@@ -7,39 +7,41 @@ rec {
     ../../../modules
   ];
 
-  modules.audio = {
-    enable = true;
+  modules = {
+    audio = {
+      enable = true;
 
-    carla.enable = true;
-    bitwig.enable = true;
-    tenacity.enable = true;
+      carla.enable = true;
+      bitwig.enable = true;
+      tenacity.enable = true;
 
-    faust.enable = true;
-    bottles.enable = true;
-    yabridge.enable = true;
-    yabridge.autoSync = true;
+      faust.enable = true;
+      bottles.enable = true;
+      yabridge.enable = true;
+      yabridge.autoSync = true;
 
-    noisesuppression = {
-       noisetorch.enable = true;
-       noisetorch.autostart = true;
+      noisesuppression = {
+         noisetorch.enable = true;
+         noisetorch.autostart = true;
+      };
+
+      vcvrack.enable = true;
+      # vital.enable = true;
+      distrho.enable = true;
     };
 
-    vcvrack.enable = true;
-    # vital.enable = true;
-    distrho.enable = true;
-  };
-
-  modules.gaming = {
-    enable = true;
-
-    polymc.enable = true;
-    bottles.enable = true;
-    discordChromium.enable = true;
-
-    steam = {
+    gaming = {
       enable = true;
-      protonGE = true;
-      gamescope = true;
+
+      polymc.enable = true;
+      bottles.enable = true;
+      discordChromium.enable = true;
+
+      steam = {
+        enable = true;
+        protonGE = true;
+        gamescope = true;
+      };
     };
   };
 }
diff --git a/home/christoph/nixtop/default.nix b/home/christoph/nixtop/default.nix
index 449c91e5..5b78fd4f 100644
--- a/home/christoph/nixtop/default.nix
+++ b/home/christoph/nixtop/default.nix
@@ -7,17 +7,19 @@ rec {
     ../../../modules
   ];
 
-  # TODO: Validate that this doesn't install too much
-  modules.gaming = {
-    enable = true;
-    discordChromium.enable = true;
-  };
+  modules = {
+    # TODO: Validate that this doesn't install too much
+    gaming = {
+      enable = true;
+      discordChromium.enable = true;
+    };
 
-  modules.audio = {
-    enable = true;
-    noisesuppression = {
-      noisetorch.enable = true;
-      noisetorch.autostart = true;
+    audio = {
+      enable = true;
+      noisesuppression = {
+        noisetorch.enable = true;
+        noisetorch.autostart = true;
+      };
     };
   };
 }
\ No newline at end of file
diff --git a/modules/default.nix b/modules/default.nix
index d6955394..c7d9abf4 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -5,6 +5,7 @@
     ./audio.nix
     ./emacs.nix
     ./firefox.nix
+    ./fish.nix
     ./flatpak.nix
     ./gaming.nix
     ./kitty.nix
diff --git a/modules/kitty.nix b/modules/kitty.nix
index 67a1da5e..5f74145c 100644
--- a/modules/kitty.nix
+++ b/modules/kitty.nix
@@ -22,6 +22,7 @@ in {
         name = "Victor Mono SemiBold";
         size = 12;
       };
+
       settings = {
         editor = (if cfgnv.enable then "nvim" else "nano");
         scrollback_lines = 10000;
@@ -51,6 +52,7 @@ in {
         # color14 = "#ccab53";
         # color15 = "#d2b3ff";
       };
+
       keybindings = {
         "kitty_mod+j" = "next_window";
         "kitty_mod+k" = "previous_window";
diff --git a/modules/neovim.nix b/modules/neovim.nix
index 6171276f..a9d05f15 100644
--- a/modules/neovim.nix
+++ b/modules/neovim.nix
@@ -13,9 +13,9 @@ in {
   };
 
   config = mkIf cfg.enable {
-
     programs.neovim = {
       enable = true;
+
       extraConfig = ''
         set incsearch
         set hlsearch
@@ -39,6 +39,7 @@ in {
         let printencoding='utf-8'
         set encoding=utf-8
       '';
+
       plugins = with pkgs.vimPlugins; [
         # vim-nix
         surround-nvim
@@ -77,6 +78,7 @@ in {
           '';
         }
       ];
+
       viAlias = cfg.alias;
       vimAlias = cfg.alias;
     };