diff --git a/flake.nix b/flake.nix index 896f859..11bac15 100644 --- a/flake.nix +++ b/flake.nix @@ -114,36 +114,51 @@ } ); - nixosConfigurations = { - # Workstations - wodan = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ - { - nixpkgs.overlays = [ - overlays.additions - overlays.unstable-packages - tidalcycles.overlays.default - ]; - } - ./hosts/wodan - ]; + nixosConfigurations = + let + hetzner = import ./lib/hetzner.nix { inherit inputs nixpkgs; }; + in + { + # Workstations + wodan = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; + modules = [ + { nixpkgs.overlays = [ overlays.additions ]; } + { + nixpkgs.overlays = [ + tidalcycles.overlays.default + (_: prev: { + tailscale = prev.tailscale.overrideAttrs (old: { + checkFlags = builtins.map ( + flag: + if prev.lib.hasPrefix "-skip=" flag then + flag + "|^TestGetList$|^TestIgnoreLocallyBoundPorts$|^TestPoller$" + else + flag + ) old.checkFlags; + }); + }) + ]; + } + { nixpkgs.overlays = [ tidalcycles.overlays.default ]; } + ./hosts/wodan + ]; + }; + widar = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs outputs; }; + modules = [ + ./hosts/widar + ]; + }; + heimdall = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs outputs; }; + modules = [ + { nixpkgs.overlays = [ overlays.additions ]; } + ./hosts/heimdall + ]; + }; }; - widar = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs outputs; }; - modules = [ - ./hosts/widar - ]; - }; - heimdall = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit inputs outputs; }; - modules = [ - { nixpkgs.overlays = [ overlays.additions ]; } - ./hosts/heimdall - ]; - }; - }; colmenaHive = let diff --git a/home/lander/features/workstation/hledger.nix b/home/lander/features/workstation/hledger.nix index 73215ba..403befc 100644 --- a/home/lander/features/workstation/hledger.nix +++ b/home/lander/features/workstation/hledger.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - home.packages = with pkgs.unstable; [ + home.packages = with pkgs; [ hledger hledger-ui hledger-utils