From 9b8bf0efc5cf6ac5fb6af6f7178daacf7c6e8ff0 Mon Sep 17 00:00:00 2001
From: Felix Schulze <admin@schulze.network>
Date: Wed, 11 Jun 2025 16:03:43 +0200
Subject: [PATCH] restructure nix configs

---
 hosts/wildfire/configuration.nix              |  7 ++++
 modules/common.nix                            | 36 ++++++++++++-------
 .../gnome-desktop.nix}                        |  0
 modules/desktops/hyprland-desktop.nix         |  6 ++++
 modules/programs.nix                          |  7 +---
 modules/users.nix                             | 16 ---------
 6 files changed, 38 insertions(+), 34 deletions(-)
 rename modules/{desktop.nix => desktops/gnome-desktop.nix} (100%)
 create mode 100644 modules/desktops/hyprland-desktop.nix
 delete mode 100644 modules/users.nix

diff --git a/hosts/wildfire/configuration.nix b/hosts/wildfire/configuration.nix
index 38c64bb..00eb2a3 100644
--- a/hosts/wildfire/configuration.nix
+++ b/hosts/wildfire/configuration.nix
@@ -7,6 +7,8 @@
   imports = [
     ./hardware-configuration.nix
     ../../modules/common.nix
+    ../../modules/desktops/gnome-desktop.nix
+    ../../modules/programs.nix
   ];
 
   # Encrypted drive
@@ -26,6 +28,11 @@
   # Wildfire-specific packages
   environment.systemPackages = with pkgs; [
     lact
+    multiviewer-for-f1
+    wasabiwallet
+    prismlauncher
+    davinci-resolve
+    ardour
   ];
 
   # Wildfire-specific Systemd services
diff --git a/modules/common.nix b/modules/common.nix
index a212f0b..814a21c 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -4,11 +4,17 @@
   inputs,
   ...
 }: {
-  imports = [
-    ./desktop.nix
-    ./users.nix
-    ./programs.nix
-  ];
+  
+  # Define the main user account
+  users = {
+    users.schulze = {
+      isNormalUser = true;
+      description = "Felix Schulze";
+      extraGroups = ["networkmanager" "wheel" "docker"];
+      shell = pkgs.fish;
+    };
+    groups.libvirtd.members = ["schulze"];
+  };
 
   # Bootloader.
   boot = {
@@ -18,12 +24,14 @@
     kernelPackages = pkgs.linuxPackages_latest;
   };
 
+  networking = {
   # Enable networking
-  networking.networkmanager.enable = true;
+    networkmanager.enable = true;
 
   # Network security
-  # enable firewall and block all ports
-  networking.firewall.enable = true;
+    # enable firewall and block all ports
+    firewall.enable = true;
+  };
 
   # disable coredump that could be exploited later
   # and also slow down the system when something crash
@@ -33,9 +41,10 @@
   time.timeZone = "Europe/Stockholm";
 
   # Select internationalisation properties.
-  i18n.defaultLocale = "en_GB.UTF-8";
+  i18n = {
+    defaultLocale = "en_GB.UTF-8";
 
-  i18n.extraLocaleSettings = {
+  extraLocaleSettings = {
     LC_ADDRESS = "sv_SE.UTF-8";
     LC_IDENTIFICATION = "sv_SE.UTF-8";
     LC_MEASUREMENT = "sv_SE.UTF-8";
@@ -46,6 +55,7 @@
     LC_TELEPHONE = "sv_SE.UTF-8";
     LC_TIME = "sv_SE.UTF-8";
   };
+  };
 
   # Configure console keymap
   console.keyMap = "sv-latin1";
@@ -110,8 +120,10 @@
   };
 
   # enable antivirus clamav and keep the signatures' database updated
-  services.clamav.daemon.enable = true;
-  services.clamav.updater.enable = true;
+  services.clamav = {
+    daemon.enable = true;
+    updater.enable = true;
+  };
 
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
diff --git a/modules/desktop.nix b/modules/desktops/gnome-desktop.nix
similarity index 100%
rename from modules/desktop.nix
rename to modules/desktops/gnome-desktop.nix
diff --git a/modules/desktops/hyprland-desktop.nix b/modules/desktops/hyprland-desktop.nix
new file mode 100644
index 0000000..9ecaff5
--- /dev/null
+++ b/modules/desktops/hyprland-desktop.nix
@@ -0,0 +1,6 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+}
diff --git a/modules/programs.nix b/modules/programs.nix
index 883ccb5..b38256c 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -44,22 +44,17 @@
     ghostty
     obsidian
     nextcloud-client
-    multiviewer-for-f1
     libreoffice-fresh
     tor-browser
-    wasabiwallet
     ungoogled-chromium
-    prismlauncher
     plexamp
     remmina
 
-    # Audio/Visual
+    # Visual
     inkscape
     krita
     darktable
-    davinci-resolve
     imagemagick
-    ardour
   ];
 
   programs = {
diff --git a/modules/users.nix b/modules/users.nix
deleted file mode 100644
index 6bcce21..0000000
--- a/modules/users.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  # Define the main user account
-  users = {
-    users.schulze = {
-      isNormalUser = true;
-      description = "Felix Schulze";
-      extraGroups = ["networkmanager" "wheel" "docker"];
-      shell = pkgs.fish;
-    };
-    groups.libvirtd.members = ["schulze"];
-  };
-}