Refactored configuration

hosts/laptop/home.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, config, ... }:
 
 {
   imports = [
@@ -13,30 +13,45 @@
     ../../modules/home/cli/ssh.nix
   ];
 
-  home = {
-    username = "xeovalyte";
-    homeDirectory = "/home/xeovalyte";
+  options = {
+    host = lib.mkOption {
+      type = with lib.types; str;
+      description = ''
+        Define the host of the machine
+      '';
+    };
   };
 
-  home.packages = with pkgs; [
-    # Desktop Applications
-    kdenlive
-    unstable.prismlauncher
-    unstable.joplin-desktop
-    unstable.moonlight-qt
-    unstable.prusa-slicer
-    signal-desktop
-    unstable.vesktop
+  config = {
+    home = {
+      username = "xeovalyte";
+      homeDirectory = "/home/xeovalyte";
+    };
 
-    # Office
-    libreoffice
-    onlyoffice-bin
+    host = "xv-laptop";
 
-    # Image editing
-    gimp
-    inkscape
 
-  ];
+    home.packages = with pkgs; [
+      # Desktop Applications
+      kdenlive
+      unstable.prismlauncher
+      unstable.joplin-desktop
+      unstable.moonlight-qt
+      unstable.prusa-slicer
+      signal-desktop
+      unstable.vesktop
+
+      # Office
+      libreoffice
+      onlyoffice-bin
+
+      # Image editing
+      gimp
+      inkscape
+
+    ];
+
+    home.stateVersion = "24.05";
+  };
 
-  home.stateVersion = "24.05";
 }

hosts/vnix-ctr/default.nix

@@ -0,0 +1,53 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [ # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+
+    # CLI
+    ../../modules/system/cli/common.nix
+    ../../modules/system/cli/podman.nix
+
+    # Hardware
+    ../../modules/system/hardware/firewall.nix
+    ../../modules/system/hardware/garbage-collection.nix
+    ../../modules/system/hardware/locale.nix
+  ];
+
+  nix.settings = {
+    experimental-features = [ "nix-command" "flakes" ];
+
+    substituters = [
+      "https://nix-community.cachix.org"
+      "https://cache.nixos.org/"
+    ];
+    trusted-public-keys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+    ];
+  };
+
+  # Bootloader
+  boot.loader.grub = {
+    enable = true;
+    device = "/dev/sda";
+    useOSProber = true;
+  };
+
+  # Networking
+  networking.networkmanager.enable = true;
+
+  networking.firewall = {
+    allowedTCPPorts = [ 1080 ];
+    allowedUDPPorts = [ 53 ];
+  };
+
+  # Configure user
+  users.users.xeovalyte = {
+    isNormalUser = true;
+    description = "Timo Boomers";
+    extraGroups = [ "networkmanager" "wheel" "dialout" "fuse" ];
+  };
+
+  system.stateVersion = "24.05";
+
+}

hosts/vnix-ctr/home.nix

@@ -0,0 +1,20 @@
+{ pkgs, ... }:
+
+{
+  imports = [
+    # GUI
+    ../../modules/home/gui/theming.nix
+  
+    # CLI
+    ../../modules/home/cli/common
+  ];
+
+  guiTheming.enable = false;  
+
+  home = {
+    username = "xeovalyte";
+    homeDirectory = "/home/xeovalyte";
+  };
+
+  home.stateVersion = "24.05";
+}