diff --git a/homes/x86_64-linux/cholli@workvm/default.nix.bak b/homes/x86_64-linux/cholli@workvm/default.nix.bak
deleted file mode 100644
index f353ce6..0000000
--- a/homes/x86_64-linux/cholli@workvm/default.nix.bak
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}:
-# User information gathered by Snowfall Lib is available.
-let
-  name = config.snowfallorg.user.name;
-  home = config.snowfallorg.user.home.directory;
-in {
-  home = {
-    packages = with pkgs; [neovim];
-
-    sessionVariables = {EDITOR = "nvim";};
-
-    shellAliases = {
-      vim = "nvim";
-      vimdiff = "nvim -d";
-    };
-
-    stateVersion = "23.11";
-  };
-}
diff --git a/modules/home/apps/cli-apps/fish/default.nix b/modules/home/apps/cli-apps/fish/default.nix
index ba3dfc9..597cf2f 100644
--- a/modules/home/apps/cli-apps/fish/default.nix
+++ b/modules/home/apps/cli-apps/fish/default.nix
@@ -14,8 +14,18 @@ in {
   };
 
   config = mkIf cfg.enable {
+	home.packages = with pkgs.fishPlugins; [
+			autopair
+			colored-man-pages
+			forgit
+			sponge
+	];
+
     programs = {
-      fish = enabled;
+      fish = {
+	enable = true;
+	shellInit = "zoxide init fish | source";
+      };
 
       starship = {
         enable = true;
@@ -53,7 +63,10 @@ in {
       };
 
       zoxide = {
-	enable = true;
+        enable = true;
+        options = [
+          "--cmd cd"
+        ];
       };
     };
   };
diff --git a/modules/home/apps/cli-apps/kitty/default.nix b/modules/home/apps/cli-apps/kitty/default.nix
index edf6d74..377e015 100644
--- a/modules/home/apps/cli-apps/kitty/default.nix
+++ b/modules/home/apps/cli-apps/kitty/default.nix
@@ -18,17 +18,17 @@ in {
     ];
 
     programs.kitty = {
-			    enable = true;
-    theme = "Tokyo Night";
-    font = {
-      name = "Code New Roman";
-      size = 15;
+      enable = true;
+      theme = "Tokyo Night";
+      font = {
+        name = "Code New Roman";
+        size = 15;
+      };
+      shellIntegration.enableFishIntegration = true;
+      settings = {
+        "background_opacity" = "0.9";
+        "shell" = "fish";
+      };
     };
-    shellIntegration.enableFishIntegration = true;
-    settings = {
-      "background_opacity" = "0.9";
-      "shell" = "fish";
-    };
-    		};
   };
 }
diff --git a/modules/home/tools/direnv/default.nix b/modules/home/tools/direnv/default.nix
index baeb876..89d78a4 100644
--- a/modules/home/tools/direnv/default.nix
+++ b/modules/home/tools/direnv/default.nix
@@ -1,10 +1,14 @@
-{ options, config, lib, pkgs, ... }:
-
-with lib;
-with lib.wyrdgard;
-let cfg = config.wyrdgard.tools.direnv;
-in
 {
+  options,
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+with lib;
+with lib.wyrdgard; let
+  cfg = config.wyrdgard.tools.direnv;
+in {
   options.wyrdgard.tools.direnv = with types; {
     enable = mkBoolOpt false "Whether or not to enable direnv.";
   };
diff --git a/modules/home/tools/git/default.nix b/modules/home/tools/git/default.nix
index a5b30c4..bb46ec1 100644
--- a/modules/home/tools/git/default.nix
+++ b/modules/home/tools/git/default.nix
@@ -1,13 +1,15 @@
-{ lib, config, pkgs, ... }:
-
-let
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
   inherit (lib) types mkEnableOption mkIf;
   inherit (lib.wyrdgard) mkOpt enabled;
 
   cfg = config.wyrdgard.tools.git;
   user = config.wyrdgard.user;
-in
-{
+in {
   options.wyrdgard.tools.git = {
     enable = mkEnableOption "Git";
     userName = mkOpt types.str user.fullName "The name to configure git with.";
@@ -20,8 +22,8 @@ in
       inherit (cfg) userName userEmail;
       lfs = enabled;
       extraConfig = {
-        init = { defaultBranch = "main"; };
-        push = { autoSetupRemote = true; };
+        init = {defaultBranch = "main";};
+        push = {autoSetupRemote = true;};
       };
     };
   };
diff --git a/modules/nixos/submodules/basics/default.nix b/modules/nixos/submodules/basics/default.nix
index 4bb1809..0676fb6 100644
--- a/modules/nixos/submodules/basics/default.nix
+++ b/modules/nixos/submodules/basics/default.nix
@@ -20,6 +20,7 @@ in {
       fd
       tree
       ripgrep
+      fzf
     ];
 
     wyrdgard = {
diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix
index c68916e..60a31f9 100644
--- a/modules/nixos/user/default.nix
+++ b/modules/nixos/user/default.nix
@@ -72,7 +72,7 @@ in {
         }".source =
           cfg.icon;
       };
-          };
+    };
 
     users.users.${cfg.name} =
       {