diff --git a/flake.nix b/flake.nix index 48284e7..fffd24f 100644 --- a/flake.nix +++ b/flake.nix @@ -66,6 +66,7 @@ modules = [ # > Our main home-manager configuration file < ./home-manager/users/sstent + inputs.sops-nix.homeManagerModules.sops ]; }; }; diff --git a/home-manager/beets.nix b/home-manager/beets.nix index a238967..12ce734 100644 --- a/home-manager/beets.nix +++ b/home-manager/beets.nix @@ -1,6 +1,8 @@ { config, pkgs, lib, ... }: { + xdg.configFile."beets/config.old".source = config.lib.file.mkOutOfStoreSymlink config.sops.secrets.test.path; + programs.beets = { enable = true; settings = { diff --git a/home-manager/configs/mrconfig b/home-manager/users/sstent/configs/mrconfig similarity index 100% rename from home-manager/configs/mrconfig rename to home-manager/users/sstent/configs/mrconfig diff --git a/home-manager/configs/nicotine b/home-manager/users/sstent/configs/nicotine similarity index 100% rename from home-manager/configs/nicotine rename to home-manager/users/sstent/configs/nicotine diff --git a/home-manager/users/sstent/default.nix b/home-manager/users/sstent/default.nix index 5c8ef7d..1b5558d 100644 --- a/home-manager/users/sstent/default.nix +++ b/home-manager/users/sstent/default.nix @@ -5,13 +5,14 @@ imports = [ ../../global ../../beets.nix + ]; home.username = "sstent"; home.homeDirectory = "/home/sstent"; home.stateVersion = "23.05"; sops = { - age.sshKeyPaths = [ "/home/sstent/.ssh/" ]; + age.sshKeyPaths = [ "/home/sstent/.ssh/id_ed25519" ]; defaultSopsFile = ./secrets.yaml; secrets.test = { # sopsFile = ./secrets.yml.enc; # optionally define per-secret files @@ -19,10 +20,11 @@ # %r gets replaced with a runtime directory, use %% to specify a '%' # sign. Runtime dir is $XDG_RUNTIME_DIR on linux and $(getconf # DARWIN_USER_TEMP_DIR) on darwin. - path = "%r/test.txt"; + # path = "${config.xdg.configHome}/.ssh/test"; }; }; + # xdg.configFile."beets/config.old".source = config.sops.secrets.test.path; # Let Home Manager install and manage itself. diff --git a/home-manager/packages/python-packages.nix b/home-manager/users/sstent/packages/python-packages.nix similarity index 100% rename from home-manager/packages/python-packages.nix rename to home-manager/users/sstent/packages/python-packages.nix