diff options
| -rw-r--r-- | hosts/underworld/default.nix | 1 | ||||
| -rw-r--r-- | hosts/underworld/home.nix | 13 | ||||
| -rw-r--r-- | hosts/underworld/sops.nix | 12 | ||||
| -rw-r--r-- | hosts/wonderland/home.nix | 9 | ||||
| -rw-r--r-- | share/cfg/default.nix | 1 |
5 files changed, 32 insertions, 4 deletions
diff --git a/hosts/underworld/default.nix b/hosts/underworld/default.nix index a271765..7aaeea8 100644 --- a/hosts/underworld/default.nix +++ b/hosts/underworld/default.nix @@ -11,6 +11,7 @@ ./disko.nix ./home.nix + ./sops.nix (flakeRoot + /share/system/client-common.nix) #(flakeRoot + /share/system/spotifyd.nix) { diff --git a/hosts/underworld/home.nix b/hosts/underworld/home.nix index bf652d0..f43148b 100644 --- a/hosts/underworld/home.nix +++ b/hosts/underworld/home.nix @@ -1,4 +1,9 @@ -{ flakeRoot, inputs, ... }: +{ + flakeRoot, + inputs, + config, + ... +}: { home-manager = { useGlobalPkgs = true; @@ -6,11 +11,15 @@ sharedModules = [ { programs.fish.enable = true; } ]; extraSpecialArgs = { inherit inputs; + inherit (config) sops; }; }; home-manager.users.osiris = { - imports = [ (flakeRoot + /share/cfg) ]; + imports = [ + (flakeRoot + /share/cfg) + (flakeRoot + /share/cfg/senpai.nix) + ]; custom.hyprdesktop = { enable = true; enableGaming = true; diff --git a/hosts/underworld/sops.nix b/hosts/underworld/sops.nix new file mode 100644 index 0000000..9c4a211 --- /dev/null +++ b/hosts/underworld/sops.nix @@ -0,0 +1,12 @@ +{ config, ... }: +{ + sops = { + age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; + defaultSopsFile = ../../secrets/credentials.json; + secrets = { + "irc/libera-password" = { + owner = config.users.users.osiris.name; + }; + }; + }; # end of sops +} diff --git a/hosts/wonderland/home.nix b/hosts/wonderland/home.nix index a970261..1a6dc7c 100644 --- a/hosts/wonderland/home.nix +++ b/hosts/wonderland/home.nix @@ -8,7 +8,14 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - sharedModules = [ { imports = [ (flakeRoot + /share/cfg) ]; } ]; + sharedModules = [ + { + imports = [ + (flakeRoot + /share/cfg) + (flakeRoot + /share/cfg/senpai.nix) + ]; + } + ]; extraSpecialArgs = { inherit inputs; inherit (config) sops; diff --git a/share/cfg/default.nix b/share/cfg/default.nix index 88e2e89..bcea7c7 100644 --- a/share/cfg/default.nix +++ b/share/cfg/default.nix @@ -16,7 +16,6 @@ ./shellenv.nix ./hyprland.nix ./jujutsu.nix - ./senpai.nix ./emacs.nix ]; } |
