upgrade to 25.11

This commit is contained in:
ari committed 2025-12-04 10:55:20 -05:00
1 parent cec42ccf0a
commit 0e40b878c8
14 files changed
+151 -173

No files matched your search

+10 -14
View File
@@ -32,13 +32,11 @@ in
user = {
name = "root";
};
}) // {
git = (makeCommonGitConfigs {
userName = "root";
userEmail = "root@${hostName}";
extraGitConfigs = [ ];
});
};
}) // (makeCommonGitConfigs {
userName = "root";
userEmail = "root@${hostName}";
extraGitConfigs = [ ];
});
services = servicesModule { pkgs = pkgs; };
fonts = fontsModule;
};
@@ -71,13 +69,11 @@ in
};
programs = (programsModule {
inherit pkgs user;
}) // {
git = (makeCommonGitConfigs {
userName = fullName;
userEmail = email;
extraGitConfigs = extraGitConfigs;
});
};
}) // (makeCommonGitConfigs {
userName = fullName;
userEmail = email;
extraGitConfigs = extraGitConfigs;
});
services = servicesModule { pkgs = pkgs; };
};
}
+20 -13
View File
@@ -7,21 +7,28 @@ let
, userEmail
, extraGitConfigs ? [ ]
}: {
enable = true;
userName = userName;
userEmail = userEmail;
delta = { enable = true; };
extraConfig = {
color = { ui = "auto"; };
push = {
default = "upstream";
autoSetupRemote = true;
delta = {
enable = true;
enableGitIntegration = true;
};
git = {
enable = true;
settings = {
user = {
name = userName;
email = userEmail;
};
color = { ui = "auto"; };
push = {
default = "upstream";
autoSetupRemote = true;
};
init = { defaultBranch = "main"; };
};
init = { defaultBranch = "main"; };
includes =
(builtins.map (f: { path = gitconfigs + "/" + f; }) gitconfigFiles)
++ extraGitConfigs;
};
includes =
(builtins.map (f: { path = gitconfigs + "/" + f; }) gitconfigFiles)
++ extraGitConfigs;
};
in
{
+1 -1
View File
@@ -80,7 +80,7 @@
'';
plugins = with pkgs.nushellPlugins; [
polars
net
# net
highlight
];
};