From 51de9e32c2e9693803ae5fef5bc99ff9e57b85e0 Mon Sep 17 00:00:00 2001
From: Nico <nico@astolfo.org>
Date: Sat, 3 May 2025 16:15:58 +1000
Subject: [PATCH] nix: reorganise hyprland module into smaller modules

---
 flake.nix            |  9 ++++++---
 modules/audio.nix    | 13 +++++++++++++
 modules/fonts.nix    | 14 ++++++++++++++
 modules/hyprland.nix | 21 ---------------------
 modules/login.nix    | 13 +++++++++++++
 5 files changed, 46 insertions(+), 24 deletions(-)
 create mode 100644 modules/audio.nix
 create mode 100644 modules/fonts.nix
 create mode 100644 modules/login.nix

diff --git a/flake.nix b/flake.nix
index 311ce78..2f2996d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,13 +14,16 @@
       modules = [
         ./hosts/nixos-common.nix
 
-        ./modules/shell.nix
-        ./modules/users.nix
-        ./modules/hyprland.nix
         ./modules/applications.nix
+        ./modules/audio.nix
         ./modules/firefox.nix
+        ./modules/fonts.nix
         ./modules/games.nix
+        ./modules/hyprland.nix
+        ./modules/login.nix
+        ./modules/shell.nix
         ./modules/stow.nix
+        ./modules/users.nix
 
         ./modules/secureboot.nix
         lanzaboote.nixosModules.lanzaboote
diff --git a/modules/audio.nix b/modules/audio.nix
new file mode 100644
index 0000000..a92e11e
--- /dev/null
+++ b/modules/audio.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+
+{
+  # Enable sound.
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+  };
+}
diff --git a/modules/fonts.nix b/modules/fonts.nix
new file mode 100644
index 0000000..591c788
--- /dev/null
+++ b/modules/fonts.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+
+{
+  # install basic fonts
+  fonts = {
+    fontDir.enable = true;
+    packages = with pkgs; [ 
+      noto-fonts          # most langs and emojis
+      noto-fonts-cjk-sans # gets japanese and chinese langs
+      nerdfonts           # programming fonts
+      corefonts           # basic web fonts
+    ];
+  };
+}
diff --git a/modules/hyprland.nix b/modules/hyprland.nix
index 0302d94..bdc2a91 100644
--- a/modules/hyprland.nix
+++ b/modules/hyprland.nix
@@ -19,29 +19,8 @@
   xdg.portal.enable = true;
   xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
 
-  # install basic fonts
-  fonts = {
-    fontDir.enable = true; # fixes some programs
-    packages = with pkgs; [ 
-      noto-fonts # most langs and emojis
-      noto-fonts-cjk-sans # gets japanese and chinese langs
-      nerdfonts  # programming fonts
-      corefonts  # basic web fonts
-    ];
-  };
-
   programs.hyprlock.enable = true;
 
-  # Enable sound.
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    jack.enable = true;
-  };
-
   environment.systemPackages = with pkgs; [
     kitty
     waybar
diff --git a/modules/login.nix b/modules/login.nix
new file mode 100644
index 0000000..328bc7b
--- /dev/null
+++ b/modules/login.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+
+{
+  # display manager
+  programs.regreet = {
+    enable = true;
+    settings = {
+      GTK = {
+        application_prefer_dark_theme = true;
+      };
+    };
+  };
+}