From 51352a91d0ee3c063307d21948d469aec3ebf94e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 17 Nov 2025 21:14:21 +0800 Subject: [PATCH 1/4] vanadium/dev: add ghc cachix substituter --- nix/configurations/vanadium/home/dev.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nix/configurations/vanadium/home/dev.nix b/nix/configurations/vanadium/home/dev.nix index 9420274e..a55be211 100644 --- a/nix/configurations/vanadium/home/dev.nix +++ b/nix/configurations/vanadium/home/dev.nix @@ -64,13 +64,15 @@ nix = { settings = { extra-substituters = [ - "https://ghc-nix.cachix.org" + "https://ghc-nix.cachix.org" # ghc nix-shell + "https://ghc.cachix.org" # ghcs "https://haskell-language-server.cachix.org" "https://helix.cachix.org" "https://cache.iog.io" ]; extra-trusted-public-keys = [ "ghc-nix.cachix.org-1:ziC/I4BPqeA4VbtOFpFpu6D1t6ymFvRWke/lc2+qjcg=" + "ghc.cachix.org-1:a751hwq9ydeP3Nr6h84iA9zSjxg9Z3uznqi4YBGjsiw=" "haskell-language-server.cachix.org-1:juFfHrwkOxqIOZShtC4YC1uT1bBcq2RSvC7OMKx0Nz8=" "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" From 9b52493e5fb243ec9c70f52061b53c75d63a0a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 17 Nov 2025 21:20:17 +0800 Subject: [PATCH 2/4] git-identities: remove hooks config for cabal It's actually pretty annoying to run the linter all the time --- nix/git-identities/list.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/nix/git-identities/list.nix b/nix/git-identities/list.nix index b318462b..245ac78c 100644 --- a/nix/git-identities/list.nix +++ b/nix/git-identities/list.nix @@ -19,8 +19,6 @@ let blameIgnore = { blame.ignoreRevsFile = ".git-blame-ignore-revs"; }; - - hooks = scriptsPath: { core.hooksPath = scriptsPath; }; in [ # Univ stuff @@ -54,9 +52,6 @@ in { url = "github.com"; path = "haskell/cabal.git"; - contents = lib.mkMerge [ - blameIgnore - (hooks "${./hooks/cabal}") - ]; + contents = blameIgnore; } ] From 9f080c070752092b366eb6ba25901d554c0ef062 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 17 Nov 2025 21:38:38 +0800 Subject: [PATCH 3/4] vanadium/xmonad: use sift instead of swap --- nix/configurations/vanadium/home/xmonad/xmonad.hs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs index 7f5cf5f7..39e5fa80 100644 --- a/nix/configurations/vanadium/home/xmonad/xmonad.hs +++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs @@ -2,6 +2,7 @@ import XMonad import XMonad.Actions.CopyWindow +import XMonad.Actions.Sift import XMonad.Actions.Submap import XMonad.Actions.SwapWorkspaces import XMonad.Hooks.DynamicLog @@ -227,6 +228,10 @@ keybinds = -- Toggle fullscreen , ((superMask, xK_Escape), sendMessage NextLayout) + -- Sift instead of swap + , ((superMask .|. shiftMask, xK_j), windows siftDown) + , ((superMask .|. shiftMask, xK_k), windows siftUp ) + -- Resize windows , ((superMask, xK_equal ), sendMessage $ IncMasterN 1) , ((superMask, xK_minus ), sendMessage $ IncMasterN -1) From 09d5f8e0c820c976dffcac0134fd823f3a353693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 17 Nov 2025 21:56:04 +0800 Subject: [PATCH 4/4] npins: update sources --- npins/sources.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/npins/sources.json b/npins/sources.json index edba230d..ae589196 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -187,9 +187,9 @@ }, "branch": "master", "submodules": false, - "revision": "52113c4f5cfd1e823001310e56d9c8d0699a6226", - "url": "https://github.com/NixOS/nixos-hardware/archive/52113c4f5cfd1e823001310e56d9c8d0699a6226.tar.gz", - "hash": "10gxzv78vk2sy4qwxc9ijbp3pssfnf4iwixvb7kkcggrk0dndzc6" + "revision": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "url": "https://github.com/NixOS/nixos-hardware/archive/899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9.tar.gz", + "hash": "1dbf11zjspg68wiryp2y24w587izg954nbv517q57mpl8i8sfr85" }, "nixpkgs": { "type": "Git", @@ -200,9 +200,9 @@ }, "branch": "nixos-25.05-small", "submodules": false, - "revision": "8660acf86a1f5a14dacf049f9a5b8aff143e9111", - "url": "https://github.com/NixOS/nixpkgs/archive/8660acf86a1f5a14dacf049f9a5b8aff143e9111.tar.gz", - "hash": "0y3l82414w0h1bvh63630irqxj139al479j49r6z4d1p86ygjkzm" + "revision": "cec38dec00df26a901eb8b424d53bbb3bcc72eec", + "url": "https://github.com/NixOS/nixpkgs/archive/cec38dec00df26a901eb8b424d53bbb3bcc72eec.tar.gz", + "hash": "006pn4a3f4wnr60bbw7cw181p6gzgyyz5lchp3i8q5v7bjjvalmg" }, "nur": { "type": "Git", @@ -213,9 +213,9 @@ }, "branch": "main", "submodules": false, - "revision": "e7b4921cad8b7492ab9c441bda269be625bd2acc", - "url": "https://github.com/nix-community/nur/archive/e7b4921cad8b7492ab9c441bda269be625bd2acc.tar.gz", - "hash": "1yya5jag6gvcxrajc24hz9zisxygabfjr2r86jgadyjykv0dm3s8" + "revision": "263f45afd86d9c3cb8f61fb7af44c465d4493b88", + "url": "https://github.com/nix-community/nur/archive/263f45afd86d9c3cb8f61fb7af44c465d4493b88.tar.gz", + "hash": "0lv1gkqqb5bkkmwvgl8kaipqxg6ddqw09wb8jcc0wql95vbyzyca" }, "pin-emacs28": { "type": "Git",