Compare commits

..

No commits in common. "6fb7626f14d3accc1879a57acc90b101c1945601" and "206cd46cfc685d94caf026ff940f5218ba05d482" have entirely different histories.

2 changed files with 66 additions and 76 deletions

View file

@ -146,7 +146,7 @@
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.
boot = { boot = {
kernelPackages = pkgs.linuxPackages_6_10; kernelPackages = pkgs.linuxPackages_latest;
initrd = { initrd = {
availableKernelModules = [ availableKernelModules = [
"nvme" "nvme"
@ -163,6 +163,7 @@
"apple-mfi-fastcharge" "apple-mfi-fastcharge"
"zenpower" "zenpower"
]; ];
kernelParams = [ "nvidia_drm.fbdev=1" ];
extraModulePackages = with config.boot.kernelPackages; [ extraModulePackages = with config.boot.kernelPackages; [
zenpower zenpower
cpupower cpupower
@ -260,8 +261,7 @@
}; };
}; };
systemd = { systemd.network = {
network = {
enable = true; enable = true;
# wait-online.extraArgs = [ "--interface=enp4s0" ]; # wait-online.extraArgs = [ "--interface=enp4s0" ];
@ -335,14 +335,6 @@
}; };
}; };
services = {
ollama = {
after = [ "tailscaled.service" ];
preStart = "${pkgs.coreutils}/bin/sleep 10"; # Tailscale reports ready before getting an IP address
};
};
};
# programs.ssh.startAgent = true; # programs.ssh.startAgent = true;
programs = { programs = {
sway = { sway = {
@ -484,8 +476,6 @@
sessionVariables = { sessionVariables = {
WLR_NO_HARDWARE_CURSORS = "1"; WLR_NO_HARDWARE_CURSORS = "1";
GBM_BACKEND = "nvidia-drm";
__GLX_VENDOR_LIBRARY_NAME = "nvidia";
}; };
}; };

View file

@ -169,7 +169,7 @@ in
}; };
}; };
services = { services = {
kanshi.enable = false; kanshi.enable = true;
xbanish.enable = false; xbanish.enable = false;
wayvnc = { wayvnc = {
enable = true; enable = true;