From 428fc03330339988316cfb3562e31b14ee018a38 Mon Sep 17 00:00:00 2001 From: iFargle Date: Wed, 23 Aug 2023 21:39:51 +0900 Subject: [PATCH] test --- flake.nix | 3 +-- home-manager/default.nix | 6 ++++-- lib/default.nix | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index fd7986ec..c037085e 100644 --- a/flake.nix +++ b/flake.nix @@ -15,8 +15,7 @@ let inherit (self) outputs; stateVersion = "unstable"; - hmStateVersion = "23.05"; - libx = import ./lib { inherit inputs outputs hmStateVersion stateVersion; }; + libx = import ./lib { inherit inputs outputs stateVersion; }; in { nixosConfigurations = { nixos-laptop = libx.mkHost { hostname = "nixos-laptop"; username = "albert"; desktop = "gnome"; }; diff --git a/home-manager/default.nix b/home-manager/default.nix index d14c4043..cd1bbbea 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -1,8 +1,10 @@ -{ lib, config, pkgs, hostname, username, desktop, stateVersion, ... }: { +{ lib, config, pkgs, hostname, username, desktop, hmStateVersion, ... }: { home = { - inherit stateVersion; + stateVersion = hmStateVersion; inherit username; + inherit desktop; + inherit hostname; }; imports = [ diff --git a/lib/default.nix b/lib/default.nix index ad509406..3b0edf21 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,4 +1,4 @@ -{ inputs, outputs, hmStateVersion, stateVersion, ... }: { +{ inputs, outputs, stateVersion, hmStateVersion, ... }: { # Helper function for generating home-manager configs mkHome = { hostname, username, desktop ? null, platform ? "x86_64-linux" }: inputs.home-manager.lib.homeManagerConfiguration { pkgs = inputs.nixpkgs.legacyPackages.${platform};