Migrated from default.nix to configuration.nix

hosts/v-th-ctr-01/configuration.nix

@@ -9,14 +9,65 @@
     # Include the default incus configuration.
     "${modulesPath}/virtualisation/lxc-container.nix"
     # Include the container-specific autogenerated configuration.
+    ../../modules/system/default.nix
   ];
 
+  settings = {
+    hostname = "v-th-ctr-01";
+    display-manager = "none";
+    desktop-environments = {
+      cosmic.enable = false;
+      hyprland.enable = false;
+      gnome.enable = false;
+    };
+    applications = {
+      common.enable = true;
+      steam.enable = false;
+      thunar.enable = false;
+    };
+    services = {
+      docker.enable = false;
+      podman.enable = true;
+      quickemu.enable = false;
+      sunshine.enable = false;
+      garbage-collection.enable = true;
+      incus.enable = false;
+      ssh.enable = true;
+    };
+    hardware = {
+      fprint.enable = false;
+      printing.enable = false;
+      bluetooth.enable = false;
+      firewall.enable = true;
+      locale.enable = true;
+      nvidia.enable = false;
+    };
+  };
+
+  users.users.deploy = {
+    isNormalUser = true;
+    description = "Deploy";
+    extraGroups = [ "networkmanager" "wheel" "dialout" ];
+    linger = true;
+  };
+
+  # networking
   networking = {
     dhcpcd.enable = false;
     useDHCP = false;
     useHostResolvConf = false;
   };
 
+  networking.hosts = {
+    "127.0.0.1" = [ "tbmrs.nl" ];
+  };
+
+  networking.firewall = {
+    enable = true;
+    allowedTCPPorts = [ 1080 1443 1053 ];
+    allowedUDPPorts = [ 1080 1443 1053 ];
+  };
+
   systemd.network = {
     enable = true;
     networks."50-eth0" = {

hosts/v-th-ctr-01/default.nix

@@ -1,77 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./configuration.nix
-
-    # Import modules
-    ../../modules/system/default.nix
-  ];
-
-  settings = {
-    display-manager = "none";
-    desktop-environments = {
-      cosmic.enable = false;
-      hyprland.enable = false;
-      gnome.enable = false;
-    };
-    applications = {
-      common.enable = true;
-      steam.enable = false;
-      thunar.enable = false;
-    };
-    services = {
-      docker.enable = false;
-      podman.enable = true;
-      quickemu.enable = false;
-      sunshine.enable = false;
-      garbage-collection.enable = true;
-      incus.enable = false;
-      ssh.enable = true;
-    };
-    hardware = {
-      fprint.enable = false;
-      printing.enable = false;
-      bluetooth.enable = false;
-      firewall.enable = true;
-      locale.enable = true;
-      nvidia.enable = false;
-    };
-  };
-
-  nix.settings = {
-    experimental-features = [ "nix-command" "flakes" ];
-
-    substituters = [
-      "https://nix-community.cachix.org"
-      "https://cosmic.cachix.org/"
-    ];
-
-    trusted-public-keys = [
-      "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
-    ];
-  };
-
-  networking.hostName = "v-th-ctr-01"; # Define your hostname.
-
-  networking.firewall = {
-    enable = true;
-    allowedTCPPorts = [ 1080 1443 1053 ];
-    allowedUDPPorts = [ 1080 1443 1053 ];
-  };
-
-  networking.hosts = {
-    "127.0.0.1" = [ "tbmrs.nl" ];
-  };
-
-  users.users.deploy = {
-    isNormalUser = true;
-    description = "Deploy";
-    extraGroups = [ "networkmanager" "wheel" "dialout" ];
-    linger = true;
-  };
-
-  nix.settings.trusted-users = [ "root" "deploy" ];
-
-  system.stateVersion = "24.05";
-}