Changed: Niri bindings, docker, isoConfig

flake.nix

@@ -58,8 +58,6 @@
     }:
 
     let
-      system = "x86_64-linux";
-
       # Common Configuration
       commonModules = [
         (
@@ -83,19 +81,13 @@
         )
       ];
 
-      commonHomeManagerConfig =
+      commonHomeManagerConfig = username: {
-        {
-          username,
-          monitorSetup ? "single",
-        }:
-        {
         home-manager = {
           useGlobalPkgs = true;
           useUserPackages = true;
           backupFileExtension = "backup";
           extraSpecialArgs = {
-              inherit inputs;
+            inherit inputs username;
-              inherit username monitorSetup;
           };
           users.${username} = import ./users/${username}/home.nix;
           sharedModules = [
@@ -119,8 +111,12 @@
         nixpkgs.lib.nixosSystem {
           inherit system;
           specialArgs = {
-            inherit inputs;
+            inherit
-            inherit username monitorSetup containerization;
+              inputs
+              username
+              monitorSetup
+              containerization
+              ;
           };
           modules =
             commonModules
@@ -136,7 +132,9 @@
         };
 
       # ISO configuration
-      isoConfig = nixpkgs.lib.nixosSystem {
+      mkIsoConfig =
+        { system }:
+        nixpkgs.lib.nixosSystem {
           inherit system;
           modules = [
             (import (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"))
@@ -160,10 +158,11 @@
 
     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";