From 292dfcfccde52a0b7027228d96190d874d2659b5 Mon Sep 17 00:00:00 2001
From: Nico <nico@astolfo.org>
Date: Sat, 3 May 2025 16:15:58 +1000
Subject: [PATCH] chore: reorganise modules

---
 flake.nix                          | 15 ++++++++-------
 modules/applications.nix           | 12 ------------
 modules/games.nix                  |  4 ----
 modules/linux/applications.nix     | 23 +++++++++++++++++++++++
 modules/{ => linux}/audio.nix      |  0
 modules/{ => linux}/hyprland.nix   |  0
 modules/{ => linux}/login.nix      |  0
 modules/{ => linux}/secureboot.nix |  0
 modules/{ => linux}/stow.nix       |  0
 modules/{ => linux}/users.nix      |  0
 10 files changed, 31 insertions(+), 23 deletions(-)
 create mode 100644 modules/linux/applications.nix
 rename modules/{ => linux}/audio.nix (100%)
 rename modules/{ => linux}/hyprland.nix (100%)
 rename modules/{ => linux}/login.nix (100%)
 rename modules/{ => linux}/secureboot.nix (100%)
 rename modules/{ => linux}/stow.nix (100%)
 rename modules/{ => linux}/users.nix (100%)

diff --git a/flake.nix b/flake.nix
index 2d353ae..60d5df1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,18 +15,19 @@
         ./hosts/nixos-common.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/nix.nix
+        ./modules/shell.nix
 
-        ./modules/secureboot.nix
+        ./modules/linux/applications.nix
+        ./modules/linux/audio.nix
+        ./modules/linux/hyprland.nix
+        ./modules/linux/login.nix
+        ./modules/linux/stow.nix
+        ./modules/linux/users.nix
+        ./modules/linux/secureboot.nix
         lanzaboote.nixosModules.lanzaboote
 
         ./hosts/pluto/conf.nix
diff --git a/modules/applications.nix b/modules/applications.nix
index 41243e5..335fd03 100644
--- a/modules/applications.nix
+++ b/modules/applications.nix
@@ -10,17 +10,5 @@
     keepassxc
   ];
 
-  services.flatpak.enable = true;
-
   programs.kdeconnect.enable = true;
-  systemd.user.services.kdeconnectd = {
-    enable = true;
-    after = [ "network.target" ];
-    wantedBy = [ "default.target" ];
-    description = "kdeconnectd";
-    serviceConfig = {
-        Type = "simple";
-        ExecStart = "${pkgs.kdePackages.kdeconnect-kde}/bin/kdeconnectd";
-    };
-  };
 }
diff --git a/modules/games.nix b/modules/games.nix
index 224cdb0..3e12570 100644
--- a/modules/games.nix
+++ b/modules/games.nix
@@ -7,9 +7,5 @@
 
   programs.steam = {
     enable = true;
-    extest.enable = true;
-    extraPackages = [ pkgs.gamescope ];
-
-    gamescopeSession.enable = true;
   };
 }
diff --git a/modules/linux/applications.nix b/modules/linux/applications.nix
new file mode 100644
index 0000000..8056cd2
--- /dev/null
+++ b/modules/linux/applications.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+{
+  programs.steam = {
+    extraPackages = [ pkgs.gamescope ];
+    gamescopeSession.enable = true;
+    extest.enable = true;
+  };
+
+  services.flatpak.enable = true;
+
+  systemd.user.services.kdeconnectd = {
+    enable = true;
+    after = [ "network.target" ];
+    wantedBy = [ "default.target" ];
+    description = "kdeconnectd";
+    serviceConfig = {
+        Type = "simple";
+        ExecStart = "${pkgs.kdePackages.kdeconnect-kde}/bin/kdeconnectd";
+    };
+  };
+
+}
diff --git a/modules/audio.nix b/modules/linux/audio.nix
similarity index 100%
rename from modules/audio.nix
rename to modules/linux/audio.nix
diff --git a/modules/hyprland.nix b/modules/linux/hyprland.nix
similarity index 100%
rename from modules/hyprland.nix
rename to modules/linux/hyprland.nix
diff --git a/modules/login.nix b/modules/linux/login.nix
similarity index 100%
rename from modules/login.nix
rename to modules/linux/login.nix
diff --git a/modules/secureboot.nix b/modules/linux/secureboot.nix
similarity index 100%
rename from modules/secureboot.nix
rename to modules/linux/secureboot.nix
diff --git a/modules/stow.nix b/modules/linux/stow.nix
similarity index 100%
rename from modules/stow.nix
rename to modules/linux/stow.nix
diff --git a/modules/users.nix b/modules/linux/users.nix
similarity index 100%
rename from modules/users.nix
rename to modules/linux/users.nix