From 3b59b02c59218dfd02e1a51366245371ae05f38d Mon Sep 17 00:00:00 2001 From: alydev Date: Fri, 26 Sep 2025 11:45:31 +1000 Subject: [PATCH] update --- .github/workflows/check.yml | 16 ++++++ flake.lock | 110 +++++++++++++++++------------------- flake.nix | 17 ++++-- 3 files changed, 80 insertions(+), 63 deletions(-) create mode 100644 .github/workflows/check.yml diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml new file mode 100644 index 0000000..7bbaa6f --- /dev/null +++ b/.github/workflows/check.yml @@ -0,0 +1,16 @@ +on: + pull_request: + push: + branches: [main] + workflow_dispatch: + +jobs: + check: + name: Check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: DeterminateSystems/nix-installer-action@main + - name: Check + run: nix flake check + - uses: DeterminateSystems/magic-nix-cache-action@main diff --git a/flake.lock b/flake.lock index 9eec9d7..e660167 100644 --- a/flake.lock +++ b/flake.lock @@ -1,24 +1,17 @@ { "nodes": { - "agenix": { - "inputs": { - "darwin": [], - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "systems": "systems" - }, + "flake-compat": { "locked": { - "lastModified": 1754433428, - "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", - "owner": "ryantm", - "repo": "agenix", - "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", - "type": "github" + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" }, "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, "flake-parts": { @@ -64,6 +57,24 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems_2" }, @@ -82,27 +93,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1745494811, - "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -167,6 +157,28 @@ "type": "github" } }, + "nix-search": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741306118, + "narHash": "sha256-699XDyrMhx0nSI2z/WRhTsJhiiMt4WqaPx8//cPiBGY=", + "owner": "diamondburned", + "repo": "nix-search", + "rev": "7dcd7b9ae3ec59b7a8ee61371157f83e6bd87b89", + "type": "github" + }, + "original": { + "owner": "diamondburned", + "repo": "nix-search", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1736643958, @@ -204,22 +216,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1754028485, - "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "59e69648d345d6e8fef86158c555730fa12af9de", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1758589230, "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", @@ -282,7 +278,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -305,11 +301,11 @@ }, "root": { "inputs": { - "agenix": "agenix", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", + "nix-search": "nix-search", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixvim": "nixvim", "nur": "nur" } diff --git a/flake.nix b/flake.nix index 17e93b5..4332517 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,13 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; - nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0"; + nix-search = { + url = "github:diamondburned/nix-search"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + nix-flatpak = { + url = "github:gmodena/nix-flatpak/?ref=v0.6.0"; + }; home-manager = { url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; @@ -18,11 +24,9 @@ url = "github:nix-community/nixvim/nixos-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; - agenix.url = "github:ryantm/agenix"; - agenix.inputs.darwin.follows = ""; }; - outputs = inputs@{ nixpkgs, home-manager, nix-flatpak, nixos-generators, nur, nixvim, agenix, ... }: { + outputs = inputs@{ nixpkgs, home-manager, nix-flatpak, nixos-generators, nur, nixvim, nix-search, ... }: { nixosConfigurations = { "aly-laptop" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -49,9 +53,10 @@ nixvim.nixosModules.nixvim ./hw/aly-server.nix ./system/aly-server.nix - agenix.nixosModules.default { - environment.systemPackages = [ agenix.packages.x86_64-linux.default ]; + environment.systemPackages = [ + nix-search.packages.x86_64-linux.default + ]; } home-manager.nixosModules.home-manager {