Update

nixos/roles/laminar/kassandra.nix

@@ -25,7 +25,7 @@ let
     git clone git@localhost:kassandra2 .
     git show -q
     echo "Evaluating nix-expression."
-    export FLAGS='--builders @/etc/nix/machines --max-jobs 1'
+    export FLAGS='--builders @/etc/nix/machines --max-jobs 0'
     drv=$(readlink -f $(nix-instantiate release.nix -A ${name} --add-root ./drv --indirect $FLAGS))
     echo "Evaluation done."
     nix-jobs realise $drv

nixos/roles/laminar/projects.nix

@@ -9,7 +9,7 @@ in {
       git clone git@localhost:logfeed .
       git show -q
       echo "Evaluating nix-expression."
-      export FLAGS='--builders @/etc/nix/machines --max-jobs 1'
+      export FLAGS='--builders @/etc/nix/machines --max-jobs 0'
       drv=$(readlink -f $(nix-instantiate default.nix -A pkg --add-root ./drv --indirect $FLAGS))
       echo "Evaluation done."
       nix-jobs realise $drv

nixos/roles/laminar/test-config.nix

@@ -39,6 +39,7 @@ let
     git show -q
     REPODIR=.
   '';
+  remoteFlags = "--builders @/etc/nix/machines --max-jobs 0";
   systems = [ "apollo" "hera" ];
   homes = lib.attrNames (import ../../../home-manager/machines.nix);
   mkHomeJob = (host: {
@@ -46,7 +47,7 @@ let
     value = pkgs.writeShellScript "test-${host}-home-config.run" ''
       ${common}
       ${checkout}
-      export FLAGS='--builders @/etc/nix/machines --max-jobs 1'
+      export FLAGS='${remoteFlags}'
       ${test-home-config}/bin/test-home-config $REPODIR ${host}
       git -C $REPODIR submodule update --init
       export FLAGS=""
@@ -59,7 +60,7 @@ let
     value = pkgs.writeShellScript "test-${host}-system-config.run" ''
       ${common}
       ${checkout}
-      export FLAGS='--builders @/etc/nix/machines --max-jobs 1'
+      export FLAGS='${remoteFlags}'
       ${test-system-config}/bin/test-system-config $REPODIR ${host}
       git -C $REPODIR submodule update --init
       export FLAGS=""

overlays/30-ghc.nix

@@ -15,17 +15,19 @@ let
         brittany ormolu releaser cabal-fmt stack ghcid ghcide
         haskell-language-server cabal-install dhall taskwarrior pandoc hlint
         cabal2nix weeder reflex-dom password optics shh-extras neuron
-        hspec-discover cabal-edit paths hmatrix postgresql-simple snap
+        hspec-discover paths hmatrix postgresql-simple snap
-        arbtt hedgehog nix-derivation
+        hedgehog nix-derivation
         ;
       iCalendar = overrideCabal (doJailbreak (unmarkBroken p.iCalendar)) {
         preConfigure = ''substituteInPlace iCalendar.cabal --replace "network >=2.6 && <2.7" "network -any"'';
       };
+      arbtt = doJailbreak p.arbtt;
+      cabal-edit = doJailbreak p.cabal-edit;
     } // makeHaskellScriptPackages p;
   inherit (master) ghc haskellPackages;
 in
 {
-  inherit ghc haskellPackages;
+  inherit ghc; # haskellPackages;
   nix-output-monitor = master.nix-output-monitor;
   myHaskellPackages = makeHaskellPackages haskellPackages;
   myHaskellScriptPackages = makeHaskellScriptPackages haskellPackages;

overlays/pkgSets.nix

@@ -3,7 +3,8 @@ self: super: {
   core-system-pkgs = {
     inherit (self)
       gitFull gnumake mkpasswd file wget curl wireguard gnupg mutt bind liboping
-      psmisc unzip rename whois lsof parted python3 binutils ntfsprogs neovim;
+      psmisc unzip rename whois lsof parted python3 binutils ntfsprogs neovim
+      ;
   };
 
   extra-system-pkgs = {
@@ -11,7 +12,8 @@ self: super: {
     inherit (self)
       htop tree pwgen borgbackup inotifyTools direnv socat nmap ncdu
       tcpdump tmux tig exa fzf ag fd bat ripgrep ranger pass sshuttle vnstat
-      entr libargon2 mblaze niv compsize mediainfo asciinema gomuks nix-output-monitor fdroidserver;
+      entr libargon2 mblaze niv compsize mediainfo asciinema gomuks nix-output-monitor fdroidserver
+      ;
   };
 
   my-home-pkgs = {
@@ -24,12 +26,12 @@ self: super: {
       ssh ag-forward lpr -r "$@"
     '';
     mytmux = super.writeShellScriptBin "mytmux" ''
-     session=$(${self.tmux}/bin/tmux ls | grep -v attached | head -1 | cut -f1 -d:)
+      session=$(${self.tmux}/bin/tmux ls | grep -v attached | head -1 | cut -f1 -d:)
-     if [[ -n $session ]]; then
+      if [[ -n $session ]]; then
-        exec ${self.tmux}/bin/tmux attach -t $session;
+         exec ${self.tmux}/bin/tmux attach -t $session;
-     else
+      else
-        exec ${self.tmux}/bin/tmux;
+         exec ${self.tmux}/bin/tmux;
-     fi
+      fi
     '';
   };
   desktop-pkgs = {
@@ -39,23 +41,24 @@ self: super: {
     inherit (self.gnomeExtensions) appindicator system-monitor clipboard-indicator emoji-selector sound-output-device-chooser window-is-ready-remover;
     inherit (self.gnome3)
       dconf dconf-editor gnome-tweaks gnome-shell-extensions adwaita-icon-theme
-      gnome-session;
+      gnome-session
+      ;
   };
   home-pkgs = {
     inherit (self.pythonPackages) yapf jsbeautifier;
     inherit (self)
       go gdb mpc_cli ncmpcpp shfmt htmlTidy astyle nodejs tasksh magic-wormhole
-      nixfmt nixpkgs-fmt rnix-lsp tmate rustup kitty nix-top ghcWithPackages ghcid matrix-commander upterm;
+      nixfmt nixpkgs-fmt rnix-lsp tmate rustup kitty nix-top ghcWithPackages ghcid matrix-commander upterm
-    obelisk = (import self.sources.obelisk { }).command;
+      ;
+    obelisk = (import self.sources.obelisk {}).command;
   };
   accounting-pkgs = {
-    hledger-iadd = super.haskell.lib.dontCheck self.haskellPackages.hledger-iadd;
+    inherit (self.haskellPackages) hledger hledger-ui hledger-web hledger-iadd;
-    inherit (self.haskellPackages) hledger hledger-ui hledger-web;
     inherit (self) ledger jali aqbanking;
   };
   system-pkgs = self.core-system-pkgs // self.extra-system-pkgs // {
     home-manager =
-      self.callPackage "${self.sources.${self.home-manager-channel}}/home-manager" { };
+      self.callPackage "${self.sources.${self.home-manager-channel}}/home-manager" {};
   };
   foreign-home-pkgs = self.extra-system-pkgs;
 }

overlays/writeHaskellScript.nix

@@ -100,7 +100,7 @@ in {
       buildSystemParams = ["<nixpkgs/nixos>", "-A", "system"]
 
       remoteBuildParams :: [String]
-      remoteBuildParams = ["--builders", "@/etc/nix/machines", "--max-jobs", "1"]
+      remoteBuildParams = ["--builders", "@/etc/nix/machines", "--max-jobs", "0"]
 
       main :: IO ()
       ${code}