chore: organise modules

Organise modules in a significantly better way with categories.

flake.nix

@@ -20,25 +20,27 @@
       modules = [
         ./hosts/nixos-common.nix
 
-        ./modules/applications.nix
+        ./modules/applications/default.nix
-        ./modules/firefox.nix
+        ./modules/browser/firefox.nix
-        ./modules/fonts.nix
+        ./modules/games/linux.nix
-        ./modules/linux/games.nix
+        ./modules/nix/linux.nix
-        ./modules/nix.nix
         ./modules/shell.nix
 
-        ./modules/linux/arr.nix
+        ./modules/desktop/default.nix
-        ./modules/linux/glance.nix
+        ./modules/desktop/de/hyprland.nix
-        ./modules/linux/avahi.nix
+        ./modules/desktop/de/niri.nix
-#        ./modules/linux/tuigreet.nix
+
-        ./modules/linux/desktop.nix
+        ./modules/services/media/arr.nix
-        ./modules/linux/ssh.nix
+        ./modules/services/media/jellyfin.nix
-        ./modules/linux/opensnitch.nix
+        ./modules/services/glance.nix
-        ./modules/linux/hyprland.nix
+        ./modules/services/ssh.nix
-        ./modules/linux/tailscale.nix
+
-        ./modules/linux/niri.nix
+        ./modules/network/avahi.nix
-        ./modules/linux/users.nix
+        ./modules/network/firewall/opensnitch.nix
-        ./modules/linux/secureboot.nix
+        ./modules/network/vpn/tailscale.nix
+
+        ./modules/users/nico.nix
+        ./modules/hardware/secureboot.nix
         lanzaboote.nixosModules.lanzaboote
 
         ./hosts/disko-desktop.nix
@@ -51,16 +53,16 @@
     darwinConfigurations.faye = nix-darwin.lib.darwinSystem {
       system = "aarch64-darwin";
       modules = [
-        ./modules/fonts.nix
+        ./modules/desktop/fonts.nix
-        ./modules/nix.nix
+        ./modules/nix/darwin.nix
         ./modules/shell.nix
 
-        ./modules/darwin/games.nix
+        ./modules/games/darwin.nix
-        ./modules/darwin/applications.nix
+        ./modules/applications/darwin.nix
-        ./modules/darwin/desktop.nix
+        ./modules/desktop/de/darwin.nix
-        ./modules/darwin/hardware.nix
+        ./modules/hardware/darwin.nix
-        ./modules/darwin/nix.nix
+        ./modules/nix/darwin.nix
-        ./modules/darwin/tailscale.nix
+        ./modules/network/vpn/tailscale.nix
 
         ./hosts/faye/conf.nix
       ];

modules/applications/darwin.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ../applications.nix ];
+  imports = [ ./default.nix ];
 
   # dock
   system.defaults.dock.persistent-apps = [
@@ -25,12 +25,6 @@
     "/Applications/OpenUTAU.app"
  ];
 
-  # nix pkgs
-  environment.systemPackages = with pkgs; [
-    iina
-    utm
-  ];
-
   # homebrew pkgs
   homebrew = {
     enable = true;

modules/applications/default.nix

@@ -16,5 +16,8 @@
     openutau
     obs-studio
     blender
+  ]) ++ lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
+    iina
+    utm
   ]);
 }

modules/desktop/default.nix

@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./pipewire.nix
+    ./flatpak.nix
+    ./fonts.nix
+  ];
+
+  # Enable font dir for compatability
+  fonts.fontDir.enable = true;
+}

modules/desktop/flatpak.nix

@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  services.flatpak.enable = true;
+}

modules/desktop/pipewire.nix

@@ -0,0 +1,13 @@
+{ ... }:
+
+{
+  # Enable sound.
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+  };
+}

modules/games/darwin.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ../games.nix ];
+  imports = [ ./default.nix ];
 
   homebrew.casks = [
     "whisky"

modules/games/linux.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports = [ ../games.nix ];
+  imports = [ ./default.nix ];
 
   environment.systemPackages = with pkgs; [
     heroic
@@ -10,5 +10,8 @@
 
   programs.steam = {
     enable = true;
+    extraPackages = [ pkgs.gamescope ];
+    gamescopeSession.enable = true;
+    extest.enable = true;
   };
 }

modules/linux/desktop.nix

@@ -1,26 +0,0 @@
-{ 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;
-  };
-
-  # Applications
-  programs.steam = {
-    # doesn't do anything if steam isn't enabled so safe here
-    extraPackages = [ pkgs.gamescope ];
-    gamescopeSession.enable = true;
-    extest.enable = true;
-  };
-
-  # Enable font dir for compatability
-  fonts.fontDir.enable = true;
-
-  services.flatpak.enable = true;
-}

modules/linux/tailscale.nix

@@ -1,8 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  services.tailscale = {
-    enable = true;
-    openFirewall = true;
-  };
-}

modules/services/media/arr.nix

@@ -45,13 +45,6 @@
   };
 
 
-  # Streaming frontend
-  services.jellyfin = {
-    enable = true;
-    openFirewall = true;
-    group = "media";
-  };
-
   # Requesting Frontend
   services.jellyseerr = {
     enable = true;

modules/services/media/jellyfin.nix

@@ -0,0 +1,10 @@
+{ ... }:
+
+{
+  # Streaming frontend
+  services.jellyfin = {
+    enable = true;
+    openFirewall = true;
+    group = "media";
+  };
+}