From cb67ce353633c0eb4af991af515d6a94e46dd487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 15 Oct 2025 15:13:07 +0800 Subject: [PATCH 1/6] home: disable keep-derivations --- nix/homeModules/common/user-nixconf.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nix/homeModules/common/user-nixconf.nix b/nix/homeModules/common/user-nixconf.nix index c7b11124..73ef4e38 100644 --- a/nix/homeModules/common/user-nixconf.nix +++ b/nix/homeModules/common/user-nixconf.nix @@ -8,7 +8,6 @@ package = lib.mkDefault (nixosConfig.nix.package or pkgs.nix); settings = { - allow-import-from-derivation = "true"; extra-substituters = [ "https://nix-community.cachix.org" "https://leana8959.cachix.org" @@ -25,8 +24,8 @@ "nix-command" "flakes" ]; - keep-outputs = true; - keep-derivations = true; + allow-import-from-derivation = true; + keep-outputs = false; # Build time derivations and sources }; registry.flakies = { From 329eabd171ab500b9344821cd7cdb5f605903347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 16 Oct 2025 17:15:17 +0800 Subject: [PATCH 2/6] vanadium: add more substituters --- nix/configurations/vanadium/home/dev.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nix/configurations/vanadium/home/dev.nix b/nix/configurations/vanadium/home/dev.nix index 9a83b6d6..9225d8e2 100644 --- a/nix/configurations/vanadium/home/dev.nix +++ b/nix/configurations/vanadium/home/dev.nix @@ -112,15 +112,17 @@ nix = { settings = { - # extra-substituters = [ - # "https://ghc-nix.cachix.org" - # "https://haskell-language-server.cachix.org" - # "https://helix.cachix.org" - # ]; + extra-substituters = [ + "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=" "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 87edda0bd7fbaa2bc82d24015514432f77080da1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 16 Oct 2025 18:11:29 +0800 Subject: [PATCH 3/6] home: remove old flake registry config flakies is conceptually no longer a flake --- nix/homeModules/common/user-nixconf.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nix/homeModules/common/user-nixconf.nix b/nix/homeModules/common/user-nixconf.nix index 73ef4e38..b021d610 100644 --- a/nix/homeModules/common/user-nixconf.nix +++ b/nix/homeModules/common/user-nixconf.nix @@ -27,12 +27,5 @@ allow-import-from-derivation = true; keep-outputs = false; # Build time derivations and sources }; - - registry.flakies = { - from.id = "flakies"; - from.type = "indirect"; - to.type = "git"; - to.url = "https://git.confusedcompiler.org/leana8959/flakies"; - }; }; } From 4e44039822c61f29c9c67aef441c32b5780d3de7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 16 Oct 2025 18:40:48 +0800 Subject: [PATCH 4/6] home: increase parallelism --- nix/homeModules/common/user-nixconf.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nix/homeModules/common/user-nixconf.nix b/nix/homeModules/common/user-nixconf.nix index b021d610..574a939e 100644 --- a/nix/homeModules/common/user-nixconf.nix +++ b/nix/homeModules/common/user-nixconf.nix @@ -26,6 +26,9 @@ ]; allow-import-from-derivation = true; keep-outputs = false; # Build time derivations and sources + + http-connections = 50; # default: 25 + max-substitution-jobs = 32; # default: 16 }; }; } From f7de01037e763be45c8285da5a72778633a14a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 17 Oct 2025 09:55:23 +0800 Subject: [PATCH 5/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 eae02c50..e9e58d14 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 = "03f7b0bb545a59ddc031c08879eaf7e08dea1bef"; - hash = "sha256-ZNE2IR9f9zDS1t10bHqabXQiAq9aibfeQOo1pJtKUn0="; + rev = "bb254a5a42f2f0a9e9c35230cc6a4ea4ad07ba8b"; + hash = "sha256-LjVC54HepbZUfGzQXMEowSrD63LqyN4q7aszr9sUZvc="; }) {}; From ec7803bc0c386e58683377dc116f005e20210f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Fri, 17 Oct 2025 10:33:03 +0800 Subject: [PATCH 6/6] home/git: blame ignore cabal --- nix/configurations/vanadium/home/dev.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nix/configurations/vanadium/home/dev.nix b/nix/configurations/vanadium/home/dev.nix index 9225d8e2..5d3b2068 100644 --- a/nix/configurations/vanadium/home/dev.nix +++ b/nix/configurations/vanadium/home/dev.nix @@ -97,6 +97,11 @@ path = "ghc/ghc.git"; contents = blameIgnore; } + { + url = "github.com"; + path = "haskell/cabal.git"; + contents = blameIgnore; + } ]; };