diff options
| -rw-r--r-- | machines/renard/hardware.nix | 2 | ||||
| -rw-r--r-- | modules/binary-cache.nix | 20 | ||||
| -rw-r--r-- | modules/common.nix | 4 | ||||
| -rw-r--r-- | modules/foundation/agent.nix | 2 | ||||
| -rw-r--r-- | modules/nix-ld.nix | 29 | ||||
| -rw-r--r-- | services/cgit.nix | 2 |
6 files changed, 30 insertions, 29 deletions
diff --git a/machines/renard/hardware.nix b/machines/renard/hardware.nix index 18051a2..5d97ebc 100644 --- a/machines/renard/hardware.nix +++ b/machines/renard/hardware.nix @@ -25,6 +25,4 @@ }; swapDevices = [ ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/modules/binary-cache.nix b/modules/binary-cache.nix index 8bbfb09..21979aa 100644 --- a/modules/binary-cache.nix +++ b/modules/binary-cache.nix @@ -1,7 +1,7 @@ # the public key for the current iteration of this cache is: # cache.rnrd.eu-1:6Q2MPTZ6ycAzWcc0VzXR+pKRlJ+6kfdQfj6iRsN5s1I= -{ config, unstablePkgs, ... }: +{ config, pkgs, ... }: let inherit (config.age) secrets; @@ -15,15 +15,17 @@ in services = { harmonia = { - enable = true; - # 24.11 does not include built-in zstd compression for harmonia yet. - package = unstablePkgs.harmonia; - signKeyPaths = [ secrets.binary-cache-key.path ]; + package = pkgs.harmonia; - settings = { - bind = "127.0.0.1:${toString cachePort}"; - workers = 6; - priority = 33; + cache = { + enable = true; + signKeyPaths = [ secrets.binary-cache-key.path ]; + + settings = { + bind = "127.0.0.1:${toString cachePort}"; + workers = 6; + priority = 33; + }; }; }; diff --git a/modules/common.nix b/modules/common.nix index b2519da..d3dcf72 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -21,7 +21,7 @@ # fish enables this by default, # it makes every nixos rebuild very slow. - documentation.man.generateCaches = false; + documentation.man.cache.enable = false; users.motd = '' @@ -191,7 +191,7 @@ cmake nil direnv - nixfmt-rfc-style + nixfmt dive compose2nix nix-prefetch-docker diff --git a/modules/foundation/agent.nix b/modules/foundation/agent.nix index 9a9d295..f942ae2 100644 --- a/modules/foundation/agent.nix +++ b/modules/foundation/agent.nix @@ -16,7 +16,7 @@ let # it should also always be able to call `nix-shell` to gain access to more tools. agentPackages = with pkgs; [ nix - nixfmt-rfc-style + nixfmt openssh tailscale diff --git a/modules/nix-ld.nix b/modules/nix-ld.nix index 2ab5df5..2013c2d 100644 --- a/modules/nix-ld.nix +++ b/modules/nix-ld.nix @@ -40,20 +40,21 @@ stdenv.cc.cc systemd vulkan-loader - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - xorg.libxcb - xorg.libxkbfile - xorg.libxshmfence zlib + + libx11 + libxscrnsaver + libxcomposite + libxcursor + libxdamage + libxext + libxfixes + libxi + libxrandr + libxrender + libxtst + libxcb + libxkbfile + libxshmfence ]; } diff --git a/services/cgit.nix b/services/cgit.nix index 125b920..e2a85a6 100644 --- a/services/cgit.nix +++ b/services/cgit.nix @@ -9,7 +9,7 @@ let cgitDefaultStyle = "pastie"; cgitNewStyle = "rrt"; - cgit = pkgs.cgit-pink.overrideAttrs (attrs: { + cgit = pkgs.cgit.overrideAttrs (attrs: { postPatch = attrs.postPatch + '' substituteInPlace filters/syntax-highlighting.py filters/html-converters/md2html \ --replace-fail '${cgitDefaultStyle}' '${cgitNewStyle}' |