Set Hyprland home module package to same as system module

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/dba414932936fde69f0606b4f1d87c5bc0003ede?narHash=sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE%3D' (2024-11-06)
  → 'github:nixos/nixpkgs/689fed12a013f56d4c4d3f612489634267d86529?narHash=sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI%3D' (2024-11-12)

flake.lock

@@ -220,11 +220,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1730883749,
-        "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=",
+        "lastModified": 1731386116,
+        "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede",
+        "rev": "689fed12a013f56d4c4d3f612489634267d86529",
         "type": "github"
       },
       "original": {

system/default.nix

@@ -56,6 +56,15 @@
       max-free = ${toString (1024 * 1024 * 1024)}
     '';
   };
+  nixpkgs.config.allowUnfreePredicate =
+    pkg:
+    builtins.elem (lib.getName pkg) [
+      "steam"
+      "steam-unwrapped"
+      "steam-original"
+      "steam-run"
+      "nomachine-client"
+    ];
   system.autoUpgrade = {
     enable = true;
     persistent = true;
@@ -122,11 +131,16 @@
     useUserPackages = true;
     backupFileExtension = "backup";
     users.${username} = {
-      imports = [ ./home/default.nix ];
+      imports = [
+        ./home/shell/default.nix
+        ./home/scripts/default.nix
+        ./home/password-store/default.nix
+      ];
       home = {
         inherit username;
         homeDirectory = "/home/${username}";
       };
+      programs.home-manager.enable = true;
     };
     extraSpecialArgs = {
       inherit inputs;
@@ -189,7 +203,7 @@
   console.useXkbConfig = true;
   stylix = {
     enable = true;
-    image = ./home/desktop/wallpapers/tropic_island_day.jpg;
+    image = ./wallpapers/tropic_island_day.jpg;
     base16Scheme = ./one-light.yaml; # Base24 scheme
     polarity = "light";
     opacity.popups = 0.8;

system/desktop.nix

@@ -1,6 +1,5 @@
 { pkgs, username, ... }:
 {
-  home-manager.users.${username}.imports = [ ./home/desktop/default.nix ];
   nixpkgs.config.chromium.commandLineArgs = "--password-store='gnome-libsecret' --enable-features=UseOzonePlatform --ozone-platform=wayland";
   hardware.bluetooth.enable = true;
   environment = {
@@ -15,9 +14,24 @@
       libsecret
       libnotify
       xdg-utils
+      wl-clipboard
       hunspell
       hunspellDicts.en_GB-large
       gnome.nautilus
+      libreoffice-fresh
+      evince
+      image-roll
+      clapper
+      g4music
+      ffmpeg
+      remmina
+      fractal
+      webcord
+      signal-desktop
+      whatsapp-for-linux
+      teams-for-linux
+      twinkle
+      nomachine-client
     ];
   };
   security = {
@@ -96,4 +110,81 @@
     config.common.default = "*"; # TODO change for xdg-desktop-portal > 1.17 changes
     extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
   };
+  home-manager.users.${username} =
+    {
+      config,
+      pkgs,
+      osConfig,
+      ...
+    }:
+    {
+      imports = [
+        ./home/hyprland.nix
+        ./home/email/default.nix
+        ./home/calendar/default.nix
+        ./home/terminal/default.nix
+        ./home/emacs/default.nix
+        ./home/browser/default.nix
+      ];
+      home.file.${config.gtk.gtk2.configLocation}.force = true;
+      services = {
+        syncthing.enable = true;
+        gammastep = {
+          inherit (osConfig.location) latitude longitude provider;
+          enable = true;
+          tray = true;
+        };
+      };
+      gtk = {
+        enable = true;
+        gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
+        iconTheme = {
+          package = (pkgs.papirus-icon-theme.override { color = "magenta"; });
+          name = "Papirus-Light";
+        };
+      };
+      stylix.targets.gtk.extraCss = with config.lib.stylix.scheme.withHashtag; ''
+        @define-color accent_color ${base0E-hex};
+        @define-color accent_bg_color ${base0E-hex};
+      '';
+      xdg = {
+        mime.enable = true;
+        mimeApps =
+          let
+            defaultApplications = import ./mimeapps.nix;
+          in
+          {
+            enable = true;
+            inherit defaultApplications;
+            associations.added = defaultApplications;
+          };
+        userDirs = {
+          enable = true;
+          createDirectories = true;
+          extraConfig = {
+            XDG_PROJECTS_DIR = "${config.home.homeDirectory}/Projects";
+          };
+        };
+        configFile = {
+          # Stop programs from overriding mimeapps
+          "mimeapps.list".force = true;
+          # Ensure GTK config is set
+          "gtk-3.0/gtk.css".force = true;
+          "gtk-3.0/settings.ini".force = true;
+          "gtk-4.0/gtk.css".force = true;
+          "gtk-4.0/settings.ini".force = true;
+          # Autostart some programs
+          "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
+          "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source = "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop";
+          "teams-for-linux/config.json".text = builtins.toJSON {
+            awayOnSystemIdle = true;
+            closeAppOnCross = false;
+            followSystemTheme = true;
+            notificationMethod = "electron";
+            optInTeamsV2 = true;
+            spellCheckerLanguages = [ "en_GB" ];
+          };
+        };
+      };
+    };
 }

system/home/default.nix

@@ -1,9 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./shell/default.nix
-    ./scripts/default.nix
-    ./password-store/default.nix
-  ];
-  programs.home-manager.enable = true;
-}

