From 4ea5ab05502ab8603e58f31153e65c74f745fa75 Mon Sep 17 00:00:00 2001
From: Romain Paquet <rpqt@rpqt.fr>
Date: Wed, 1 Oct 2025 19:36:53 +0200
Subject: [PATCH] refactor desktop modules

---
 home-manager/desktop/ignis.nix | 10 ++++++++++
 home-manager/desktop/niri.nix  |  2 +-
 home-manager/desktop/sway.nix  |  1 +
 machines/haze/niri.nix         |  9 +--------
 modules/desktop.nix            |  2 ++
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/home-manager/desktop/ignis.nix b/home-manager/desktop/ignis.nix
index f81ebb6..4bc86ae 100644
--- a/home-manager/desktop/ignis.nix
+++ b/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;
 
diff --git a/home-manager/desktop/niri.nix b/home-manager/desktop/niri.nix
index 5f0001d..9422dda 100644
--- a/home-manager/desktop/niri.nix
+++ b/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";
diff --git a/home-manager/desktop/sway.nix b/home-manager/desktop/sway.nix
index 36ba075..53aa3fd 100644
--- a/home-manager/desktop/sway.nix
+++ b/home-manager/desktop/sway.nix
@@ -7,6 +7,7 @@
 {
   imports = [
     self.homeManagerModules.dotfiles
+    ./wayland.nix
   ];
 
   home.packages = with pkgs; [
diff --git a/machines/haze/niri.nix b/machines/haze/niri.nix
index c9a11ad..896243c 100644
--- a/machines/haze/niri.nix
+++ b/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;
diff --git a/modules/desktop.nix b/modules/desktop.nix
index 04d56c1..df37755 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -3,6 +3,8 @@
   environment.systemPackages = [
     pkgs.mpv # video player
     pkgs.amberol # music player
+    pkgs.alacritty
+    pkgs.ghostty
   ];
 
   programs.firefox = {