restructure nix configs

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

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

modules/desktops/hyprland-desktop.nix

@@ -0,0 +1,6 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+}

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 = {

modules/users.nix

@@ -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"];
-  };
-}