diff --git a/flake.lock b/flake.lock index bd66f01..e1a2fd5 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1735485506, - "narHash": "sha256-7CWr3Q83KnGiLUn0oaboafLMOXQ0X9/fjFRVY1xopbM=", + "lastModified": 1736090999, + "narHash": "sha256-B5CJuHqfJrzPa7tObK0H9669/EClSHpa/P7B9EuvElU=", "owner": "aylur", "repo": "ags", - "rev": "251d39413543264361898b02035775aa3e46fe52", + "rev": "5527c3c07d92c11e04e7fd99d58429493dba7e3c", "type": "github" }, "original": { @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1735921862, - "narHash": "sha256-4GPjTUJsfMdDfdRAZPMR5Xx9rJ1LedRYY+YtS2nh6NQ=", + "lastModified": 1736497508, + "narHash": "sha256-murrCQMYKtZ8rkZ5O726ZCsCDee1l3ZdmV8yC9gRaIc=", "owner": "aylur", "repo": "astal", - "rev": "a3bb83a22b7d237c2c2fc6bd531f30d6265135cf", + "rev": "ef4f95608481414053ecdbe4de29bd86fb452813", "type": "github" }, "original": { @@ -69,11 +69,11 @@ ] }, "locked": { - "lastModified": 1735468753, - "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=", + "lastModified": 1736437680, + "narHash": "sha256-9Sy17XguKdEU9M5peTrkWSlI/O5IAqjHzdzxbXnc30g=", "owner": "nix-community", "repo": "disko", - "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21", + "rev": "4d5d07d37ff773338e40a92088f45f4f88e509c8", "type": "github" }, "original": { @@ -144,11 +144,11 @@ ] }, "locked": { - "lastModified": 1736014267, - "narHash": "sha256-Tvi/kZJdIGEU9u1ivm4Zv1a0YEb77V1FCfvsMIiqF8M=", + "lastModified": 1736504054, + "narHash": "sha256-Mb0aIdOIg5ge0Lju1zogdAcfklRciR8G0NY6R423oek=", "owner": "karaolidis", "repo": "home-manager", - "rev": "8079b1ba676b23136629bd133da6e9d8f664f179", + "rev": "baa0e7a14088ff1ed891afe4c6457faf40aa30a6", "type": "github" }, "original": { @@ -160,11 +160,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736034412, - "narHash": "sha256-P0CKCon/dxpKc45VMBvykZzbgg0GkYhJ0gs0uSQlSAc=", + "lastModified": 1736505015, + "narHash": "sha256-bY3JTStgCgUZa6cE1GAc+c9ZCExCGvpjmPb7ANanhsc=", "owner": "karaolidis", "repo": "nixpkgs", - "rev": "d17ad39f9394611a3921c69e6730a51eb6fec80b", + "rev": "43ed29dceb72a444d29ec4b0b980deae63ea9791", "type": "github" }, "original": { @@ -176,11 +176,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { @@ -197,11 +197,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1736027142, - "narHash": "sha256-AZ5YNuV9w8SSxCM2KYnvcqntxPKED53oMjDotEj5jyU=", + "lastModified": 1736500613, + "narHash": "sha256-OCEXlRyOIMzxrhmnzoX32e241A7+Z+zsuyR7i6AG608=", "owner": "nix-community", "repo": "NUR", - "rev": "782119f4b55be55f6578f8387c1b9a8017719997", + "rev": "d51e847f68700c38f850a62c2b3e728864a38cde", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1735844895, - "narHash": "sha256-CIRlqX9tBK2awJkmVu2cKuap/0QziDXStQZ/u/+e8Z4=", + "lastModified": 1736203741, + "narHash": "sha256-eSjkBwBdQk+TZWFlLbclF2rAh4JxbGg8az4w/Lfe7f4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "24d89184adf76d7ccc99e659dc5f3838efb5ee32", + "rev": "c9c88f08e3ee495e888b8d7c8624a0b2519cb773", "type": "github" }, "original": { @@ -251,11 +251,11 @@ ] }, "locked": { - "lastModified": 1735964101, - "narHash": "sha256-FUKeipaDxAFf+0jun6CKk37g7UALIeisSz6L19KL+WM=", + "lastModified": 1736482561, + "narHash": "sha256-f4hvN4MF26NIYeFA/H1sVW6KU5X9/jy9l95WrMsNUIU=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "5b2bbc7a627ea983cef34f4a8ec81cd597529943", + "rev": "77fb1ae39e0f5c60a7d0bd6ce078b9c56e3356cb", "type": "github" }, "original": { diff --git a/hosts/elara/users/nikara/configs/console/kubernetes/default.nix b/hosts/elara/users/nikara/configs/console/kubernetes/default.nix index 5de760b..b067a15 100644 --- a/hosts/elara/users/nikara/configs/console/kubernetes/default.nix +++ b/hosts/elara/users/nikara/configs/console/kubernetes/default.nix @@ -8,7 +8,6 @@ (final: prev: { telepresence = prev.telepresence.overrideAttrs (oldAttrs: { patches = oldAttrs.patches or [ ] ++ [ - ./fix-versioneer.patch ./extend-timeout.patch ]; }); diff --git a/hosts/elara/users/nikara/configs/console/kubernetes/fix-versioneer.patch b/hosts/elara/users/nikara/configs/console/kubernetes/fix-versioneer.patch deleted file mode 100644 index 5d3e521..0000000 --- a/hosts/elara/users/nikara/configs/console/kubernetes/fix-versioneer.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/versioneer.py b/versioneer.py -index 7e5bb402e..60d65ef76 100644 ---- a/versioneer.py -+++ b/versioneer.py -@@ -339,9 +339,9 @@ def get_config_from_root(root): - # configparser.NoOptionError (if it lacks "VCS="). See the docstring at - # the top of versioneer.py for instructions on writing your setup.cfg . - setup_cfg = os.path.join(root, "setup.cfg") -- parser = configparser.SafeConfigParser() -+ parser = configparser.ConfigParser() - with open(setup_cfg, "r") as f: -- parser.readfp(f) -+ parser.read_file(f) - VCS = parser.get("versioneer", "VCS") # mandatory - - def get(parser, name): diff --git a/submodules/home-manager b/submodules/home-manager index 8079b1b..baa0e7a 160000 --- a/submodules/home-manager +++ b/submodules/home-manager @@ -1 +1 @@ -Subproject commit 8079b1ba676b23136629bd133da6e9d8f664f179 +Subproject commit baa0e7a14088ff1ed891afe4c6457faf40aa30a6 diff --git a/submodules/nixpkgs b/submodules/nixpkgs index d17ad39..43ed29d 160000 --- a/submodules/nixpkgs +++ b/submodules/nixpkgs @@ -1 +1 @@ -Subproject commit d17ad39f9394611a3921c69e6730a51eb6fec80b +Subproject commit 43ed29dceb72a444d29ec4b0b980deae63ea9791