meta: Use separate home-manager modules

This makes it easier to use our modules with home-manager on non-NixOS
distributions as needed.

modules/default.nix

@@ -1,31 +1,34 @@
 {
   imports = [
     ./dual-function-keys
-    ./dunst
     ./fcitx5-mozc
-    ./feh
     ./fish-starship
     ./fonts
-    ./git
-    ./gpg
     ./hyprland
     ./joshuto
-    ./kitty
     ./librewolf
-    ./mime-apps
-    ./mpv
-    ./ncmpcpp
     ./neovim
     ./piper
     ./pipewire
-    ./qutebrowser
-    ./rofi
     ./stylix
     ./swaylock
     ./thunar
-    ./waybar
     ./waycorner
     ./xdg-user-dirs
+  ];
+
+  home-manager.sharedModules = [
+    ./dunst
+    ./feh
+    ./git
+    ./gpg
+    ./kitty
+    ./mime-apps
+    ./mpv
+    ./ncmpcpp
+    ./qutebrowser
+    ./rofi
+    ./waybar
     ./zathura
   ];
 }

modules/dunst/default.nix

@@ -1,8 +1,6 @@
 { pkgs, ... }: {
-  environment.systemPackages = [ pkgs.libnotify ];
+  home.pkgs = with pkgs; [ libnotify ];
 
-  home-manager.sharedModules = [
-    {
   services.dunst = {
     enable = true;
 
@@ -25,6 +23,4 @@
       };
     };
   };
-    }
-  ];
 }

modules/feh/default.nix

@@ -1,6 +1,4 @@
 {
-  home-manager.sharedModules = [
-    {
   programs.feh = {
     enable = true;
 
@@ -76,6 +74,4 @@
       menu_select = null;
     };
   };
-    }
-  ];
 }

modules/git/default.nix

@@ -1,10 +1,8 @@
 { pkgs, ... }:
 
 let VARIABLES = import ../../src/variables.nix; in {
-  environment.systemPackages = with pkgs; [ tig git ];
+  home.packages = with pkgs; [ tig ];
 
-  home-manager.sharedModules = [
-    {
   xdg.configFile."tig/config".text = ''
     color cursor black green bold
     color title-focus black blue bold
@@ -57,6 +55,4 @@ let VARIABLES = import ../../src/variables.nix; in {
 
     diff-so-fancy.enable = true;
   };
-    }
-  ];
 }

modules/gpg/default.nix

@@ -1,6 +1,4 @@
 {
-  home-manager.sharedModules = [
-    {
   programs.gpg = {
     enable = true;
     # homedir = "${config.xdg.dataHome}/gnupg"
@@ -22,6 +20,4 @@
     defaultCacheTtl = 43200;
     maxCacheTtl = 43200;
   };
-    }
-  ];
 }

modules/kitty/default.nix

@@ -1,6 +1,4 @@
 let VARIABLES = import ../../src/variables.nix; in {
-  home-manager.sharedModules = [
-    {
   programs.kitty = {
     enable = true;
 
@@ -27,6 +25,4 @@ let VARIABLES = import ../../src/variables.nix; in {
     map g scroll_to start
     map G scroll_to end
   '';
-    }
-  ];
 }

modules/mime-apps/default.nix

@@ -1,6 +1,4 @@
 let VARIABLES = import ../../src/variables.nix; in {
-  home-manager.sharedModules = [
-    {
   xdg.mimeApps = {
     enable = true;
     defaultApplications = {
@@ -13,6 +11,4 @@ let VARIABLES = import ../../src/variables.nix; in {
       "x-scheme-handler/https" = "${VARIABLES.defaultBrowser}.desktop";
     };
   };
-    }
-  ];
 }

modules/mpv/default.nix

@@ -1,8 +1,7 @@
 { pkgs, ... }: {
-  home-manager.sharedModules = [
-    {
   programs.mpv = {
     enable = true;
+
     config = {
       screenshot-format = "png";
       profile = "gpu-hq";
@@ -26,11 +25,10 @@
       osd-duration = 750;
       really-quiet = "yes";
     };
+
     scripts = with pkgs.mpvScripts; [
       mpris
       thumbnail
     ];
   };
-    }
-  ];
 }

modules/ncmpcpp/default.nix

@@ -1,8 +1,8 @@
 { pkgs, ... }:
 
 let VARIABLES = import ../../src/variables.nix; in {
-  home-manager.sharedModules = [
+  home.packages = with pkgs; [ mpc-cli ];
-    {
+
   services.mpd = {
     enable = true;
     musicDirectory = "/home/${VARIABLES.username}/Music";
@@ -58,8 +58,4 @@ let VARIABLES = import ../../src/variables.nix; in {
       mpd_crossfade_time = 3;
     };
   };
-    }
-  ];
-
-  environment.systemPackages = with pkgs; [ mpc-cli ];
 }

modules/qutebrowser/default.nix

@@ -1,6 +1,4 @@
 { pkgs, ... }: {
-  home-manager.sharedModules = [
-    {
   programs.qutebrowser = {
     enable = true;
     package = pkgs.qutebrowser-qt6;
@@ -137,6 +135,4 @@
       }
     '';
   };
-    }
-  ];
 }

modules/rofi/default.nix

@@ -1,6 +1,4 @@
 { lib, ... }: {
-  home-manager.sharedModules = [
-    {
   programs.rofi = {
     enable = true;
     cycle = false;
@@ -23,6 +21,4 @@
 
     theme = lib.mkForce ./launchpad.rasi;
   };
-    }
-  ];
 }

modules/waybar/default.nix

@@ -1,8 +1,4 @@
-{ lib
+{ lib, ... }: {
-, ...
-}: {
-  home-manager.sharedModules = [
-    {
   programs.waybar = {
     enable = true;
 
@@ -155,6 +151,4 @@
       }
     '';
   };
-    }
-  ];
 }

modules/zathura/default.nix

@@ -1,6 +1,4 @@
 {
-  home-manager.sharedModules = [
-    {
   programs.zathura = {
     enable = true;
 
@@ -12,6 +10,4 @@
       scroll-step = 120;
     };
   };
-    }
-  ];
 }