diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml index 4408d30..b5defcf 100644 --- a/.github/workflows/build-packages.yml +++ b/.github/workflows/build-packages.yml @@ -23,10 +23,11 @@ jobs: steps: - name: Install Nix uses: cachix/install-nix-action@v30 + with: + install_url: https://releases.nixos.org/nix/nix-2.25.4/install + extra_nix_config: 'accept-flake-config = true' - name: Sync repository uses: actions/checkout@v4 - with: - persist-credentials: false - uses: cachix/cachix-action@v14 with: name: cything @@ -57,3 +58,7 @@ jobs: # always save the cache save-always: true - run: nix build -L ${{ matrix.package }} + - uses: actions/upload-artifact@v4 + with: + name: nix-${{ runner.os }}-${{ hashFiles('**/*.nix', 'flake.lock') }} + path: result/ diff --git a/flake.lock b/flake.lock index 2acaba0..2eb0b8a 100644 --- a/flake.lock +++ b/flake.lock @@ -899,6 +899,42 @@ "type": "github" } }, + "nixlib": { + "locked": { + "lastModified": 1736643958, + "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixos-generators": { + "inputs": { + "nixlib": "nixlib", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737057290, + "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", + "owner": "nix-community", + "repo": "nixos-generators", + "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-generators", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1737590910, @@ -1238,6 +1274,7 @@ "lix": "lix", "lix-module": "lix-module", "niri": "niri", + "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_5", "nixpkgs-garage": "nixpkgs-garage", diff --git a/flake.nix b/flake.nix index 920750a..bb84cdb 100644 --- a/flake.nix +++ b/flake.nix @@ -69,8 +69,12 @@ inputs.flake-compat.follows = "flake-compat"; }; nixos-hardware.url = "github:nixos/nixos-hardware"; - nixpkgs-rpi.url = "github:nixos/nixpkgs/d4e529a24b66b0341f2b866c5abe3ad8a96be2d7"; + nixos-generators = { + url = "github:nix-community/nixos-generators"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nixpkgs-rpi.url = "github:nixos/nixpkgs/d4e529a24b66b0341f2b866c5abe3ad8a96be2d7"; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR nvim-github-theme = { @@ -212,6 +216,7 @@ nixpkgs.pkgs = pkgsFor "aarch64-linux"; } inputs.nixos-hardware.nixosModules.raspberry-pi-3 + inputs.nixos-generators.nixosModules.all-formats ./hosts/pancake ./modules ]; diff --git a/hosts/pancake/default.nix b/hosts/pancake/default.nix index 1b75f5b..e6d4415 100644 --- a/hosts/pancake/default.nix +++ b/hosts/pancake/default.nix @@ -10,7 +10,7 @@ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/profiles/qemu-guest.nix") ../common.nix - ./hardware-configuration.nix + # ./hardware-configuration.nix ../zsh.nix ]; diff --git a/hosts/ytnix/tailscale.nix b/hosts/ytnix/tailscale.nix index 71d47c8..21504e7 100644 --- a/hosts/ytnix/tailscale.nix +++ b/hosts/ytnix/tailscale.nix @@ -1,6 +1,6 @@ { config, ... }: { services.tailscale = { - enable = true; + enable = false; authKeyFile = config.sops.secrets."tailscale/auth".path; openFirewall = true; useRoutingFeatures = "client";