refactor desktop modules

home-manager/desktop/ignis.nix

@@ -2,6 +2,7 @@
   self,
   config,
   inputs,
+  pkgs,
   ...
 }:
 {
@@ -10,6 +11,15 @@
     inputs.ignis.homeManagerModules.default
   ];
 
+  home.packages = [
+    pkgs.brightnessctl
+    pkgs.swaybg
+    pkgs.swaylock
+    pkgs.tofi
+    pkgs.wl-gammarelay-rs
+    inputs.matugen.packages.${pkgs.system}.default
+  ];
+
   programs.ignis = {
     enable = true;
 

home-manager/desktop/niri.nix

@@ -2,7 +2,7 @@
 {
   imports = [
     self.homeManagerModules.dotfiles
-    ./ignis.nix
+    ./wayland.nix
   ];
 
   xdg.configFile."niri".source = "${config.dotfiles.path}/.config/niri";

home-manager/desktop/sway.nix

@@ -7,6 +7,7 @@
 {
   imports = [
     self.homeManagerModules.dotfiles
+    ./wayland.nix
   ];
 
   home.packages = with pkgs; [

machines/haze/niri.nix

@@ -1,18 +1,11 @@
-{ self, pkgs, ... }:
+{ pkgs, ... }:
 {
   programs.niri.enable = true;
 
   environment.systemPackages = with pkgs; [
-    brightnessctl
     pavucontrol
     playerctl
-    quickshell
-    swaybg
-    swaylock
-    tofi
-    wl-gammarelay-rs
     xwayland-satellite
-    self.inputs.matugen.packages.${pkgs.system}.default
   ];
 
   services.gnome.gnome-keyring.enable = true;

modules/desktop.nix

@@ -3,6 +3,8 @@
   environment.systemPackages = [
     pkgs.mpv # video player
     pkgs.amberol # music player
+    pkgs.alacritty
+    pkgs.ghostty
   ];
 
   programs.firefox = {