Refactor shared module

2 files changed, 13 insertions, 68 deletions

diff --git a/hosts/wonderland/default.nix b/hosts/wonderland/default.nix
index a314706..2510696 100644
--- a/hosts/wonderland/default.nix
+++ b/hosts/wonderland/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, flakeRoot, ... }: {
+{ config, pkgs, flakeRoot, inputs, ... }: {
   imports = [
     # Include the results of the hardware scan.
     ./hardware.nix
@@ -7,6 +7,7 @@
     (flakeRoot + /share/system/steam.nix)
     (flakeRoot + /share/system/hyprland.nix)
     #(flakeRoot + /share/system/spotifyd.nix)
+    { _module.args = { inherit inputs; }; }
   ];
 
   nixpkgs.config.allowUnfree = true;
diff --git a/hosts/wonderland/home.nix b/hosts/wonderland/home.nix
index 05d726e..3ca97a0 100644
--- a/hosts/wonderland/home.nix
+++ b/hosts/wonderland/home.nix
@@ -2,85 +2,29 @@
 , flakeRoot
 , inputs
 , ...
-}:
-let
-  desktop-pkgs = with pkgs; [
-    mullvad
-    calibre
-    beekeeper-studio
-    thunderbird
-    brightnessctl
-    cmus # music player
-
-    libreoffice-qt
-    discord
-
-    nsxiv
-    inputs.scripts.packages.${pkgs.system}.image-move
-
-    wineWowPackages.full
-    winetricks
-  ];
-in
-{
+}: {
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    sharedModules = [{ imports = [ (flakeRoot + /share/home) ]; }];
+    sharedModules = [{ imports = [ (flakeRoot + /share/home/hyprdesktop.nix) ]; }];
+    extraSpecialArgs = { inherit inputs; };
   };
 
   home-manager.users.alice = {
-    imports =
-      let
-        home = flakeRoot + /share/home;
-      in
-      [
-        # Config
-        (home + /hyprland.nix)
-        (home + /git.nix)
-        (home + /gallery-dl.nix)
-        (home + /mpv.nix)
-        (home + /firefox)
-      ];
-    home.packages = with pkgs;
-      [
-        signal-desktop
-        tdesktop # Telegram desktop
-        qbittorrent
-        emacs
-        # spotify-qt librespot
-        fluffychat # matrix client
-
-        # Various utils
-        # qemu_kvm
-        tokei # counts lines of code
-        btop # modern top
-        qemu_kvm
-
-        # Gaming
-        jdk17_headless
-        superTuxKart
-      ]
-      ++ desktop-pkgs;
+    imports = [
+      (flakeRoot + /share/home/gallery-dl.nix)
+    ];
 
     services.poweralertd.enable = true;
+    home.packages = with pkgs; [
+      emacs
+      mullvad
+    ];
+
     home.stateVersion = "22.05";
   }; # End of users.alice
 
   home-manager.users.madhatter = {
-    home.packages = desktop-pkgs;
-    imports =
-      let
-        home = flakeRoot + /share/home;
-      in
-      [
-        # Config
-        (home + /kitty.nix)
-        (home + /git.nix)
-        (home + /mpv.nix)
-        (home + /firefox)
-      ];
-
     home.stateVersion = "23.05";
   };