Sun Jun 2 02:38:25 PM CEST 2024

NixOS/flake.nix

@@ -31,10 +31,10 @@
     let
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
-      commonModules = name: user: [
+      commonModules = host: user: [
-        ./hosts/${name}/hardware-configuration.nix
+        ./hosts/${host}/hardware-configuration.nix
         {
-          networking.hostName = name;
+          networking.hostName = host;
           boot.loader.systemd-boot.enable = true;
           boot.loader.efi.canTouchEfiVariables = true;
           time.timeZone = "Europe/Brussels";
@@ -120,15 +120,15 @@
             useGlobalPkgs = true;
             useUserPackages = true;
             users.${user} = {
-              imports = [ ./home.nix ];
+              imports = [ ./home/${host}.nix ];
             };
           };
         }
-        ./hosts/${name}
+        ./hosts/${host}
       ];
-      mkSystem = name: cfg: nixpkgs.lib.nixosSystem {
+      mkSystem = host: cfg: nixpkgs.lib.nixosSystem {
         system = cfg.system or "x86_64-linux";
-        modules = (commonModules name cfg.user) ++ (cfg.modules or [ ]);
+        modules = (commonModules host cfg.user) ++ (cfg.modules or [ ]);
         specialArgs = inputs;
       };
       systems = {

NixOS/home/hyprland/default.nix

@@ -66,7 +66,6 @@ in
         [ "${./files/wallpaper.png}" ];
 
       wallpaper = [
-        "Virtual-1,${./files/wallpaper.png}"
         "DP-3,${./files/wallpaper.png}"
         "DP-2,${./files/wallpaper.png}"
         "HDMI-A-1,${./files/wallpaper.png}"

NixOS/home/nixos.nix

@@ -0,0 +1,7 @@
+{ inputs, config, pkgs, ... }:
+
+{
+  imports = [
+      (./common.nix { inherit inputs config pkgs; })
+  ];
+}

NixOS/hosts/nixos/default.nix

@@ -1 +1,2 @@
-{}
+{
+}