diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 254bd98..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "secrets"] - path = secrets - url = git@git.caem.dev:caem/secrets diff --git a/README.md b/README.md index 701a0c2..5cd8969 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ EOF ```sh mkpasswd | wl-copy -sops secrets.yaml +sops upasswd.yaml ``` Then edit the file to look like this @@ -70,7 +70,9 @@ upasswd: [The pasted password from mkpasswd] cat < flake.nix { outputs = { self, ... }: { - path = self + "/secrets.yaml"; + paths = { + upasswd = self + "/upasswd.yaml"; + }; }; } EOF diff --git a/modules/home/caem/default.nix b/modules/home/caem/default.nix index a444f93..367ada9 100644 --- a/modules/home/caem/default.nix +++ b/modules/home/caem/default.nix @@ -1,8 +1,7 @@ -{ inputs, lib, config, ... }: +{ lib, config, ... }: { imports = [ - inputs.impermanence.homeManagerModules.impermanence ./packages.nix ]; @@ -30,16 +29,4 @@ templates = "${config.xdg.dataHome}/xdg/templates"; }; }; - - home.persistence."/nix/persist/home/caem" = { - allowOther = true; - directories = [ - "documents" - "download" - "music" - "images" - "videos" - "programming" - ]; - }; } diff --git a/modules/nixos/user/caem.nix b/modules/nixos/user/caem.nix index a92688c..4046513 100644 --- a/modules/nixos/user/caem.nix +++ b/modules/nixos/user/caem.nix @@ -6,6 +6,19 @@ sopsFile = inputs.secrets.paths.upasswd; }; + environment.persistence."/nix/persist" = { + users.caem = { + directories = [ + "documents" + "download" + "music" + "images" + "videos" + "programming" + ]; + }; + }; + users.users.caem = { isNormalUser = true; shell = pkgs.zsh; diff --git a/secrets b/secrets deleted file mode 160000 index 7390891..0000000 --- a/secrets +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 73908914ee288a689dede75c9e4ff1531e41159c