From 8d004fd48f27e154d4e68a4e47ab1a3028a06ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 30 Oct 2025 11:00:12 +0800 Subject: [PATCH 1/6] packages/ruler: update --- nix/packages/by-name/ruler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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="; }) {}; From 7d1292945f1a087b961123e8b06de70efd05124f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 30 Oct 2025 20:26:26 +0800 Subject: [PATCH 2/6] vanadium: update wallpapers --- nix/configurations/vanadium/home/misc.nix | 2 +- nix/overlays/wallpapers.nix | 5 +++-- npins/sources.json | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) 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/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/npins/sources.json b/npins/sources.json index 07131616..82cafe9d 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -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", From d96871819cfabeff51bdf9e45847f31bbf743466 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 30 Oct 2025 21:01:30 +0800 Subject: [PATCH 3/6] vanadium/kernel-overlay: remove scheduler configs --- nix/configurations/vanadium/kernel-overlay.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nix/configurations/vanadium/kernel-overlay.nix b/nix/configurations/vanadium/kernel-overlay.nix index c6615c22..6cb8c7e4 100644 --- a/nix/configurations/vanadium/kernel-overlay.nix +++ b/nix/configurations/vanadium/kernel-overlay.nix @@ -38,10 +38,6 @@ in { # 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; From 4669dd485d216d912a2b0940becdbd954929e442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 30 Oct 2025 21:01:40 +0800 Subject: [PATCH 4/6] npins: update inputs --- npins/sources.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/npins/sources.json b/npins/sources.json index 82cafe9d..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", From 3e7a697db04fedaa5a7b00ce746d4e235cbf53b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 30 Oct 2025 21:25:44 +0800 Subject: [PATCH 5/6] vanadium/kernel-overlay: add performance monitoring options --- nix/configurations/vanadium/kernel-overlay.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nix/configurations/vanadium/kernel-overlay.nix b/nix/configurations/vanadium/kernel-overlay.nix index 6cb8c7e4..4243b3f6 100644 --- a/nix/configurations/vanadium/kernel-overlay.nix +++ b/nix/configurations/vanadium/kernel-overlay.nix @@ -30,10 +30,15 @@ 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; From fe642eba09612b85eba76aa26ff2d578d552ecb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 30 Oct 2025 23:38:17 +0800 Subject: [PATCH 6/6] vanadium: update network --- .../vanadium/nixos/connectivity/networks.nix | 4 ++-- nix/secrets/wpa_password.age | Bin 735 -> 717 bytes 2 files changed, 2 insertions(+), 2 deletions(-) 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/secrets/wpa_password.age b/nix/secrets/wpa_password.age index 42ffe14d557eb948af961823da7abbf3185ac5d7..805ead8d7f71ee66b2043c2481d39bc92dad0fb3 100644 GIT binary patch delta 685 zcmV;e0#g0o11AwD|R+9W>j!wX=+9_Lqla+NeV4K zAaiqQEoEdfH8n9gAbDpsHDW;^ZeeUNHc>BnS#3{tD|be0a(^~@Heo_XbSq6Saz<%* zMM^g_cPn97V^K#{3N&+LV@gGLXm3e4S8+v0ML0BYLN`%0Z$oS^Y)McxIcGyORAfXe zQF?kb3N1b$U{f?LXL4m>b7dfHC@3IJNk(`eOKw;r3QJQ;YGz0@H+5lGV{lGyaW!c; zS29*qZ(%iOP=9H9R(Ux~c2##qVnR|(cTG1>VQqF{bTe9ca9MOVIWTcWLo*6)VNYi> zMLA@5bZ$8@Q3@?BEg)ujXGAeIRCH2kL03{|b#5zeb#6ydSV~rBYdkT#L45L*{g~ed2xZ= z?rQey+cy;zxv-jFX@Q2dDJsq^(LgAX(8az*1%7ttG~WDusyuGz@r#0IixHH;vRL}c z5IjFq`j$bi@vQ}NLO>Q^u4p4u?tQ_E)C`2ZRi3M7J^RfDVnnhy1R5gu>qRxbYlUi< zm1C@S;eX@~ADgX+l&~qgs6=v!gv`Mj0fOENN_25F@sfBAin9eh3c^7*;3=n9VxV6W z-u>fQ-0;s>v%8InKK@&@#QIRbRfn`CpzHIrmr_z;@v-30Q+4ML1UIp`<$N_=YfZwT zOcEOf^IgT)SNXgbEPrn@SxZq*ZB0vLW=wZ@Vp2p|GgL%)S8HuTZFDO~R(3B+dSz5s zHd!<=Q3`2TL0M8|V_{l(GIBw1c}r?+Vpw-aH!@3kQb=k!NJ3U@b8bjtV@-BNa|$g! zAaiqQEoEdfH8n9gAbDpsHDW;^YB6prP(gHNHCcIKc}q@7Lw_%9QcE~ibZci(aaUnv zSXOmuW=uqKaWX+;3R5+1D@;yNZZK40W6$XdlQk*E8zw#$}7q5%;{1xD8j?0G2|8v44^&<~)+}h)E!RpH2GGf+v81 z8*T{5&^8P3r_Og;yaWa)1moKhP!Y%+KktI9c7(o_=&L%4L^e5Aa0#mjdzlt2ONW(p zhp}6PCGfEm)e4%c3uTJn^+1B_IHJ|UxvjIJ7h8k@{?!xUI0fP(LQM3@Cvl2$e?$u; zVE#W;uYcbZcF0^8B=^0;6L88p6IW#B1#A6bo{MzoVS@{Kd8+`;$7AK$JhPs}1hB5W za~aXVC`)8#7;qY^&mbs$FjXu#XYI@T<4im`cmzk#Iv99U?v6vysafxp`r@%?YJj$M z(OPoT*oJ@6e>3oW?^tH8-2Kn>fta$GyLPhk)PvKX7;$z90x?>0#E3 lpRsnJxVWDN_i5fmEG{So