From 9a2c0ce534850f1d40bc55dbc6480a5fefdcd8bb Mon Sep 17 00:00:00 2001 From: Andre Date: Thu, 16 May 2024 12:40:51 -0400 Subject: [PATCH] Fix root user in nix-secrets not building --- flake.lock | 10 +++++----- flake.nix | 3 ++- modules/autoimport.nix | 2 +- nix-secrets | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 036e65d..3851494 100644 --- a/flake.lock +++ b/flake.lock @@ -218,15 +218,15 @@ ] }, "locked": { - "lastModified": 1715801730, - "narHash": "sha256-7X/FAfjyQxh8mgpbNPsGoh9Dxi1Q0jF4OOJQBntCUJM=", - "rev": "7e8a5498db41de8c67315b4a2a4f82a2072ee73b", - "revCount": 77, + "lastModified": 1715863402, + "narHash": "sha256-WbNIHMe+NPRtn7AwFhIDYwMWwgTNJ5pVUXfcdhxv8ek=", + "ref": "refs/heads/main", + "rev": "36dbb9dbfbac2b72c431a3a934258079931d0065", + "revCount": 80, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, "original": { - "rev": "7e8a5498db41de8c67315b4a2a4f82a2072ee73b", "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" } diff --git a/flake.nix b/flake.nix index 431eddd..f7654d1 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,8 @@ flake = false; }; lix-module = { - url = "git+https://git.lix.systems/lix-project/nixos-module?rev=7e8a5498db41de8c67315b4a2a4f82a2072ee73b"; + #url = "git+https://git.lix.systems/lix-project/nixos-module?rev=7e8a5498db41de8c67315b4a2a4f82a2072ee73b"; + url = "git+https://git.lix.systems/lix-project/nixos-module"; inputs.lix.follows = "lix"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/autoimport.nix b/modules/autoimport.nix index 55e3096..ce87eec 100644 --- a/modules/autoimport.nix +++ b/modules/autoimport.nix @@ -8,7 +8,7 @@ let nix-secrets-ssh = builtins.fetchGit { url = "/home/aires/Development/nix-configuration/nix-secrets"; ref = "main"; - rev = "ddca37b4ed423e32e69f08a1f81d3adcd440fa44"; + rev = "18340f7a56b754d807a5be2ef84f12ea3b34ce4e"; }; # Recursively constructs an attrset of a given folder, recursing on directories, value of attrs is the filetype diff --git a/nix-secrets b/nix-secrets index ddca37b..18340f7 160000 --- a/nix-secrets +++ b/nix-secrets @@ -1 +1 @@ -Subproject commit ddca37b4ed423e32e69f08a1f81d3adcd440fa44 +Subproject commit 18340f7a56b754d807a5be2ef84f12ea3b34ce4e