8 files changed, 26 insertions(+), 24 deletions(-)

M hosts/configuration.nix
M hosts/default.nix
R hosts/{desktop/default.nix => desktop-clotho/default.nix}
R hosts/{desktop/hardware-configuration.nix => desktop-clotho/hardware-configuration.nix}
R hosts/{desktop/home.nix => desktop-clotho/home.nix}
R hosts/{laptop/default.nix => laptop-iapetus/default.nix}
R hosts/{laptop/hardware-configuration.nix => laptop-iapetus/hardware-configuration.nix}
R hosts/{laptop/home.nix => laptop-iapetus/home.nix}

@@ 27,7 27,7 @@
 
   users.users.${user} = {                   # System User
     isNormalUser = true;
-    extraGroups = [ "wheel" "video" "audio" "camera" "networkmanager" "lp" "scanner" "kvm" "libvirtd" "plex" ];
+    extraGroups = [ "wheel" "video" "audio" "camera" "networkmanager" "lp" "scanner" "kvm" "libvirtd" "plex" "podman" ];
     shell = pkgs.zsh;                       # Default shell
   };
   programs.zsh.enable = true; # has to be here to set shell to zsh

@@ 30,7 30,8 @@ let
 in
 {
 
-  laptop = lib.nixosSystem {                                # Laptop profile
+  laptop-iapetus = lib.nixosSystem {                                # Laptop profile
+    # Ideapad S540
     inherit system;
     specialArgs = {
       inherit inputs stable user location;


@@ 38,7 39,7 @@ in
     modules = [
       nur.nixosModules.nur
       { nixpkgs.overlays = [ nur.overlay ]; }
-      ./laptop
+      ./laptop-iapetus
       ./configuration.nix
 
       home-manager.nixosModules.home-manager {


@@ 52,65 53,65 @@ in
             nix-index-database.hmModules.nix-index
             { nixpkgs.overlays = [ nur.overlay ]; }
             (import ./home.nix)
-            (import ./laptop/home.nix)
+            (import ./laptop-iapetus/home.nix)
           ];
         };
       }
     ];
   };
 
-  vm = lib.nixosSystem {                                    # VM profile
+  desktop-clotho = lib.nixosSystem {                               # Desktop profile
     inherit system;
     specialArgs = {
-      inherit inputs stable user location;
-    };
-    modules = [
+      inherit inputs stable system user location;
+    };                                                      # Pass flake variable
+    modules = [                                             # Modules that are used.
       nur.nixosModules.nur
       { nixpkgs.overlays = [ nur.overlay ]; }
-      ./vm
+      ./desktop-clotho
       ./configuration.nix
 
-      home-manager.nixosModules.home-manager {
+      home-manager.nixosModules.home-manager {              # Home-Manager module that is used.
         home-manager.useUserPackages = true;
         home-manager.extraSpecialArgs = {
           inherit inputs stable user location;
-        };
+        };                                                  # Pass flake variable
         home-manager.users.${user} = {
           imports = [
             nur.hmModules.nur
             nix-index-database.hmModules.nix-index
             { nixpkgs.overlays = [ nur.overlay ]; }
-            (import ./home.nix)
-            (import ./vm/home.nix)
+            ./home.nix
+            ./desktop-clotho/home.nix
           ];
         };
       }
     ];
   };
 
-  desktop = lib.nixosSystem {                               # Desktop profile 
+  vm = lib.nixosSystem {                                    # VM profile
     inherit system;
     specialArgs = {
-      inherit inputs stable system user location;
-    };                                                      # Pass flake variable
-    modules = [                                             # Modules that are used.
+      inherit inputs stable user location;
+    };
+    modules = [
       nur.nixosModules.nur
       { nixpkgs.overlays = [ nur.overlay ]; }
-      ./desktop
+      ./vm
       ./configuration.nix
 
-      home-manager.nixosModules.home-manager {              # Home-Manager module that is used.
+      home-manager.nixosModules.home-manager {
         home-manager.useUserPackages = true;
         home-manager.extraSpecialArgs = {
           inherit inputs stable user location;
-        };                                                  # Pass flake variable
+        };
         home-manager.users.${user} = {
           imports = [
             nur.hmModules.nur
             nix-index-database.hmModules.nix-index
             { nixpkgs.overlays = [ nur.overlay ]; }
-            ./home.nix
-            ./desktop/home.nix
+            (import ./home.nix)
+            (import ./vm/home.nix)
           ];
         };
       }

@@ 25,6 25,7 @@
     [(import ./hardware-configuration.nix)] ++            # Current system hardware config @ /etc/nixos/hardware-configuration.nix
     [(import ../../modules/desktop/dm/sddm.nix)] ++       # Desktop manager
     [(import ../../modules/desktop/qtile/default.nix)] ++ # Window Manager
+    [(import ../../modules/programs/games.nix)] ++
     (import ../../modules/desktop/virtualisation) ++ # Window Manager
     (import ../../modules/hardware) ++                    # Hardware devices
     [(import ../../modules/programs/fpga/vivado {


@@ 32,7 33,7 @@
       vivadoPath = "/data/Linux/fpga/apps/xilinx/Vivado/2023.1/bin/vivado";
     })];
 
-  networking.hostName = "nixos-desktop";
+  networking.hostName = "desktop-clotho";
 
   boot = {                                      # Boot options
     kernelPackages = pkgs.linuxPackages_latest;

@@ 30,7 30,7 @@
       vivadoPath = "/data/fpga/xilinx/Vivado/2023.1/bin/vivado";
     })];                      # Hardware devices
 
-  networking.hostName = "nixos-laptop";
+  networking.hostName = "laptop-iapetus";
 
   boot = {                                  # Boot options
     kernelPackages = pkgs.linuxPackages_latest;