nix/configurations/vanadium/home/dev.nix

@@ -64,15 +64,13 @@
   nix = {
     settings = {
       extra-substituters = [
-        "https://ghc-nix.cachix.org" # ghc nix-shell
-        "https://ghc.cachix.org" # ghcs
+        "https://ghc-nix.cachix.org"
         "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="

nix/configurations/vanadium/home/xmonad/xmonad.hs

@@ -2,7 +2,6 @@
 
 import XMonad
 import XMonad.Actions.CopyWindow
-import XMonad.Actions.Sift
 import XMonad.Actions.Submap
 import XMonad.Actions.SwapWorkspaces
 import XMonad.Hooks.DynamicLog
@@ -228,10 +227,6 @@ 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)

nix/git-identities/list.nix

@@ -19,6 +19,8 @@ let
   blameIgnore = {
     blame.ignoreRevsFile = ".git-blame-ignore-revs";
   };
+
+  hooks = scriptsPath: { core.hooksPath = scriptsPath; };
 in
 [
   # Univ stuff
@@ -52,6 +54,9 @@ in
   {
     url = "github.com";
     path = "haskell/cabal.git";
-    contents = blameIgnore;
+    contents = lib.mkMerge [
+      blameIgnore
+      (hooks "${./hooks/cabal}")
+    ];
   }
 ]

npins/sources.json

@@ -187,9 +187,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
-      "url": "https://github.com/NixOS/nixos-hardware/archive/899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9.tar.gz",
-      "hash": "1dbf11zjspg68wiryp2y24w587izg954nbv517q57mpl8i8sfr85"
+      "revision": "52113c4f5cfd1e823001310e56d9c8d0699a6226",
+      "url": "https://github.com/NixOS/nixos-hardware/archive/52113c4f5cfd1e823001310e56d9c8d0699a6226.tar.gz",
+      "hash": "10gxzv78vk2sy4qwxc9ijbp3pssfnf4iwixvb7kkcggrk0dndzc6"
     },
     "nixpkgs": {
       "type": "Git",
@@ -200,9 +200,9 @@
       },
       "branch": "nixos-25.05-small",
       "submodules": false,
-      "revision": "cec38dec00df26a901eb8b424d53bbb3bcc72eec",
-      "url": "https://github.com/NixOS/nixpkgs/archive/cec38dec00df26a901eb8b424d53bbb3bcc72eec.tar.gz",
-      "hash": "006pn4a3f4wnr60bbw7cw181p6gzgyyz5lchp3i8q5v7bjjvalmg"
+      "revision": "8660acf86a1f5a14dacf049f9a5b8aff143e9111",
+      "url": "https://github.com/NixOS/nixpkgs/archive/8660acf86a1f5a14dacf049f9a5b8aff143e9111.tar.gz",
+      "hash": "0y3l82414w0h1bvh63630irqxj139al479j49r6z4d1p86ygjkzm"
     },
     "nur": {
       "type": "Git",
@@ -213,9 +213,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "263f45afd86d9c3cb8f61fb7af44c465d4493b88",
-      "url": "https://github.com/nix-community/nur/archive/263f45afd86d9c3cb8f61fb7af44c465d4493b88.tar.gz",
-      "hash": "0lv1gkqqb5bkkmwvgl8kaipqxg6ddqw09wb8jcc0wql95vbyzyca"
+      "revision": "e7b4921cad8b7492ab9c441bda269be625bd2acc",
+      "url": "https://github.com/nix-community/nur/archive/e7b4921cad8b7492ab9c441bda269be625bd2acc.tar.gz",
+      "hash": "1yya5jag6gvcxrajc24hz9zisxygabfjr2r86jgadyjykv0dm3s8"
     },
     "pin-emacs28": {
       "type": "Git",