From 2f6977bb82c56ff28e3af838eab165ff07476081 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Thu, 29 Feb 2024 08:26:04 +0000 Subject: [PATCH] Rename variables --- flake.nix | 10 +++++----- lib/nixos/default.nix | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 990846e..a06e8ae 100644 --- a/flake.nix +++ b/flake.nix @@ -17,8 +17,8 @@ pkgs = inputs.nixpkgs.legacyPackages.${system}; - nixos-system = import ./lib/nixos {inherit inputs pkgs self system username;}; - wsl-system = import ./lib/wsl2 {inherit inputs pkgs self system username;}; + mkNixos = import ./lib/nixos {inherit inputs pkgs self system username;}; + mkWsl = import ./lib/wsl2 {inherit inputs pkgs self system username;}; in flake-parts.lib.mkFlake {inherit inputs;} { systems = ["x86_64-linux"]; @@ -37,19 +37,19 @@ flake = { nixosConfigurations = { - apollo = nixos-system { + apollo = mkNixos { desktop = true; hostname = "apollo"; }; - nixedo = nixos-system { + nixedo = mkNixos { desktop = true; hostname = "nixedo"; }; }; homeConfigurations = { - wsl2 = wsl-system; + wsl2 = mkWsl; }; }; }; diff --git a/lib/nixos/default.nix b/lib/nixos/default.nix index 51aee7e..672379b 100644 --- a/lib/nixos/default.nix +++ b/lib/nixos/default.nix @@ -9,7 +9,7 @@ hostname, }: let configuration = import ./configuration.nix {inherit desktop hostname inputs pkgs system;}; - hardware-configuration = import ./hardware-configuration.nix; + hardwareConfiguration = import ./hardware-configuration.nix; in inputs.nixpkgs.lib.nixosSystem { modules = [ @@ -24,6 +24,6 @@ in } configuration - hardware-configuration + hardwareConfiguration ]; }