system/home/desktop/default.nix

@@ -1,94 +0,0 @@
-{
-  config,
-  pkgs,
-  osConfig,
-  ...
-}:
-{
-  imports = [
-    ./hyprland.nix
-    ./email/default.nix
-    ./calendar/default.nix
-    ./terminal/default.nix
-    ./emacs/default.nix
-    ./browser/default.nix
-  ];
-  home = {
-    packages = with pkgs; [
-      wl-clipboard
-      libreoffice-fresh
-      evince
-      image-roll
-      clapper
-      g4music
-      ffmpeg
-      remmina
-      fractal
-      webcord
-      signal-desktop
-      whatsapp-for-linux
-      teams-for-linux
-      twinkle
-    ];
-    file.${config.gtk.gtk2.configLocation}.force = true;
-  };
-  services = {
-    syncthing.enable = true;
-    gammastep = {
-      inherit (osConfig.location) latitude longitude provider;
-      enable = true;
-      tray = true;
-    };
-  };
-  gtk = {
-    enable = true;
-    gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
-    iconTheme = {
-      package = (pkgs.papirus-icon-theme.override { color = "magenta"; });
-      name = "Papirus-Light";
-    };
-  };
-  stylix.targets.gtk.extraCss = with config.lib.stylix.scheme.withHashtag; ''
-    @define-color accent_color ${base0E-hex};
-    @define-color accent_bg_color ${base0E-hex};
-  '';
-  xdg = {
-    mime.enable = true;
-    mimeApps =
-      let
-        defaultApplications = import ./mimeapps.nix;
-      in
-      {
-        enable = true;
-        inherit defaultApplications;
-        associations.added = defaultApplications;
-      };
-    userDirs = {
-      enable = true;
-      createDirectories = true;
-      extraConfig = {
-        XDG_PROJECTS_DIR = "${config.home.homeDirectory}/Projects";
-      };
-    };
-    configFile = {
-      # Stop programs from overriding mimeapps
-      "mimeapps.list".force = true;
-      # Ensure GTK config is set
-      "gtk-3.0/gtk.css".force = true;
-      "gtk-3.0/settings.ini".force = true;
-      "gtk-4.0/gtk.css".force = true;
-      "gtk-4.0/settings.ini".force = true;
-      # Autostart some programs
-      "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
-      "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source = "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop";
-      "teams-for-linux/config.json".text = builtins.toJSON {
-        awayOnSystemIdle = true;
-        closeAppOnCross = false;
-        followSystemTheme = true;
-        notificationMethod = "electron";
-        optInTeamsV2 = true;
-        spellCheckerLanguages = [ "en_GB" ];
-      };
-    };
-  };
-}

system/home/emacs/default.nix

@@ -1,9 +1,9 @@
 { config, pkgs, ... }:
 {
   imports = [
-    ../../shell/default.nix
-    ../../shell/git.nix
-    ../../gpg/default.nix
+    ../shell/default.nix
+    ../shell/git.nix
+    ../gpg/default.nix
   ];
   stylix.targets.emacs.enable = false;
   services.emacs = {

system/home/hyprland.nix

@@ -155,6 +155,7 @@
   };
   wayland.windowManager.hyprland = {
     enable = true;
+    package = osConfig.programs.hyprland.package;
     xwayland.enable = true;
     systemd.enable = true;
     settings = {

system/services/satisfactory/default.nix

@@ -1,13 +1,6 @@
 { lib, ... }:
 {
   imports = [ ./module.nix ];
-  nixpkgs.config.allowUnfreePredicate =
-    pkg:
-    builtins.elem (lib.getName pkg) [
-      "steam-original"
-      "steam-run"
-      "steamcmd"
-    ];
   services.satisfactory-server = {
     enable = true;
     openFirewall = true;

system/steam.nix

@@ -1,19 +1,10 @@
 {
   config,
-  lib,
   pkgs,
   username,
   ...
 }:
 {
-  nixpkgs.config.allowUnfreePredicate =
-    pkg:
-    builtins.elem (lib.getName pkg) [
-      "steam"
-      "steam-unwrapped"
-      "steam-original"
-      "steam-run"
-    ];
   environment = {
     sessionVariables.MANGOHUD = 1;
     systemPackages = [ pkgs.mangohud ];

system/work.nix

@@ -1,12 +1,5 @@
+{ lib, username, ... }:
 {
-  lib,
-  pkgs,
-  username,
-  ...
-}:
-{
-  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "nomachine-client" ];
-  environment.systemPackages = [ pkgs.nomachine-client ];
   home-manager.users.${username} =
     { config, ... }:
     {