From d1e6fad5b3c399d3b8c13f7844e1dc080f61ba29 Mon Sep 17 00:00:00 2001 From: Bun Date: Wed, 14 May 2025 16:47:45 -0400 Subject: [PATCH] Make latest kernel default, remove old dbus option --- hosts/detritus/boot/default.nix | 3 +-- hosts/hidden/boot/default.nix | 3 +-- hosts/intuos/boot/default.nix | 3 +-- hosts/jupiter/boot/default.nix | 3 +-- hosts/jupiter/jovian/default.nix | 9 +++------ hosts/redmond/boot/default.nix | 3 +-- modules/home/settings/dconf/default.nix | 14 +++++++++----- modules/system/devices/boot/default.nix | 3 ++- modules/system/devices/boot/plymouth/default.nix | 5 ++--- modules/system/programs/desktops/default.nix | 2 -- 10 files changed, 21 insertions(+), 27 deletions(-) diff --git a/hosts/detritus/boot/default.nix b/hosts/detritus/boot/default.nix index e493a266..a802df85 100644 --- a/hosts/detritus/boot/default.nix +++ b/hosts/detritus/boot/default.nix @@ -1,7 +1,6 @@ -{ pkgs, ... }: +{ ... }: { boot = { - kernelPackages = pkgs.linuxPackages_latest; kernelParams = [ "amdgpu.si_support=1" "radeon.si_support=0" diff --git a/hosts/hidden/boot/default.nix b/hosts/hidden/boot/default.nix index 3cf63f7f..fae86e7f 100644 --- a/hosts/hidden/boot/default.nix +++ b/hosts/hidden/boot/default.nix @@ -1,7 +1,6 @@ -{ pkgs, ... }: +{ ... }: { boot = { - kernelPackages = pkgs.linuxPackages_latest; loader.systemd-boot.enable = true; plymouth.enable = true; }; diff --git a/hosts/intuos/boot/default.nix b/hosts/intuos/boot/default.nix index f6458c21..84a34f0c 100644 --- a/hosts/intuos/boot/default.nix +++ b/hosts/intuos/boot/default.nix @@ -1,7 +1,6 @@ -{ pkgs, ... }: +{ ... }: { boot = { - kernelPackages = pkgs.linuxPackages_latest; lanzaboote.enable = true; plymouth.enable = true; }; diff --git a/hosts/jupiter/boot/default.nix b/hosts/jupiter/boot/default.nix index 3cf63f7f..fae86e7f 100644 --- a/hosts/jupiter/boot/default.nix +++ b/hosts/jupiter/boot/default.nix @@ -1,7 +1,6 @@ -{ pkgs, ... }: +{ ... }: { boot = { - kernelPackages = pkgs.linuxPackages_latest; loader.systemd-boot.enable = true; plymouth.enable = true; }; diff --git a/hosts/jupiter/jovian/default.nix b/hosts/jupiter/jovian/default.nix index c120932f..aa5a2607 100644 --- a/hosts/jupiter/jovian/default.nix +++ b/hosts/jupiter/jovian/default.nix @@ -23,8 +23,8 @@ }; boot = { - kernelPackages = lib.mkForce pkgs.linuxPackages_jovian; - kernelParams = ["amd_pstate=active"]; + kernelPackages = pkgs.linuxPackages_jovian; + kernelParams = [ "amd_pstate=active" ]; }; programs.steam.extest.enable = true; @@ -48,10 +48,7 @@ "/etc/NetworkManager/system-connections" "/var/lib/decky-loader" ]; - users.${config.sysusers.main}.directories = [ - ".config/dconf" - ".steam" - ]; + users.${config.sysusers.main}.directories = [ ".steam" ]; }; gnome.excludePackages = with pkgs; [ adwaita-icon-theme diff --git a/hosts/redmond/boot/default.nix b/hosts/redmond/boot/default.nix index d91be35e..478c4786 100644 --- a/hosts/redmond/boot/default.nix +++ b/hosts/redmond/boot/default.nix @@ -1,7 +1,6 @@ -{ pkgs, ... }: +{ ... }: { boot = { - kernelPackages = pkgs.linuxPackages_latest; kernelParams = [ "amdgpu.cik_support=1" "radeon.cik_support=0" diff --git a/modules/home/settings/dconf/default.nix b/modules/home/settings/dconf/default.nix index 005a1a89..36fd2ab6 100644 --- a/modules/home/settings/dconf/default.nix +++ b/modules/home/settings/dconf/default.nix @@ -1,10 +1,14 @@ { config, lib, ... }: { - dconf.settings = lib.mkIf config.home.desktop.enable { - "org/gnome/desktop/interface/color-scheme".color-scheme = "prefer-dark"; - "org/virt-manager/virt-manager/connections" = { - autoconnect = [ "qemu:///system" ]; - uris = [ "qemu:///system" ]; + config = lib.mkIf config.home.desktop.enable { + dconf.settings = { + "org/gnome/desktop/interface/color-scheme".color-scheme = "prefer-dark"; + "org/virt-manager/virt-manager/connections" = { + autoconnect = [ "qemu:///system" ]; + uris = [ "qemu:///system" ]; + }; }; + home.persistence."${config.xdg.userDirs.extraConfig.XDG_PERSIST_DIR}".directories = with lib; with config.home; with config.xdg; + [ "games/${removePrefix "${homeDirectory}/" stateHome}/dconf" ]; }; } diff --git a/modules/system/devices/boot/default.nix b/modules/system/devices/boot/default.nix index 15adb99c..41c0496b 100644 --- a/modules/system/devices/boot/default.nix +++ b/modules/system/devices/boot/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ lib, pkgs, ... }: { imports = [ ./grub @@ -9,6 +9,7 @@ ]; boot = { + kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; kernelParams = [ "nouveau.config=NvGspRm=1" ]; blacklistedKernelModules = [ "pcspkr" ]; kernel.sysctl = { diff --git a/modules/system/devices/boot/plymouth/default.nix b/modules/system/devices/boot/plymouth/default.nix index 96773c96..a1279fde 100644 --- a/modules/system/devices/boot/plymouth/default.nix +++ b/modules/system/devices/boot/plymouth/default.nix @@ -1,13 +1,12 @@ { config, lib, ... }: { config.boot = lib.mkIf config.boot.plymouth.enable { - loader.timeout = lib.mkForce 0; - consoleLogLevel = lib.mkForce 0; + consoleLogLevel = 0; + loader.timeout = 0; initrd.verbose = false; kernelParams = [ "quiet" "splash" - "boot.shell_on_fail" "loglevel=3" "rd.systemd.show_status=false" "rd.udev.log_level=3" diff --git a/modules/system/programs/desktops/default.nix b/modules/system/programs/desktops/default.nix index d693bd1b..9ffc2855 100644 --- a/modules/system/programs/desktops/default.nix +++ b/modules/system/programs/desktops/default.nix @@ -2,8 +2,6 @@ { config = lib.mkIf config.system.desktop.enable { programs.sway.enable = true; - - services.dbus.enable = true; security.pam.services.swaylock = {}; }; }