From 15afdf081ebc1738f179c7f0fdfa609618bc312a Mon Sep 17 00:00:00 2001 From: iFargle Date: Thu, 13 Jul 2023 18:24:24 +0900 Subject: [PATCH] test --- flake.nix | 1 - users/albert/home.nix | 19 +++++++++++-------- users/root/home.nix | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index 29b5a958..0a84effa 100644 --- a/flake.nix +++ b/flake.nix @@ -68,7 +68,6 @@ # Home Manager settings home-manager.nixosModules.home-manager { - inherit hostname; home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.albert = import ./users/albert/home.nix; diff --git a/users/albert/home.nix b/users/albert/home.nix index a2372d69..a51c90cf 100644 --- a/users/albert/home.nix +++ b/users/albert/home.nix @@ -1,10 +1,13 @@ { config, pkgs, hostname, ... }: { - home.stateVersion = "23.05"; - imports = [ - ../../hosts/${hostname}/gnome-dconf.nix - ../../home-manager/git.nix - ../../home-manager/neovim.nix - ../../home-manager/bash.nix - ../../home-manager/firefox.nix - ]; + let hostname = ${hostname} + in { + home.stateVersion = "23.05"; + imports = [ + ../../hosts/${hostname}/gnome-dconf.nix + ../../home-manager/git.nix + ../../home-manager/neovim.nix + ../../home-manager/bash.nix + ../../home-manager/firefox.nix + ]; + } } \ No newline at end of file diff --git a/users/root/home.nix b/users/root/home.nix index 93a3033d..93c398c6 100644 --- a/users/root/home.nix +++ b/users/root/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: { +{ config, pkgs, hostname, ... }: { home.stateVersion = "23.05"; imports = [ ../../home-manager/git.nix