move all shell related configs into shell.nix

hosts/desktop/configuration.nix

@@ -113,6 +113,7 @@ in
     enable = true;
     xwayland.enable = true;
   };
+  programs.hyprlock.enable = true;
 
   # qt = {
   #   enable = true;
@@ -125,11 +126,7 @@ in
   services.goxlr-utility.enable = true;
   services.flatpak.enable = true;
   services.lact.enable = true;
-  services.rsync.enable = true;
   programs.kdeconnect.enable = true;
-  programs.neovim.enable = true;
-  programs.tmux.enable = true;
-  programs.bat.enable = true;
   programs.git = {
     enable = true;
     config = {

hosts/desktop/home-manager/home.nix

@@ -8,7 +8,7 @@
   imports = [
     ./mpd.nix
     ./programs.nix
-    ../../../modules/fish.nix
+    ../../../modules/shell.nix
     zen-browser.homeModules.beta
   ];
 
@@ -57,16 +57,6 @@
     setAsDefaultBrowser = true;
   };
 
-  programs.eza = {
-    enable = true;
-    enableFishIntegration = true;
-    git = true;
-    icons = "always";
-    extraOptions = [
-      "-1"
-    ];
-  };
-
   programs.rbw = {
     enable = true;
     settings = {

hosts/desktop/home-manager/programs.nix

@@ -1,16 +1,5 @@
 { pkgs, ... }:
 {
-  programs.yazi.enable = true;
-  programs.yazi.enableFishIntegration = true;
-
-  programs.fzf.enable = true;
-  programs.fzf.enableFishIntegration = true;
-
-  programs.lazygit.enable = true;
-  programs.lazygit.enableFishIntegration = true;
-
-  programs.zoxide.enable = true;
-  programs.zoxide.enableFishIntegration = true;
 
   programs.distrobox.enable = true;
   services.podman.enable = true;
@@ -24,15 +13,12 @@
 
   services.polkit-gnome.enable = true;
   services.cliphist.enable = true;
-  programs.btop.enable = true;
   services.udiskie.enable = true;
   programs.cava.enable = true;
   programs.equibop.enable = true;
   services.awww.enable = true;
   services.mpdris2.enable = true;
-  programs.fastfetch.enable = true;
   programs.prismlauncher.enable = true;
-  programs.fd.enable = true;
   programs.uv.enable = true;
   programs.satty.enable = true;
   programs.mpvpaper.enable = true;
@@ -40,8 +26,6 @@
   programs.gcc.enable = true;
   programs.mpv.enable = true;
   programs.imv.enable = true;
-  programs.aria2.enable = true;
-  programs.ripgrep.enable = true;
   programs.librewolf.enable = true;
 
   programs.pywal = {

hosts/desktop/packages.nix

@@ -67,6 +67,9 @@
     nvtopPackages.amd
     android-tools
     scrcpy
+    gocryptfs
+    proton-vpn
+    piper
   ];
 
   fonts.packages = with pkgs; [

hosts/music-server/configuration.nix

@@ -59,11 +59,6 @@
 
   virtualisation.docker.enable = true;
   services.tailscale.enable = true;
-  services.rsync.enable = true;
-  programs.nix-ld.enable = true;
-  programs.neovim.enable = true;
-  programs.tmux.enable = true;
-  programs.bat.enable = true;
   programs.git = {
     enable = true;
     config = {

hosts/music-server/home-manager/home.nix

@@ -1,46 +1,13 @@
-{ pkgs, config, ... }:
 {
   imports = [
     ./beets.nix
-    ../../../modules/fish.nix
+    ../../../modules/shell.nix
   ];
 
   home.username = "user";
   home.homeDirectory = "/home/user";
 
-  programs.yazi.enable = true;
-  programs.yazi.enableFishIntegration = true;
-
-  programs.fzf.enable = true;
-  programs.fzf.enableFishIntegration = true;
-
-  programs.zoxide.enable = true;
-  programs.zoxide.enableFishIntegration = true;
-
-  programs.lazygit.enable = true;
-  programs.lazygit.enableFishIntegration = true;
-
   programs.gcc.enable = true;
 
-  programs.ripgrep.enable = true;
-
-  programs.eza = {
-    enable = true;
-    enableFishIntegration = true;
-    git = true;
-    icons = "always";
-    extraOptions = [
-      "-1"
-    ];
-  };
-
-  programs.btop.enable = true;
-  programs.fastfetch.enable = true;
-  programs.fd.enable = true;
-
-  home.sessionVariables = {
-    EDITOR = "nvim";
-  };
-
   home.stateVersion = "26.05";
 }