Refactor with nixfmt

2026-03-07 20:28:08 +01:00 · 2026-02-06 08:36:47 +01:00
parent fe643f065b
commit 82e4ea3c73
41 changed files with 1259 additions and 1112 deletions
--- a/lib/mksystem.nix
+++ b/lib/mksystem.nix
@@ -1,66 +1,66 @@
 # This file is based on https://github.com/kahlstrm/nixos-config/blob/main/lib/mksystem.nix
 {
-	overlays,
-	nixvim,
-	millennium,
-	nur,
-	inputs,
-	nixpkgs,
-	home-manager,
+  overlays,
+  nixvim,
+  millennium,
+  nur,
+  inputs,
+  nixpkgs,
+  home-manager,
 }:
 name:
 {
-	system,
-	user,
-	email,
-	gamingSystem ? false,
-	workSystem ? false,
-	desktopEnvironment ? "",
-	additionalModules ? [],
+  system,
+  user,
+  email,
+  gamingSystem ? false,
+  workSystem ? false,
+  desktopEnvironment ? "",
+  additionalModules ? [ ],
 }:
 let
-	nixConfig = ../modules/nix-config/default.nix;
-	machineConfig = ../machines/${name}/default.nix;
-	HMConfig = ../home;
-	systemPackages = ../modules/packages.nix;
-	specialArgs = {
-		pkgs-stable = import nixpkgs {
-			inherit system;
-			config.allowUnfree = true;
-		};
-		currentSystem = system;
-		currentSystemName = name;
-		currentSystemUser = user;
-		currentSystemEmail = email;
-		currentSystemDe = desktopEnvironment;
-		gamingSystem = gamingSystem;
-		workSystem = workSystem;
-		nixvim = nixvim;
-		millennium = millennium;
-		nur = nur;
-		inputs = inputs;
-		additionalModules = additionalModules;
-	};
+  nixConfig = ../modules/nix-config/default.nix;
+  machineConfig = ../machines/${name}/default.nix;
+  HMConfig = ../home;
+  systemPackages = ../modules/packages.nix;
+  specialArgs = {
+    pkgs-stable = import nixpkgs {
+      inherit system;
+      config.allowUnfree = true;
+    };
+    currentSystem = system;
+    currentSystemName = name;
+    currentSystemUser = user;
+    currentSystemEmail = email;
+    currentSystemDe = desktopEnvironment;
+    gamingSystem = gamingSystem;
+    workSystem = workSystem;
+    nixvim = nixvim;
+    millennium = millennium;
+    nur = nur;
+    inputs = inputs;
+    additionalModules = additionalModules;
+  };
 in
 nixpkgs.lib.nixosSystem {
-	inherit system specialArgs;
-	modules = [
-		{ nixpkgs.overlays = overlays; }
-		nixConfig
-		systemPackages
-		nur.modules.nixos.default
-		nur.legacyPackages."${system}".repos.iopq.modules.xraya
-		home-manager.nixosModules.home-manager
-		{
-			home-manager.backupFileExtension = "backup";
-			home-manager.useGlobalPkgs = true;
-			home-manager.useUserPackages = true;
-			home-manager.users.${user} = import HMConfig;
-			home-manager.extraSpecialArgs = specialArgs;
-			home-manager.sharedModules = [
-			];
-		}
-		machineConfig
-	] ++ additionalModules;
+  inherit system specialArgs;
+  modules = [
+    { nixpkgs.overlays = overlays; }
+    nixConfig
+    systemPackages
+    nur.modules.nixos.default
+    nur.legacyPackages."${system}".repos.iopq.modules.xraya
+    home-manager.nixosModules.home-manager
+    {
+      home-manager.backupFileExtension = "backup";
+      home-manager.useGlobalPkgs = true;
+      home-manager.useUserPackages = true;
+      home-manager.users.${user} = import HMConfig;
+      home-manager.extraSpecialArgs = specialArgs;
+      home-manager.sharedModules = [
+      ];
+    }
+    machineConfig
+  ]
+  ++ additionalModules;
 }
-