From cd0772113710723fccbb0319b9ca289967019c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Tue, 16 Dec 2025 22:31:31 +0800 Subject: [PATCH 1/4] vanadium: prevent duplicated btrfs scrub --- nix/configurations/vanadium/nixos/fs.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nix/configurations/vanadium/nixos/fs.nix b/nix/configurations/vanadium/nixos/fs.nix index bfe64d4a..9d851cc5 100644 --- a/nix/configurations/vanadium/nixos/fs.nix +++ b/nix/configurations/vanadium/nixos/fs.nix @@ -6,11 +6,6 @@ { services.btrfs.autoScrub = { enable = true; - fileSystems = [ - "/" - "/home" - "/nix" - ]; }; systemd.tmpfiles.rules = [ From 454869ca86807de650c8b436a5c0d031530639d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 17 Dec 2025 11:20:27 +0800 Subject: [PATCH 2/4] npins: update sources --- npins/sources.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/npins/sources.json b/npins/sources.json index 34cebc78..97cac2be 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -114,9 +114,9 @@ }, "branch": "release-25.11", "submodules": false, - "revision": "20561be440a11ec57a89715480717baf19fe6343", - "url": "https://github.com/nix-community/home-manager/archive/20561be440a11ec57a89715480717baf19fe6343.tar.gz", - "hash": "1n2l891p04y3xmd0sl5i3553ndgpxkinysg1bf8iiixmxhcm7i9v" + "revision": "7df150f0d3857cf68dae443813b27acfb201b2d8", + "url": "https://github.com/nix-community/home-manager/archive/7df150f0d3857cf68dae443813b27acfb201b2d8.tar.gz", + "hash": "00hzbqdayq8zjrw5rfzb0909nw2b1gmy6czv2c1hfjj63z94xpic" }, "infuse": { "type": "GitRelease", @@ -200,9 +200,9 @@ }, "branch": "nixos-25.11-small", "submodules": false, - "revision": "1acf2f172ef3d6e31c9913ccb7ba07b13dadfedc", - "url": "https://github.com/nixos/nixpkgs/archive/1acf2f172ef3d6e31c9913ccb7ba07b13dadfedc.tar.gz", - "hash": "1hhjz7jx0n0i2mxq9d3yvqvlmrwjklq1ljcfzpmnzyfhrixqg9y5" + "revision": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", + "url": "https://github.com/nixos/nixpkgs/archive/c6f52ebd45e5925c188d1a20119978aa4ffd5ef6.tar.gz", + "hash": "0gwxhs3j1nglyymbaqyqg8miz0rk84n4ijag5s4bx6yfb6vrd4lv" }, "nur": { "type": "Git", @@ -213,9 +213,9 @@ }, "branch": "main", "submodules": false, - "revision": "e7844e0f24c76b6137e16ab95c9a7c275acf2fbb", - "url": "https://github.com/nix-community/nur/archive/e7844e0f24c76b6137e16ab95c9a7c275acf2fbb.tar.gz", - "hash": "10bz6b1j2d5z257xv8bjwdr1636f807f2gr24yaswxr55a7wdyk9" + "revision": "c5bc6e626bb2cf01b9e65572ca4b44ccdcc1dfc9", + "url": "https://github.com/nix-community/nur/archive/c5bc6e626bb2cf01b9e65572ca4b44ccdcc1dfc9.tar.gz", + "hash": "1fdqlpqsidqis2jzc6iwbafi82916jsnrl46k9gfdp9bxhcrmbvf" }, "pin-emacs28": { "type": "Git", @@ -365,9 +365,9 @@ }, "branch": "master", "submodules": false, - "revision": "6a96aa2066d8ad945f2323b63dc217081ef51168", - "url": "https://github.com/Toqozz/wired-notify/archive/6a96aa2066d8ad945f2323b63dc217081ef51168.tar.gz", - "hash": "02b8pva12rzcciq5lavwk824xaym28igfsva4kikvd7mxs06ccwx" + "revision": "491197a6a5ef9c65a85c3eb1531786f32ffff5b3", + "url": "https://github.com/Toqozz/wired-notify/archive/491197a6a5ef9c65a85c3eb1531786f32ffff5b3.tar.gz", + "hash": "07gaizslvsiihvfrrbcdz0b2c04llsfqaji03ls55p1zbm41w6f3" }, "zen-browser": { "type": "Git", @@ -378,9 +378,9 @@ }, "branch": "main", "submodules": false, - "revision": "bd8815d0a686267386268e7cc70315124e21362b", - "url": "https://github.com/0xc000022070/zen-browser-flake/archive/bd8815d0a686267386268e7cc70315124e21362b.tar.gz", - "hash": "03dz53picqw2bbbzaxxld5ydyqbf4jsdb048a4gb6h432kkp5gim" + "revision": "bc7dfff92cb7919dfb213ea78c11ea0a4d265a56", + "url": "https://github.com/0xc000022070/zen-browser-flake/archive/bc7dfff92cb7919dfb213ea78c11ea0a4d265a56.tar.gz", + "hash": "0nqhwk7gbp9frh9k98yafdnm3d5kdc9d94vpwqalr49cblcmiyy9" } }, "version": 5 From 1ee71606102e3c8266a4aff2e75971ef14aa8d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 17 Dec 2025 11:21:10 +0800 Subject: [PATCH 3/4] packages/{ai_blocklist,hategroup_blocklist,hrt-time}: enable local build --- nix/packages/by-name/ai_blocklist/package.nix | 4 ++++ nix/packages/by-name/hategroup_blocklist/package.nix | 4 ++++ nix/packages/by-name/hrt-time/package.nix | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/nix/packages/by-name/ai_blocklist/package.nix b/nix/packages/by-name/ai_blocklist/package.nix index ecfd0db0..c967b129 100644 --- a/nix/packages/by-name/ai_blocklist/package.nix +++ b/nix/packages/by-name/ai_blocklist/package.nix @@ -17,6 +17,10 @@ stdenvNoCC.mkDerivation { hash = "sha256-p3wfR28DH6V8BHn9DT10d09Yq3mdbBecWwlR1CdDYUA="; }; + # Build takes no time + preferLocalBuild = true; + allowSubstitutes = false; + installPhase = '' mkdir -p $out/share cp noai_hosts.txt $out/share/hosts.txt diff --git a/nix/packages/by-name/hategroup_blocklist/package.nix b/nix/packages/by-name/hategroup_blocklist/package.nix index d7fb0e86..3dc813bb 100644 --- a/nix/packages/by-name/hategroup_blocklist/package.nix +++ b/nix/packages/by-name/hategroup_blocklist/package.nix @@ -17,6 +17,10 @@ stdenvNoCC.mkDerivation { hash = "sha256-SZBrjIBUw687MdrbOV7WrP5IhAAtKvPL2GqdcICHNvQ="; }; + # Build takes no time + preferLocalBuild = true; + allowSubstitutes = false; + installPhase = '' mkdir -p $out/share cp blocklist.txt $out/share/domains.txt diff --git a/nix/packages/by-name/hrt-time/package.nix b/nix/packages/by-name/hrt-time/package.nix index 713bb8f1..29a50de3 100644 --- a/nix/packages/by-name/hrt-time/package.nix +++ b/nix/packages/by-name/hrt-time/package.nix @@ -17,6 +17,10 @@ stdenvNoCC.mkDerivation { hash = "sha256-+AhLkcCETVnF6S+ov1oKxhs3M9F6ghyyERoLN3aMMxw="; }; + # Build takes no time + preferLocalBuild = true; + allowSubstitutes = false; + installPhase = '' mkdir -p $out/bin cp hrt-time.sh $out/bin/hrt-time From 17746c4d138f4029591ee488d3825b98552805b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 17 Dec 2025 11:49:57 +0800 Subject: [PATCH 4/4] vanadium/xmonad: warp when using vim movement bindings --- .../vanadium/home/xmonad/xmonad.hs | 38 +++++++++---------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs index e901bf6a..7acc4da2 100644 --- a/nix/configurations/vanadium/home/xmonad/xmonad.hs +++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs @@ -260,6 +260,9 @@ removedKeybinds = ++ [ (superMask , n) | n <- [xK_1 .. xK_9] ] ++ [ (superMask .|. shiftMask, n) | n <- [xK_1 .. xK_9] ] +warpToWindowCenter :: X () +warpToWindowCenter = warpToWindow 0.5 0.5 + keybinds :: [((KeyMask, KeySym), X ())] keybinds = [ @@ -305,33 +308,26 @@ keybinds = -- Switch between layers , ((altMask, xK_s), switchLayer ) - -- Directional navigation of windows - , ((altMask, xK_l), windowGo R False ) - , ((altMask, xK_h), windowGo L False ) - , ((altMask, xK_k), windowGo U False ) - , ((altMask, xK_j), windowGo D False ) - - -- Swap adjacent windows - , ((altMask .|. superMask, xK_l), windowSwap R False) - , ((altMask .|. superMask, xK_h), windowSwap L False) - , ((altMask .|. superMask, xK_k), windowSwap U False) - , ((altMask .|. superMask, xK_j), windowSwap D False) - ] - -- We override default focus shifting bindings to warp the cursor to the center of the new window. -- This is especially useful because mag doesn't work well with focusFollowsMouse. -- The order is important: focus shift, and then warp the cursor -- -- Warp when focus shifts by binding, not by mouse (otherwise it's annoying) - ++ (let warp = warpToWindow 0.5 0.5 - in [ ((superMask, xK_Tab ), windows W.focusDown >> warp) - , ((superMask .|. shiftMask, xK_Tab ), windows W.focusUp >> warp) - , ((superMask, xK_j ), windows W.focusDown >> warp) - , ((superMask, xK_k ), windows W.focusUp >> warp) - ] - ) - -- Screenshots + -- Directional navigation of windows + , ((altMask, xK_l), windowGo R False >> warpToWindowCenter) + , ((altMask, xK_h), windowGo L False >> warpToWindowCenter) + , ((altMask, xK_k), windowGo U False >> warpToWindowCenter) + , ((altMask, xK_j), windowGo D False >> warpToWindowCenter) + + -- Swap adjacent windows + , ((altMask .|. superMask, xK_l), windowSwap R False >> warpToWindowCenter) + , ((altMask .|. superMask, xK_h), windowSwap L False >> warpToWindowCenter) + , ((altMask .|. superMask, xK_k), windowSwap U False >> warpToWindowCenter) + , ((altMask .|. superMask, xK_j), windowSwap D False >> warpToWindowCenter) + ] + + -- Screenshots ++ (let fullscreen = "maim -u | xclip -in -selection clipboard -t image/png" withSelection = "maim -u -s -b 5 -o | xclip -in -selection clipboard -t image/png" toFloat = "maim -u -s -b 5 -o | feh --auto-zoom -"