flake.nix

@@ -35,8 +35,9 @@
     };
   in 
   {
+    # Laptop Configuration
     nixosConfigurations = {
-      ti-clt-lpt01 = nixpkgs.lib.nixosSystem {
+      xv-laptop = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
         modules = [
@@ -44,10 +45,25 @@
 
           inputs.nixos-hardware.nixosModules.framework-13-7040-amd
 
-          ./hosts/ti-clt-lpt01
+          ./hosts/laptop
         ];
       };
+    };
 
+    homeConfigurations = {
+      "xeovalyte@xv-laptop" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        extraSpecialArgs = { inherit inputs nix-colors; };
+        modules = [
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+
+          ./hosts/laptop/home.nix
+        ];
+      };
+    };
+
+    # Christa Desktop Configuration
+    nixosConfigurations = {
       ch-clt-dsk01 = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = { inherit inputs; };
@@ -57,42 +73,9 @@
           ./hosts/ch-clt-dsk01
         ];
       };
-
-      ti-clt-tbl01 = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
-        modules = [
-          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
-
-          inputs.nixos-hardware.nixosModules.microsoft-surface-go
-          nixos-cosmic.nixosModules.default
-
-          ./hosts/ti-clt-tbl01
-        ];
-      };
-
-      ti-clt-dsk01 = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
-        modules = [
-          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
-
-          ./hosts/ti-clt-dsk01
-        ];
-      };
     };
 
     homeConfigurations = {
-      "xeovalyte@ti-clt-lpt01" = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.x86_64-linux;
-        extraSpecialArgs = { inherit inputs nix-colors; };
-        modules = [
-          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
-
-          ./hosts/laptop/home.nix
-        ];
-      };
-
       "kiiwy@ch-clt-dsk01" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         extraSpecialArgs = { inherit inputs nix-colors; };
@@ -102,27 +85,85 @@
           ./hosts/ch-clt-dsk01/home.nix
         ];
       };
+    };
 
-      "xeovalyte@ti-clt-tbl01" = home-manager.lib.homeManagerConfiguration {
+    # Surface Configuration
+    nixosConfigurations = {
+      xv-surface = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
+        modules = [
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+
+          inputs.nixos-hardware.nixosModules.microsoft-surface-go
+          nixos-cosmic.nixosModules.default
+
+          ./hosts/surface
+        ];
+      };
+    };
+
+    homeConfigurations = {
+      "xeovalyte@xv-surface" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         extraSpecialArgs = { inherit inputs nix-colors; };
         modules = [
           ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
         
-          ./hosts/ti-clt-tbl01/home.nix
+          ./hosts/surface/home.nix
         ];
       };
+    };
 
-      "xeovalyte@ti-clt-dsk01" = home-manager.lib.homeManagerConfiguration {
+    nixosConfigurations = {
+      xv-desktop = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
+        modules = [
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+
+          ./hosts/desktop
+        ];
+      };
+    };
+
+    homeConfigurations = {
+      "xeovalyte@xv-desktop" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux;
         extraSpecialArgs = { inherit inputs nix-colors; };
         modules = [
           ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
         
-          ./hosts/ti-clt-dsk01/home.nix
+          ./hosts/desktop/home.nix
         ];
       };
     };
+
+    # pm01vm01 Configuration
+    nixosConfigurations = {
+      pm01vm01 = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
+        modules = [
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+
+          ./hosts/pm01vm01
+        ];
+      };
+    };
+
+    homeConfigurations = {
+      "xeovalyte@pm01vm01" = home-manager.lib.homeManagerConfiguration {
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        extraSpecialArgs = { inherit inputs nix-colors; };
+        modules = [
+          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+        
+          ./hosts/pm01vm01/home.nix
+        ];
+      };
+    };
+
   };
 }
 

hosts/ch-clt-dsk01/home.nix

@@ -13,6 +13,8 @@
     };
 
     settings = {
+      hostname = "ch-clt-dsk01";
+
       applications.common.enable = true;
       applications.alacritty.enable = false;
       applications.devenv.enable = false;
@@ -53,4 +55,13 @@
 
     home.stateVersion = "24.05";
   };
+
+  options = {
+    settings.hostname = lib.mkOption {
+      type = with lib.types; str;
+      description = ''
+        Define the host of the machine
+      '';
+    };
+  };
 }

hosts/desktop/default.nix

@@ -59,7 +59,7 @@
   };
 
   # Networking configuration
-  networking.hostName = "ti-clt-dsk01"; # Define your hostname.
+  networking.hostName = "xv-desktop"; # Define your hostname.
   networking.interfaces.enp7s0.wakeOnLan.enable = true;
 
   users.users.xeovalyte = {

hosts/desktop/home.nix

@@ -13,6 +13,8 @@
     };
 
     settings = {
+      hostname = "xv-desktop";
+    
       applications.common.enable = true;
       applications.alacritty.enable = false;
       applications.devenv.enable = true;
@@ -49,4 +51,13 @@
 
     home.stateVersion = "24.05";
   };
