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
];
};
-1
View File
@@ -13,6 +13,5 @@
];
config = {
environment.sessionVariables.EDITOR = "vi";
programs.thefuck.enable = true;
};
}
+1 -3
View File
@@ -9,10 +9,9 @@ let
font-awesome
mplus-outline-fonts.githubRelease
jetbrains-mono
ubuntu_font_family
ubuntu-classic
noto-fonts
noto-fonts-cjk-sans
noto-fonts-emoji
noto-fonts-color-emoji
];
in
@@ -32,4 +31,3 @@ in
};
};
}
+4 -4
View File
@@ -14,10 +14,10 @@ in
config = lib.mkIf cfg.enable {
boot.initrd.kernelModules = [ "amdgpu" ];
services.xserver.videoDrivers = [ "amdgpu" ];
hardware.graphics = {
extraPackages = [ pkgs.amdvlk ];
extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
};
# hardware.graphics = {
# extraPackages = [ pkgs.amdvlk ];
# extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
# };
environment.systemPackages = (with pkgs; [
rocmPackages.rocm-smi
rocmPackages.rpp
+13 -9
View File
@@ -56,15 +56,19 @@ in
systemd.sleep.extraConfig = "HibernateDelaySec=30m";
# Logind
services.logind = {
lidSwitchExternalPower = "suspend-then-hibernate";
lidSwitch = "suspend-then-hibernate";
powerKey = "lock";
extraConfig = ''
LidSwitchIgnoreInhibited=yes
HandlePowerKey=suspend-then-hibernate
IdleAction=suspend-then-hibernate
IdleActionSec=2m
'';
settings = {
Login = {
HandleLidSwitchExternalPower = "suspend-then-hibernate";
HandleLidSwitch = "suspend-then-hibernate";
HandlePowerKey = "lock";
};
};
# extraConfig = ''
# LidSwitchIgnoreInhibited=yes
# HandlePowerKey=suspend-then-hibernate
# IdleAction=suspend-then-hibernate
# IdleActionSec=2m
# '';
};
};
}
+1 -1
View File
@@ -15,7 +15,7 @@ in
};
};
config = lib.mkIf cfg.enable {
services.xserver.desktopManager.gnome.enable = true;
services.desktopManager.gnome.enable = true;
environment.gnome.excludePackages = with pkgs; [
gnome-tour
gnome-text-editor
-1
View File
@@ -32,7 +32,6 @@ in
mako
wofi
rofi
rofi-wayland
# Control Tools
pavucontrol
playerctl