From 8b2b79e8f3fb53c79fd0df466a19fcc52e6cc546 Mon Sep 17 00:00:00 2001 From: Matt Sawyer Date: Wed, 24 Jul 2024 15:25:03 -0700 Subject: [PATCH] update flake --- flake.lock | 189 ++++++++++++++++++++--------------- modules/minikube/default.nix | 17 ++++ 2 files changed, 124 insertions(+), 82 deletions(-) create mode 100644 modules/minikube/default.nix diff --git a/flake.lock b/flake.lock index 823fcff..24de64a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1715653378, - "narHash": "sha256-6kbg/PI3+SBP17f4T0js3CBsMLVtlD0JqJhDKgzk1mQ=", + "lastModified": 1716993688, + "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "de8b0d60d6fd34f35abffc46adc94ebaa6996ce2", + "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", "type": "github" }, "original": { @@ -36,6 +36,22 @@ "type": "github" } }, + "flake-compat_2": { + "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-parts": { "inputs": { "nixpkgs-lib": [ @@ -44,11 +60,11 @@ ] }, "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", "type": "github" }, "original": { @@ -149,21 +165,52 @@ "type": "github" } }, - "flake-utils_5": { + "git-hooks": { "inputs": { - "systems": "systems_5" + "flake-compat": "flake-compat_2", + "gitignore": "gitignore", + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ], + "nixpkgs-stable": [ + "neovim-nightly-overlay", + "nixpkgs" + ] }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "type": "github" }, "original": { - "owner": "numtide", - "repo": "flake-utils", + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "neovim-nightly-overlay", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", "type": "github" } }, @@ -196,11 +243,11 @@ ] }, "locked": { - "lastModified": 1715486357, - "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=", + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", "owner": "nix-community", "repo": "home-manager", - "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", "type": "github" }, "original": { @@ -217,11 +264,11 @@ ] }, "locked": { - "lastModified": 1715686128, - "narHash": "sha256-K/18QIbxVxi++p4EsZVQdC52Gvg50uza1hzkTeIbGoc=", + "lastModified": 1717772538, + "narHash": "sha256-58rs8ijQQPvY27Tev4JDZjB2XdtDaOjddGPEKeRYPZU=", "owner": "grafana", "repo": "loki", - "rev": "a1b1eeb09583f04a36ebdb96f716f3f285b90adf", + "rev": "9767807680cb4149c7b56345c531b62105a1b976", "type": "github" }, "original": { @@ -250,46 +297,23 @@ "type": "github" } }, - "neovim-flake": { - "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "dir": "contrib", - "lastModified": 1715601639, - "narHash": "sha256-ppixh//67UGy7/a1SmWixrOs9b95fzXq8nek2s3UYiI=", - "owner": "neovim", - "repo": "neovim", - "rev": "e3ec974324bd73b63f54503480a4e48d1887f8d9", - "type": "github" - }, - "original": { - "dir": "contrib", - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat", "flake-parts": "flake-parts", + "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", - "neovim-flake": "neovim-flake", + "neovim-src": "neovim-src", "nixpkgs": [ "unstable" ] }, "locked": { - "lastModified": 1715645016, - "narHash": "sha256-BFn9dwbzoQ+F/vyU5LbV3Ypfvujjry3oFuH8/DenDD8=", + "lastModified": 1717737574, + "narHash": "sha256-Oc1xZW7pc/cCr+2FpgbFuNz/yBh4ZqjsbmSH7pVADiE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "751a2db94031f9a383707d5cd7eb2c8d6b36028d", + "rev": "da7e7da75fab002c8e6c695ddce45c825fbe6444", "type": "github" }, "original": { @@ -298,20 +322,36 @@ "type": "github" } }, + "neovim-src": { + "flake": false, + "locked": { + "lastModified": 1717712276, + "narHash": "sha256-r9mtD17PiNYVKWs+Cc9uIv/vmkRtiwGrG42QRd1K6Os=", + "owner": "neovim", + "repo": "neovim", + "rev": "d490a7bc5b9d731828f5da16b35a86b4e1270624", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, "nil": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "unstable" ], "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1714571717, - "narHash": "sha256-o4tqlTzi9kcVub167kTGXgCac9jM3kW4+v9MH/ue4Hk=", + "lastModified": 1717086091, + "narHash": "sha256-GmsEQa4HZeMfec37LZnwG/Lt/XmqFLXsjv5QWojeNiM=", "owner": "oxalica", "repo": "nil", - "rev": "2f3ed6348bbf1440fcd1ab0411271497a0fbbfa4", + "rev": "ab3ddb8f063774cf7e22eb610f5ecfdb77309f3c", "type": "github" }, "original": { @@ -355,20 +395,20 @@ }, "poetry2nix": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "unstable" ], - "systems": "systems_6", + "systems": "systems_5", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1715251496, - "narHash": "sha256-vRBfJCKvJtu5sYev56XStirA3lAOPv0EkoEV2Nfc+tc=", + "lastModified": 1717774136, + "narHash": "sha256-comOhXDFUrbVba47gPenVBKy2foM3m3qOqpcP8umWDA=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "291a863e866972f356967d0a270b259f46bf987f", + "rev": "370da3b6fefc6c11367463b68d010f9950aaa80c", "type": "github" }, "original": { @@ -403,11 +443,11 @@ ] }, "locked": { - "lastModified": 1714529851, - "narHash": "sha256-YMKJW880f7LHXVRzu93xa6Ek+QLECIu0IRQbXbzZe38=", + "lastModified": 1717035469, + "narHash": "sha256-MzH+yjKULH3HCRj9QCTwBvqq4LZkR0ZqRE/QfGOGC2E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9ca720fdcf7865385ae3b93ecdf65f1a64cb475e", + "rev": "095702e63a40e86f339d11864da9dc965b70a01e", "type": "github" }, "original": { @@ -477,21 +517,6 @@ } }, "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -513,11 +538,11 @@ ] }, "locked": { - "lastModified": 1714058656, - "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=", + "lastModified": 1717278143, + "narHash": "sha256-u10aDdYrpiGOLoxzY/mJ9llST9yO8Q7K/UlROoNxzDw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f", + "rev": "3eb96ca1ae9edf792a8e0963cc92fddfa5a87706", "type": "github" }, "original": { @@ -528,11 +553,11 @@ }, "unstable": { "locked": { - "lastModified": 1715705782, - "narHash": "sha256-pkveMcGZRiXj2sakbYCtlptKOuPVEnU4FD8Mjj46vkc=", + "lastModified": 1717797440, + "narHash": "sha256-TqNsgOOM63ihDvxzI7Shm0MK157rxIsI4Zc9burYzRE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f11fb1528779fb2932b27a82e946a1e8d3e36f64", + "rev": "121ba21838380d29d3580394413d834c28a73b9f", "type": "github" }, "original": { diff --git a/modules/minikube/default.nix b/modules/minikube/default.nix new file mode 100644 index 0000000..0cf0304 --- /dev/null +++ b/modules/minikube/default.nix @@ -0,0 +1,17 @@ +{ pkgs +# , listenerURL ? "https://127.0.0.1:6443" +, ... +}: + +with pkgs; +{ + environment.systemPackages = [ minikube ]; + # services.k3s = { + # enable = true; + # package = k3s; + # serverAddr = listenerURL; + # extraFlags = '' + # --write-kubeconfig-mode 644 + # ''; + # }; +}