DuN0z/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: git for stable version

Browse source
This commit is contained in:
DuN0z 2025-10-23 03:32:00 +02:00
parent 1a2f93f977
commit 1dc4d79e20
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
flake.nix
View file

@ -62,11 +62,18 @@
}; };
terre-neuvas = nixpkgs-stable.lib.nixosSystem { terre-neuvas = nixpkgs-stable.lib.nixosSystem {
specialArgs = { inherit agenix; }; specialArgs = { inherit agenix; inherit nvim-config; };
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./hosts/terre-neuvas/configuration.nix ./hosts/terre-neuvas/configuration.nix
home-manager-stable.nixosModules.home-manager home-manager-stable.nixosModules.home-manager
{
home-manager = {
useGlobalPkgs = true ;
useUserPackages = true ;
extraSpecialArgs = {inherit nvim-config; };
};
}
agenix.nixosModules.default agenix.nixosModules.default
]; ];
}; };

10
hm/common/git.nix
View file

@ -1,13 +1,19 @@
_: { lib, config, ...}:
let let
globals = import ../../config/globals.nix; globals = import ../../config/globals.nix;
nixosRelease = lib.attrByPath [ "system" "nixos" "release" ] "0.0" config;
newGit = lib.versionAtLeast nixosRelease "25.11";
in { in {
programs.git = { programs.git = if newGit then {
enable = true; enable = true;
settings.user = { settings.user = {
name = globals.admin.name; name = globals.admin.name;
email = globals.admin.email; email = globals.admin.email;
}; };
} else {
enable = true;
userName = globals.admin.name;
userEmail = globals.admin.email;
}; };
} }
# vim: set ts=2 sw=2 sts=2 et : # vim: set ts=2 sw=2 sts=2 et :