Changed: Niri bindings, docker, isoConfig

flake.nix

@@ -58,8 +58,6 @@
     }:
 
     let
-      system = "x86_64-linux";
-
       # Common Configuration
       commonModules = [
         (
@@ -83,28 +81,22 @@
         )
       ];
 
-      commonHomeManagerConfig =
+      commonHomeManagerConfig = username: {
-        {
+        home-manager = {
-          username,
+          useGlobalPkgs = true;
-          monitorSetup ? "single",
+          useUserPackages = true;
-        }:
+          backupFileExtension = "backup";
-        {
+          extraSpecialArgs = {
-          home-manager = {
+            inherit inputs username;
-            useGlobalPkgs = true;
-            useUserPackages = true;
-            backupFileExtension = "backup";
-            extraSpecialArgs = {
-              inherit inputs;
-              inherit username monitorSetup;
-            };
-            users.${username} = import ./users/${username}/home.nix;
-            sharedModules = [
-              inputs.catppuccin.homeModules.catppuccin
-              inputs.nixcord.homeModules.nixcord
-              inputs.nixvim.homeManagerModules.nixvim
-            ];
           };
+          users.${username} = import ./users/${username}/home.nix;
+          sharedModules = [
+            inputs.catppuccin.homeModules.catppuccin
+            inputs.nixcord.homeModules.nixcord
+            inputs.nixvim.homeManagerModules.nixvim
+          ];
         };
+      };
 
       # System Builder for NixOS
       mkSystem =
@@ -119,8 +111,12 @@
         nixpkgs.lib.nixosSystem {
           inherit system;
           specialArgs = {
-            inherit inputs;
+            inherit
-            inherit username monitorSetup containerization;
+              inputs
+              username
+              monitorSetup
+              containerization
+              ;
           };
           modules =
             commonModules
@@ -136,34 +132,37 @@
         };
 
       # ISO configuration
-      isoConfig = nixpkgs.lib.nixosSystem {
+      mkIsoConfig =
-        inherit system;
+        { system }:
-        modules = [
+        nixpkgs.lib.nixosSystem {
-          (import (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"))
+          inherit system;
-          (
+          modules = [
-            { pkgs, ... }:
+            (import (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"))
-            {
+            (
-              environment.systemPackages = with pkgs; [
+              { pkgs, ... }:
-                neovim
+              {
-                git
+                environment.systemPackages = with pkgs; [
-                wget
+                  neovim
-                curl
+                  git
-              ];
+                  wget
-              nix.settings.experimental-features = [
+                  curl
-                "nix-command"
+                ];
-                "flakes"
+                nix.settings.experimental-features = [
-              ];
+                  "nix-command"
-            }
+                  "flakes"
-          )
+                ];
-        ];
+              }
-      };
+            )
+          ];
+        };
 
     in
     {
-      packages.${system}.default = self.nixosConfigurations.iso.config.system.build.isoImage;
+      packages.x86_64-linux.iso = self.nixosConfigurations.iso.config.system.build.isoImage;
+      packages.x86_64-linux.default = self.packages.x86_64-linux.iso;
 
       nixosConfigurations = {
-        iso = isoConfig;
+        iso = mkIsoConfig { system = "x86_64-linux"; };
 
         qemu = mkSystem {
           hostname = "qemu";

modules/localisation.nix

@@ -1,10 +1,10 @@
-{ pkgs, ... }:
+{ ... }:
 {
   # Set your time zone.
   time.timeZone = "Europe/Berlin";
 
   # Select internationalisation properties.
-  i18n.defaultLocale = "de_DE.UTF-8";
+  i18n.defaultLocale = "en_US.UTF-8";
 
   i18n.extraLocaleSettings = {
     LC_ADDRESS = "de_DE.UTF-8";