move

home-manager/common.nix

@@ -1,7 +1,11 @@
 { lib
 , pkgs
 , ...
-}: {
+}:
+let
+  customPkgs = import ../custom-pkgs/default.nix pkgs;
+in
+{
   programs.neovim.enable = true;
 
   home.file.".cargo/config.toml" = {
@@ -21,6 +25,20 @@
     enable = true;
   };
 
+  programs.fish = {
+    enable = true;
+    interactiveShellInit = ''
+      set fish_greeting # Disable greeting
+    '';
+    shellAbbrs = {
+      flamegraph = "perf script | inferno-collapse-perf | inferno-flamegraph > out.svg && firefox out.svg";
+      g = "git";
+    };
+    shellAliases = {
+      x = "CARGO_MOMMYS_ACTUAL=${lib.getExe customPkgs.x} ${lib.getExe' pkgs.cargo-mommy "cargo-mommy"}";
+    };
+  };
+
   programs.home-manager.enable = true;
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion

home-manager/desktop.nix

@@ -1,8 +1,7 @@
 # This is your home-manager configuration file
 # Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
 
-{ lib
-, pkgs
+{ pkgs
 , inputs
 , ...
 }:
@@ -41,21 +40,6 @@ in
     rustup
   ] ++ import ./common-packages.nix { inherit pkgs inputs; };
 
-  programs.fish = {
-    enable = true;
-    interactiveShellInit = ''
-      set fish_greeting # Disable greeting
-      set PAGER # unset PAGER to make jj behave properly
-    '';
-    shellAbbrs = {
-      flamegraph = "perf script | inferno-collapse-perf | inferno-flamegraph > out.svg && firefox out.svg";
-      g = "git";
-    };
-    shellAliases = {
-      x = "CARGO_MOMMYS_ACTUAL=${lib.getExe customPkgs.x} ${lib.getExe' pkgs.cargo-mommy "cargo-mommy"}";
-    };
-  };
-
   # Nicely reload system units when changing configs
   systemd.user.startServices = "sd-switch";
 }

nixos/configuration.nix

@@ -86,7 +86,6 @@ in
     useOSProber = true;
     minegrub-theme = {
       enable = true;
-      # splash = ":3";
     };
   };