snowhawk: moving user packages to home packages

hosts/snowhawk/configuration.nix

@@ -2,7 +2,7 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running `nixos-help`).
 
-{ pkgs, inputs, lib, config, ... }:
+{ pkgs, inputs, config, ... }:
 
 {
   imports = [
@@ -19,19 +19,12 @@
 
   snowhawk = {
     nix-ld.enable = true;
+    wake-on-lan.enable = true;
     dwm.enable = true;
     syncthing.enable = true;
     plymouth.enable = true;
   };
 
-  # Configure keymap in X11
-  services.xserver = {
-    xkb = {
-      layout = "us";
-      variant = "";
-    };
-  };
-
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
@@ -47,23 +40,6 @@
     description = "Zynh Ludwig";
     hashedPasswordFile = config.sops.secrets."passwords/ravenshade".path;
     extraGroups = [ "networkmanager" "wheel" "audio" ];
-    packages = with pkgs; [
-      ripgrep
-      unzip
-      fzf
-      tree
-
-      gparted
-      arandr
-
-      brave
-      firefox
-
-      # steam
-      spotify
-      discord
-      steam-run
-    ];
   };
 
   hardware.keyboard.uhk.enable = true;
@@ -83,11 +59,10 @@
 
   security.polkit.enable = true;
 
-  home-manager.users = { "ravenshade" = import ./home.nix; };
+  home-manager = {
-  # home-manager.backupFileExtension = "backup";
+    users = { "ravenshade" = import ./home.nix; };
-
+    backupFileExtension = "backup";
-  # programs.hyprland.enable = true;
+  };
-  # environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
   environment.systemPackages = with pkgs; [
     neovim
@@ -105,17 +80,6 @@
 
   services.avahi.enable = true;
 
-  systemd.services.wakeonlan = {
-    description = "reenable wakeonlan every boot";
-    after = [ "network.target" ];
-    serviceConfig = {
-      Type = "simple";
-      RemainAfterExit = "true";
-      ExecStart = "${lib.getExe pkgs.ethtool} -s enp7s0 wol g";
-    };
-    wantedBy = [ "default.target" ];
-  };
-
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];

hosts/snowhawk/home.nix

@@ -54,6 +54,21 @@
   # services.easyeffects.enable = true;
 
   home.packages = with pkgs; [
+    ripgrep
+    unzip
+    fzf
+    tree
+
+    gparted
+    arandr
+
+    brave
+    firefox
+
+    spotify
+    discord
+    steam-run
+
     nix-output-monitor
     (writeShellScriptBin "rebuild" ''
       nixos-rebuild switch --log-format internal-json -v |& nom --json

modules/dwm.nix

@@ -12,6 +12,14 @@ in
     # Enable the X11 windowing system.
     services.xserver.enable = true;
 
+    # Configure keymap in X11
+    services.xserver = {
+      xkb = {
+        layout = "us";
+        variant = "";
+      };
+    };
+
     services.xserver.windowManager.dwm = {
       enable = true;
       package = pkgs.dwm.overrideAttrs (oldAttrs: {

modules/niri.nix

@@ -13,9 +13,13 @@ in
   config = mkIf cfg.enable {
     programs.niri.enable = true;
 
-    services.displayManager.defaultSession = "niri";
+    environment.sessionVariables.NIXOS_OZONE_WL = "1";
-    services.displayManager.enable = true;
+
-    services.displayManager.sddm.enable = true;
+    services.displayManager = {
-    services.displayManager.sddm.wayland.enable = true;
+      defaultSession = "niri";
+      enable = true;
+      sddm.enable = true;
+      sddm.wayland.enable = true;
+    };
   };
 }

modules/sudo-rules.nix

@@ -20,6 +20,5 @@ in
         }];
       }
     ];
-
   };
 }

modules/wake-on-lan.nix

@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+let
+  inherit (lib) mkIf mkEnableOption;
+
+  cfg = config.snowhawk.wake-on-lan;
+in
+{
+  options.snowhawk.wake-on-lan = {
+    enable = mkEnableOption "wake-on-lan nixos module";
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.wakeonlan = {
+      description = "reenable wakeonlan every boot";
+      after = [ "network.target" ];
+      serviceConfig = {
+        Type = "simple";
+        RemainAfterExit = "true";
+        ExecStart = "${lib.getExe pkgs.ethtool} -s enp7s0 wol g";
+      };
+      wantedBy = [ "default.target" ];
+    };
+  };
+}