Merge pull request 'Really fix nvfetcher always rebuilding, fix agenix overlay, bump flake.lock' (#162 ) from fix/nvfetcher-agenix-bump-flake into main

Reviewed-on: #162 Reviewed-by: b12f <hello@benjaminbaedorf.eu>
flake: make digga, deploy, agenix follow existing
2023-02-01 12:13:47 +01:00 · 2023-02-01 11:29:34 +01:00 · 2023-02-01 11:21:46 +01:00 · 2023-02-01 11:20:35 +01:00
3 changed files with 27 additions and 68 deletions
--- a/flake.lock
+++ b/flake.lock
@ -2,16 +2,19 @@
  "nodes": {
    "agenix": {
      "inputs": {
+        "darwin": [
+          "darwin"
+        ],
        "nixpkgs": [
          "nixos"
        ]
      },
      "locked": {
-        "lastModified": 1673301561,
-        "narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=",
+        "lastModified": 1675176355,
+        "narHash": "sha256-Qjxh5cmN56siY97mzmBLI1+cdjXSPqmfPVsKxBvHmwI=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68",
+        "rev": "b7ffcfe77f817d9ee992640ba1f270718d197f28",
        "type": "github"
      },
      "original": {
@ -40,30 +43,11 @@
        "type": "github"
      }
    },
-    "darwin_2": {
-      "inputs": {
-        "nixpkgs": [
-          "digga",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1672753581,
-        "narHash": "sha256-EIi2tqHoje5cE9WqH23ZghW28NOOWSUM7tcxKE1U9KI=",
-        "owner": "LnL7",
-        "repo": "nix-darwin",
-        "rev": "3db1d870b04b13411f56ab1a50cd32b001f56433",
-        "type": "github"
-      },
-      "original": {
-        "owner": "LnL7",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
    "deploy": {
      "inputs": {
-        "flake-compat": "flake-compat",
+        "flake-compat": [
+          "flake-compat"
+        ],
        "nixpkgs": [
          "nixos"
        ],
@ -107,12 +91,16 @@
    },
    "digga": {
      "inputs": {
-        "darwin": "darwin_2",
+        "darwin": [
+          "darwin"
+        ],
        "deploy": [
          "deploy"
        ],
        "devshell": "devshell",
-        "flake-compat": "flake-compat_2",
+        "flake-compat": [
+          "flake-compat"
+        ],
        "flake-utils": "flake-utils_2",
        "flake-utils-plus": "flake-utils-plus",
        "home-manager": [
@ -142,38 +130,6 @@
      }
    },
    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1668681692,
-        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1668681692,
-        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_3": {
      "flake": false,
      "locked": {
        "lastModified": 1673956053,
@ -265,11 +221,11 @@
    },
    "latest": {
      "locked": {
-        "lastModified": 1674641431,
-        "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=",
+        "lastModified": 1675115703,
+        "narHash": "sha256-4zetAPSyY0D77x+Ww9QBe8RHn1akvIvHJ/kgg8kGDbk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc",
+        "rev": "2caf4ef5005ecc68141ecb4aac271079f7371c44",
        "type": "github"
      },
      "original": {
@ -281,11 +237,11 @@
    },
    "nixos": {
      "locked": {
-        "lastModified": 1674868155,
-        "narHash": "sha256-eFNm2h6fNbgD7ZpO4MHikCB5pSnCJ7DTmwPisjetmwc=",
+        "lastModified": 1675154384,
+        "narHash": "sha256-gUXzyTS3WsO3g2Rz0qOYR2a26whkyL2UfTr1oPH9mm8=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "ce20e9ebe1903ea2ba1ab006ec63093020c761cb",
+        "rev": "0218941ea68b4c625533bead7bbb94ccce52dceb",
        "type": "github"
      },
      "original": {
@ -344,7 +300,7 @@
        "darwin": "darwin",
        "deploy": "deploy",
        "digga": "digga",
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat",
        "home": "home",
        "latest": "latest",
        "nixos": "nixos",
--- a/flake.nix
+++ b/flake.nix
@ -18,6 +18,8 @@
    digga.inputs.nixlib.follows = "nixos";
    digga.inputs.home-manager.follows = "home";
    digga.inputs.deploy.follows = "deploy";
+    digga.inputs.darwin.follows = "darwin";
+    digga.inputs.flake-compat.follows = "flake-compat";

    home.url = "github:nix-community/home-manager/release-22.11";
    home.inputs.nixpkgs.follows = "nixos";
@ -27,9 +29,11 @@

    deploy.url = "github:serokell/deploy-rs";
    deploy.inputs.nixpkgs.follows = "nixos";
+    deploy.inputs.flake-compat.follows = "flake-compat";

    agenix.url = "github:ryantm/agenix";
    agenix.inputs.nixpkgs.follows = "nixos";
+    agenix.inputs.darwin.follows = "darwin";

    nixos-hardware.url = "github:nixos/nixos-hardware";
  };
@ -73,7 +77,7 @@
          });
        })
        nur.overlay
-        agenix.overlay
+        agenix.overlays.default

        (import ./pkgs)
      ];
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@ -14,7 +14,6 @@ channels: final: prev: {
    signal-desktop
    starship
    deploy-rs
-    nix
    tdesktop
    arduino
    arduino-cli
Author	SHA1	Message	Date
b12f	df569f3215	Merge pull request 'Really fix nvfetcher always rebuilding, fix agenix overlay, bump flake.lock' (#162 ) from fix/nvfetcher-agenix-bump-flake into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #162 Reviewed-by: b12f <hello@benjaminbaedorf.eu>	2023-02-01 12:13:47 +01:00
teutat3s	2ed21e3b94	flake: make digga, deploy, agenix follow existing All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details inputs This should reduce merge conflicts in the flake.lock file by reducing the number of locked inputs	2023-02-01 11:29:34 +01:00
teutat3s	edc7335d48	Use nix version from 22.11, prevent nvfetcher from All checks were successful continuous-integration/drone/push Build is passing Details continuous-integration/drone/pr Build is passing Details rebuilding so much: it has nix as a dependency and won't find its hash in the binary cache if we override our nix version with the one from nixos-unstable. 22.11 has 2.11.1 which should be recent enough for us.	2023-02-01 11:21:46 +01:00
teutat3s	8ef0827565	Bump flake.lock, fix agenix overlay agenix now uses overlays.default to export its overlay See: `64b0574514`	2023-02-01 11:20:35 +01:00