+
+  options = {
+    settings.hostname = lib.mkOption {
+      type = with lib.types; str;
+      description = ''
+        Define the host of the machine
+      '';
+    };
+  };
 }

hosts/laptop/default.nix

@@ -64,7 +64,7 @@
     configurationLimit = 32;
   };
 
-  networking.hostName = "ti-clt-lpt01"; # Define your hostname.
+  networking.hostName = "xv-laptop"; # Define your hostname.
 
   networking.firewall = {
     enable = true;

hosts/laptop/home.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 
 {
   imports = [
@@ -13,6 +13,8 @@
     };
 
     settings = {
+      hostname = "xv-laptop";
+
       applications.common.enable = true;
       applications.alacritty.enable = true;
       applications.devenv.enable = true;
@@ -70,4 +72,14 @@
 
     home.stateVersion = "24.05";
   };
+
+  options = {
+    settings.hostname = lib.mkOption {
+      type = with lib.types; str;
+      description = ''
+        Define the host of the machine
+      '';
+    };
+  };
+
 }

hosts/pm01vm01/default.nix

@@ -0,0 +1,48 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+
+    # CLI
+    ../../modules/system/cli/common.nix
+    ../../modules/system/cli/docker.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"
+    ];
+  };
+
+  # Bootloader.
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.systemd-boot.enable = true;
+
+  networking.hostName = "pm01vm01"; # Define your hostname.
+
+  users.users.xeovalyte = {
+    isNormalUser = true;
+    description = "Timo Boomers";
+    extraGroups = [ "networkmanager" "wheel" ];
+  };
+
+  # Enable ssh
+  services.openssh.enable = true;
+
+  # Forward ports
+  networking.firewall = {
+    allowedTCPPorts = [ 80 443 53 ];
+    allowedUDPPorts = [ 53 ];
+  };
+
+  system.stateVersion = "24.05";
+
+}

hosts/pm01vm01/hardware-configuration.nix

@@ -0,0 +1,37 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ohci_pci" "ehci_pci" "virtio_pci" "ahci" "usbhid" "sr_mod" "virtio_blk" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/47301fe6-a7db-4ffd-854a-beddd53b6d99";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/6A5B-F811";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices = [ ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s8.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}

hosts/pm01vm01/home.nix

@@ -0,0 +1,48 @@
+{ pkgs, lib, config, ... }:
+
+{
+  imports = [
+    # Gui
+    ../../modules/home/gui/theming.nix
+  
+    # CLI
+    ../../modules/home/cli/common
+    ../../modules/home/cli/yazi.nix
+  ];
+
+
+  options = {
+    host = lib.mkOption {
+      type = with lib.types; str;
+      description = ''
+        Define the host of the machine
+      '';
+    };
+
+    headless = lib.mkOption {
+      type = with lib.types; bool;
+      description = ''
+        Is this machine headless?
+      '';
+    };
+  };
+
+  config = {
+    home = {
+      username = "xeovalyte";
+      homeDirectory = "/home/xeovalyte";
+    };
+
+    host = "pm01vm01";
+    headless = true;
+
+    home.packages = with pkgs; [
+    ];
+
+    # Enable home-manager
+    programs.home-manager.enable = true;
+
+    home.stateVersion = "24.05";
+  };
+
+}

hosts/surface/default.nix

@@ -59,7 +59,7 @@
     configurationLimit = 32;
   };
 
-  networking.hostName = "ti-clt-tbl01"; # Define your hostname.
+  networking.hostName = "xv-surface"; # Define your hostname.
 
   users.users.xeovalyte = {
     isNormalUser = true;

hosts/surface/home.nix

@@ -13,6 +13,8 @@
     };
 
     settings = {
+      hostname = "xv-surface";
+    
       applications.common.enable = true;
       applications.alacritty.enable = false;
       applications.devenv.enable = false;
@@ -48,4 +50,13 @@
 
     home.stateVersion = "24.05";
   };
+
+  options = {
+    settings.hostname = lib.mkOption {
+      type = with lib.types; str;
+      description = ''
+        Define the host of the machine
+      '';
+    };
+  };
 }

justfile

@@ -1,24 +1,12 @@
-set unstable
-
 default:
-  @just --list
+  @just --choose
 
-update:
+rebuild:
-  nix flake update
-
-clean:
-  sudo nix-collect-garbage -d
-  nix-collect-garbage -d
-
-fmt:
-  nix fmt
-
-switch:
   sudo nixos-rebuild switch --flake .
   home-manager switch --flake .
 
-switch-system:
+rebuild-system:
   sudo nixos-rebuild switch --flake .
 
-switch-home-manager:
+rebuild-home-manager:
   home-manager switch --flake .