From b0545127f0b61b4bcc27ec792ae481d7324b40b9 Mon Sep 17 00:00:00 2001 From: James Andariese Date: Sat, 19 Apr 2025 20:36:39 -0500 Subject: [PATCH] remove some unnecessary stuff from flake and update --- flake.lock | 122 ++++++++--------------------------------------------- flake.nix | 5 +-- 2 files changed, 19 insertions(+), 108 deletions(-) diff --git a/flake.lock b/flake.lock index de18f8b..2b5856a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,51 +1,15 @@ { "nodes": { - "deploy-rs": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs", - "utils": "utils" - }, - "locked": { - "lastModified": 1727447169, - "narHash": "sha256-3KyjMPUKHkiWhwR91J1YchF6zb6gvckCAY1jOE+ne0U=", - "owner": "serokell", - "repo": "deploy-rs", - "rev": "aa07eb05537d4cd025e2310397a6adcedfe72c76", - "type": "github" - }, - "original": { - "owner": "serokell", - "repo": "deploy-rs", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -57,14 +21,14 @@ "interlude": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1720929675, - "narHash": "sha256-Ofvbdb2qM8JyiOw3wpsqAS7C3oxX90KcwSM074kOXLA=", + "lastModified": 1745101994, + "narHash": "sha256-YP1fjZl8k8v3bVRNi4gjQCevOObE4HZ5RjokJTXwZzQ=", "ref": "refs/heads/main", - "rev": "1e7658a97a0e34ec84eda0af2854d00fa1c6657d", - "revCount": 2, + "rev": "1f46e81e81faf6d00f7f08043770d384d6c87d3d", + "revCount": 3, "type": "git", "url": "https://git.strudelline.net/nix/interlude" }, @@ -111,36 +75,20 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702272962, - "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1720691131, - "narHash": "sha256-CWT+KN8aTPyMIx8P303gsVxUnkinIz0a/Cmasz1jyIM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a046c1202e11b62cbede5385ba64908feb7bfac4", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { "lastModified": 1744440957, "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", @@ -157,10 +105,9 @@ }, "root": { "inputs": { - "deploy-rs": "deploy-rs", "interlude": "interlude", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "unstable": "unstable" } }, @@ -179,28 +126,13 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "unstable": { "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -209,24 +141,6 @@ "repo": "nixpkgs", "type": "github" } - }, - "utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c44f0c3..64cddc3 100644 --- a/flake.nix +++ b/flake.nix @@ -4,9 +4,8 @@ unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; interlude.url = "git+https://git.strudelline.net/nix/interlude"; nixos-generators = { url = "github:nix-community/nixos-generators"; inputs.nixpkgs.follows = "nixpkgs"; }; - deploy-rs.url = "github:serokell/deploy-rs"; }; - outputs = { self, nixpkgs, unstable, interlude, nixos-generators, deploy-rs }@inputs: + outputs = { self, nixpkgs, unstable, interlude, nixos-generators }@inputs: with builtins; with nixpkgs.lib; with interlude.lib; @@ -38,8 +37,6 @@ hostsPath = "${./.}" + "/hosts"; dirContents = readDir hostsPath; filenames = attrNames dirContents; - #dirs = (filter (n: dirContents."${n}" == "directory" && - # readFileType "${hostsPath}/${n}/default.nix" == "regular") filenames); in concatMap (filterAndStripSuffix ".nix") (filter (n: dirContents."${n}" == "regular") filenames); in