osbm/flake
1
0
Fork 0
Code Issues Pull requests Wiki Activity

fix home manager config

Browse source
This commit is contained in:
Osman Faruk Bayram 2025-10-21 16:21:07 +03:00
parent 926314380b
commit bc3f697cff
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
hosts/darwinHosts/prometheus/configuration.nix
View file

@ -19,13 +19,9 @@
useUserPackages = true; useUserPackages = true;
verbose = true; verbose = true;
backupFileExtension = "hmbak"; backupFileExtension = "hmbak";
users.osbm = import ../../../modules/home-manager/default.nix { users.osbm = {
inherit config pkgs lib; imports = [ ../../../modules/home-manager ];
username = "osbm"; home.stateVersion = "24.11";
homeDirectory = "/Users/osbm";
stateVersion = "24.11";
enableGTK = false;
enableGhostty = false;
}; };
}; };

3
modules/home-manager/default.nix
View file

@ -13,6 +13,9 @@
EDITOR = lib.mkDefault "nvim"; EDITOR = lib.mkDefault "nvim";
}; };
# Don't set stateVersion here - let it be set by the system configuration
# home.stateVersion should be set in the system's home-manager configuration
# Enable basic programs that most users want # Enable basic programs that most users want
programs.home-manager.enable = true; programs.home-manager.enable = true;
} }

11
modules/nixos/system/home-manager.nix
View file

@ -25,16 +25,17 @@
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = { inherit inputs; };
# Configure home-manager for each user (excluding root) # Configure home-manager for each user (excluding root)
users = users =
let let
# Capture the NixOS system config before entering the home-manager scope # Capture the NixOS system config before entering the home-manager scope
systemConfig = config; systemConfig = config;
in in
lib.genAttrs (builtins.filter (u: u != "root") config.osbmModules.users) (username: { lib.genAttrs (builtins.filter (u: u != "root") config.osbmModules.users) (username: {
home.stateVersion = lib.mkDefault "24.05"; # Use the system's stateVersion for home-manager
imports = [ home.stateVersion = lib.mkDefault systemConfig.system.stateVersion;
../../home-manager imports = [
] ../../home-manager
]
++ lib.optionals systemConfig.osbmModules.hardware.disko.zfs.root.impermanenceRoot [ ++ lib.optionals systemConfig.osbmModules.hardware.disko.zfs.root.impermanenceRoot [
# Import impermanence home-manager module when impermanence is enabled # Import impermanence home-manager module when impermanence is enabled
inputs.impermanence.homeManagerModules.impermanence inputs.impermanence.homeManagerModules.impermanence