From 3df730a55af9b27fee947e7b76b9332b01b5ac10 Mon Sep 17 00:00:00 2001 From: Lucy Hochkamp Date: Mon, 27 Oct 2025 10:37:19 +0100 Subject: [PATCH] fix lix --- flake.nix | 14 +++++++++----- overlays/default.nix | 11 ----------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index 3f8f6c0a..41ff0624 100644 --- a/flake.nix +++ b/flake.nix @@ -113,11 +113,15 @@ importConfigs = n: map (x: { - ${x} = {nodes, ...}: { - networking.hostName = x; - imports = modules ++ [ (./instances/${x}) ]; - _module.args.otherNodes = lib.filterAttrs (n: v: n != x) nodes; - }; + ${x} = + { nodes, pkgs, ... }: + { + nixpkgs.overlays = overlays; + nix.package = pkgs.unstable.lixPackageSets.latest.lix; + networking.hostName = x; + imports = modules ++ [ (./instances/${x}) ]; + _module.args.otherNodes = lib.filterAttrs (n: v: n != x) nodes; + }; }) n; in lib.foldl' lib.recursiveUpdate { } ( diff --git a/overlays/default.nix b/overlays/default.nix index 8391833c..097e944d 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -28,15 +28,4 @@ inputs: self: super: { python-uhid = super.callPackage ../packages/uhid.nix {}; caddy-desec = super.callPackage ../packages/caddy-desec.nix {}; - # todo: remove on next supersonic release - supersonic-wayland = super.supersonic-wayland.overrideAttrs (old: { - patches = (if old?patches then old.patches else []) ++ [ - (self.fetchpatch2 { - url = "https://github.com/dweymouth/supersonic/commit/ee742cf34ef7225d345c16354d9c21d72a41bf4a.patch"; - hash = "sha256-kSeEbzrfJ4Pe8JC4rIWlSmADOcjrCRBNWlcO8VfVnn4="; - }) - ]; - vendorHash = "sha256-Sh3PxRwb6ElSeWzdvIQ+nD9VVGlpUDwxG7nAoGWPTRQ="; - }); - }