diff --git a/nix/configurations/vanadium/home/misc.nix b/nix/configurations/vanadium/home/misc.nix index 4cf015ee..b7741b36 100644 --- a/nix/configurations/vanadium/home/misc.nix +++ b/nix/configurations/vanadium/home/misc.nix @@ -30,7 +30,7 @@ home.file = { ".xscreensaver".source = "${./xscreensaver/.xscreensaver}"; - ".wallpaper".source = "${pkgs.wallpapers.y-combinator}/main.svg"; + ".wallpaper".source = "${pkgs.wallpapers_source}/images/KnightsOfGuinevere/guinevere_francesca.png"; }; xdg.configFile = { "xmonad".source = "${./xmonad}"; diff --git a/nix/configurations/vanadium/kernel-overlay.nix b/nix/configurations/vanadium/kernel-overlay.nix index c6615c22..4243b3f6 100644 --- a/nix/configurations/vanadium/kernel-overlay.nix +++ b/nix/configurations/vanadium/kernel-overlay.nix @@ -30,18 +30,19 @@ in { SCHED_MC = yes; X86_MCE = yes; X86_MCE_AMD = yes; + X86_MCE_INTEL = no; PERF_EVENTS_INTEL_RAPL = yes; X86_AMD_PSTATE = yes; X86_POWERNOW_K8 = no; + # Processor type and features > Performance monitoring + PERF_EVENTS_AMD_POWER = yes; + PERF_EVENTS_AMD_UNCORE = yes; + # With amd_pstate=active ondemand won't be available anyway. # Without more testing, we should accept the claim that its more power efficient and stick to it CPU_FREQ = yes; X86_INTEL_PSTATE = lib.mkForce no; - CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = lib.mkForce no; - CPU_FREQ_DEFAULT_GOV_ONDEMAND = yes; - # ERROR: could not insert 'amd_freq_sensitivity': No such device - X86_AMD_FREQ_SENSITIVITY = module; # skipping firmware loading section since it's handled by other parts of nixos options SENSORS_K10TEMP = yes; diff --git a/nix/configurations/vanadium/nixos/connectivity/networks.nix b/nix/configurations/vanadium/nixos/connectivity/networks.nix index e603f0e2..e87052ce 100644 --- a/nix/configurations/vanadium/nixos/connectivity/networks.nix +++ b/nix/configurations/vanadium/nixos/connectivity/networks.nix @@ -1,10 +1,11 @@ let + preferredPriority = 20; privatePriority = 10; limitedPriority = -10; in [ { ssid = "~"; - priority = privatePriority; + priority = preferredPriority; hasPassword = true; } { @@ -28,7 +29,6 @@ in [ ssid = "5526-1"; # TODO: set bssid preference ? priority = privatePriority; hasPassword = true; - scanOnLowSignal = true; } { diff --git a/nix/overlays/wallpapers.nix b/nix/overlays/wallpapers.nix index 0545f74e..b25035b2 100644 --- a/nix/overlays/wallpapers.nix +++ b/nix/overlays/wallpapers.nix @@ -1,6 +1,7 @@ let sources = import ../../npins; in - _: _: { - wallpapers = import sources.wallpapers {}; + _: _: rec { + wallpapers_source = sources.wallpapers; + wallpapers = import wallpapers_source {}; } diff --git a/nix/packages/by-name/ruler/package.nix b/nix/packages/by-name/ruler/package.nix index a393fb6d..e217fae0 100644 --- a/nix/packages/by-name/ruler/package.nix +++ b/nix/packages/by-name/ruler/package.nix @@ -12,8 +12,8 @@ domain = "git.confusedcompiler.org"; owner = "leana8959"; repo = "ruler"; - rev = "46f40d303f3b04d65475fdfd6511dd6431f20f24"; - hash = "sha256-goJ4iYnFqn88y6xEBhaFnos8O1MWIqHzwGrR1W0yijo="; + rev = "12b287522215781b21791101bf85f8a0dddd1225"; + hash = "sha256-XoTTxKxlUmtM9mxguwdEsMSp6qBkEgBcviM8bTgs95o="; }) {}; diff --git a/nix/secrets/wpa_password.age b/nix/secrets/wpa_password.age index 42ffe14d..805ead8d 100644 Binary files a/nix/secrets/wpa_password.age and b/nix/secrets/wpa_password.age differ diff --git a/npins/sources.json b/npins/sources.json index 07131616..7df0bc2f 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -221,9 +221,9 @@ }, "branch": "master", "submodules": false, - "revision": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", - "url": "https://github.com/NixOS/nixos-hardware/archive/d6645c340ef7d821602fd2cd199e8d1eed10afbc.tar.gz", - "hash": "0m84zxwanfq34j568w4xkvip5hwpwbhsk46xjvnl063y77i54vfs" + "revision": "43ffe9ac82567512abb83187cb673de1091bdfa8", + "url": "https://github.com/NixOS/nixos-hardware/archive/43ffe9ac82567512abb83187cb673de1091bdfa8.tar.gz", + "hash": "1amgw52j0z8mgfklgz3nfa1qcr4sj0vblapamqzsw148ii4xblsx" }, "nixpkgs": { "type": "Git", @@ -234,9 +234,9 @@ }, "branch": "nixos-25.05-small", "submodules": false, - "revision": "4d9bd66e3ea558621ae800445e9302a2aa1bb687", - "url": "https://github.com/NixOS/nixpkgs/archive/4d9bd66e3ea558621ae800445e9302a2aa1bb687.tar.gz", - "hash": "0dzq4bp8qamilabyy014qsjivr2ga7348da5fjiqbkp7y7fhbdk0" + "revision": "90b70846420ac681b72176a88d9fd0a5a06c74b1", + "url": "https://github.com/NixOS/nixpkgs/archive/90b70846420ac681b72176a88d9fd0a5a06c74b1.tar.gz", + "hash": "05ba9jcr3kgg9pn8alnk7bn63xxq2xahw8gpaclsy67q6nbya375" }, "nur": { "type": "Git", @@ -247,9 +247,9 @@ }, "branch": "main", "submodules": false, - "revision": "e68fcda79871132cb42777c15a2c4a3ea563cad6", - "url": "https://github.com/nix-community/nur/archive/e68fcda79871132cb42777c15a2c4a3ea563cad6.tar.gz", - "hash": "0qng617rx1b5vifnigrhshlsb7rviwaii2czbpgbi8ljyivw10v0" + "revision": "fd763567eda0a287d5512590a89b8bdf86f8cf4b", + "url": "https://github.com/nix-community/nur/archive/fd763567eda0a287d5512590a89b8bdf86f8cf4b.tar.gz", + "hash": "148rl5ckahjw99vvk2xiq17hbfggxp0nqvsr8f22sqs94i171hqh" }, "pin-emacs28": { "type": "Git", @@ -386,9 +386,9 @@ }, "branch": "mistress", "submodules": false, - "revision": "189b0f83db95462244e2dc2e12c68741c924cb46", - "url": "https://git.confusedcompiler.org/leana8959/wallpapers/archive/189b0f83db95462244e2dc2e12c68741c924cb46.tar.gz", - "hash": "1fkspkw0b61q4k13zmnzi9pbw9b5yyd3v1id2ml44xbh1qa09w2m" + "revision": "3e3ed2f3773a4e61db1f4ae8f55dc99c574ee6e1", + "url": "https://git.confusedcompiler.org/leana8959/wallpapers/archive/3e3ed2f3773a4e61db1f4ae8f55dc99c574ee6e1.tar.gz", + "hash": "1bkxfbxck16zvby5ynhgriv9yf137jmjxfihlwz03lr5cwvdbxbf" }, "wired-notify": { "type": "Git",