diff --git a/hmModules/discord/default.nix b/hmModules/discord/default.nix
index f750cb7..90f6d31 100644
--- a/hmModules/discord/default.nix
+++ b/hmModules/discord/default.nix
@@ -1,9 +1,6 @@
 { pkgs, ... }:
 {
-  home.packages = [ (pkgs.discord.override {
-    withOpenASAR = true;
-    withVencord = true;
-  }) ];
+  home.packages = [ pkgs.discord ];
   home.file.".config/discord/settings.json".text = builtins.toJSON {
     SKIP_HOST_UPDATE = true;
   };
diff --git a/hmModules/emacs/default.nix b/hmModules/emacs/default.nix
index 61afd35..39717d3 100644
--- a/hmModules/emacs/default.nix
+++ b/hmModules/emacs/default.nix
@@ -48,7 +48,6 @@ in
       kdePackages.qtwayland
       copilot-node-server
       math-preview
-      emacs-lsp-booster
     ]
     ++ (with hunspellDicts; [
       en_US-large
diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el
index a09038d..ba64445 100644
--- a/hmModules/emacs/init.el
+++ b/hmModules/emacs/init.el
@@ -37,10 +37,6 @@
   (consult-eglot-embark-mode)
   )
 
-(use-package eglot-booster
-  :after eglot
-  :config (eglot-booster-mode))
-
 (use-package emacs
   :bind (("<mouse-4>" . scroll-down-line)
 	 ("<mouse-5>" . scroll-up-line)
diff --git a/hmModules/git/default.nix b/hmModules/git/default.nix
index 52fcf80..424c4b9 100644
--- a/hmModules/git/default.nix
+++ b/hmModules/git/default.nix
@@ -33,12 +33,6 @@ in
 
       credential.helper = "manager";
       credential.credentialStore = "cache";
-
-      core = {
-	fsmonitor = true;
-	untrackedcache = true;
-      };
-      fetch.writeCommitGraph = true;
     };
 
     userName = config.name;
diff --git a/hmModules/niri/config.kdl b/hmModules/niri/config.kdl
index cfbc2f4..c0045cd 100644
--- a/hmModules/niri/config.kdl
+++ b/hmModules/niri/config.kdl
@@ -351,11 +351,11 @@ binds {
     Mod+B { spawn "firefox"; }
     Mod+RETURN { spawn "emacsclient" "-c" "--eval" "(ccr/start-eshell)"; }
     Mod+M { spawn "emacsclient" "-c" "--eval" "(notmuch-search \"tag:new\")"; }
-    Mod+G { spawn "emacsclient" "-c" "--eval" "(switch-to-buffer (gptel \"*ChatGPT*\"))" "-F" "((name . \"GPTel - Emacs\") (width . $NIRI_GPTEL_COLS) (height . $NIRI_GPTEL_ROWS))'"; }
+    Mod+G { spawn "emacsclient" "-c" "--eval" "(switch-to-buffer (gptel \"*ChatGPT*\"))" "-F" "((name . \"GPTel - Emacs\") (width . 150) (height . 60))'"; }
     Mod+Shift+C { spawn "emacsclient" "-c" "--eval" "(org-roam-dailies-capture-today)"; }
     Mod+Alt+L { spawn "swaylock"; }
     Mod+Space { spawn "rofi" "-show" "menu" "-modi" "menu:rofi-power-menu"; }
-    Mod+Ctrl+b { spawn "foot" "--title='bTop'" "-W" "NIRI_BTOP_COLSx$NIRI_BTOP_ROWS" "btop";}
+    Mod+Ctrl+b { spawn "foot" "--title='bTop'" "-W" "210x60" "btop";}
 
     // Example volume keys mappings for PipeWire & WirePlumber.
     // The allow-when-locked=true property makes them work even when the session is locked.
diff --git a/hmModules/niri/default.nix b/hmModules/niri/default.nix
index cbeea6e..9210926 100644
--- a/hmModules/niri/default.nix
+++ b/hmModules/niri/default.nix
@@ -33,25 +33,10 @@
     fi
   '';
 
-  home.sessionVariables = let
-    niriVars = {
-      picard = {
-	NIRI_GPTEL_ROWS = 60;
-	NIRI_GPTEL_COLS = 150;
-	NIRI_BTOP_ROWS = 210;
-	NIRI_BTOP_COLS = 60;
-      };
-      kirk = {
-	NIRI_GPTEL_ROWS = 40;
-	NIRI_GPTEL_COLS = 140;
-	NIRI_BTOP_ROWS = 140;
-	NIRI_BTOP_COLS = 40;
-      };
-    };
-  in {
+  home.sessionVariables = {
     DISPLAY = ":0";
     QT_QPA_PLATFORM = "wayland";
-  } // (niriVars."${config.networking.hostname}" or niriVars.kirk);
+  };
 
   programs.rofi = {
     enable = true;
diff --git a/hosts/kirk/default.nix b/hosts/kirk/default.nix
index 0835424..5bb2927 100644
--- a/hosts/kirk/default.nix
+++ b/hosts/kirk/default.nix
@@ -57,6 +57,7 @@
       "niri"
       "udiskie"
       "xdg"
+      "spotify"
       "lutris"
       "wine"
       "cura"
diff --git a/modules/mount-sisko/default.nix b/modules/mount-sisko/default.nix
index cd9d1d0..61671a5 100644
--- a/modules/mount-sisko/default.nix
+++ b/modules/mount-sisko/default.nix
@@ -15,7 +15,7 @@
     source = "${pkgs.nfs-utils.out}/bin/mount.nfs";
   };
 
-  fileSystems."/mnt/nas" = {
+  fileSystems."/home/${config.ccr.username}/nas" = {
     device = "sisko.fleet:/hd";
     fsType = "nfs";
     options = [
diff --git a/packages/emacs/packages.nix b/packages/emacs/packages.nix
index 74b0068..af76056 100644
--- a/packages/emacs/packages.nix
+++ b/packages/emacs/packages.nix
@@ -98,16 +98,6 @@ let
       };
       deps = [ ];
     };
-    eglot-booster = buildEmacsPackage {
-      name = "eglot-booster";
-      src = pkgs.fetchFromGitHub {
-        owner = "jdtsmith";
-        repo = "eglot-booster";
-        rev = "e6daa6bcaf4aceee29c8a5a949b43eb1b89900ed";
-        hash = "sha256-PLfaXELkdX5NZcSmR1s/kgmU16ODF8bn56nfTh9g6bs=";
-      };
-      deps = [ ];
-    };
   };
 
   # *List* containing emacs packages from (M)ELPA