diff --git a/.sops.yaml b/.sops.yaml index 45d9626..921dbf8 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -19,39 +19,39 @@ creation_rules: - path_regex: users/alice/secrets.*\.yaml$ key_groups: - pgp: - - *admin_alice + - *admin_alice age: - - *palatine-hill - - *artemision - - *artemision-home + - *palatine-hill + - *artemision + - *artemision-home - path_regex: systems/palatine-hill/secrets.*\.yaml$ key_groups: - pgp: - - *admin_alice + - *admin_alice age: - - *palatine-hill + - *palatine-hill - path_regex: systems/artemision/secrets.*\.yaml$ key_groups: - pgp: - - *admin_alice + - *admin_alice age: - - *artemision + - *artemision - path_regex: systems/selinunte/secrets.*\.yaml$ key_groups: - pgp: - - *admin_alice + - *admin_alice age: - - *artemision - - *selinunte + - *artemision + - *selinunte - path_regex: systems/palatine-hill/docker/wg/.*\.conf$ key_groups: - pgp: - - *admin_alice + - *admin_alice age: - - *palatine-hill + - *palatine-hill - path_regex: systems/palatine-hill/docker/openvpn/.*\.ovpn$ key_groups: - pgp: - - *admin_alice + - *admin_alice age: - - *palatine-hill + - *palatine-hill diff --git a/flake.nix b/flake.nix index 68a36c0..427fcdd 100644 --- a/flake.nix +++ b/flake.nix @@ -175,6 +175,29 @@ formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style); nixosConfigurations = genSystems inputs outputs src (src + "/systems"); + homeConfigurations = { + "alice" = inputs.home-manager.lib.homeManagerConfiguration { + pkgs = import nixpkgs { system = "x86_64-linux"; }; + modules = [ + inputs.stylix.homeModules.stylix + inputs.sops-nix.homeManagerModules.sops + inputs.nix-index-database.hmModules.nix-index + { + nixpkgs.config = { + allowUnfree = true; + allowUnfreePredicate = _: true; + }; + } + ./users/alice/home.nix + ]; + extraSpecialArgs = { + inherit inputs outputs; + machineConfig = { + server = false; + }; + }; + }; + }; images = { install-iso = getImages nixosConfigurations "install-iso"; iso = getImages nixosConfigurations "iso"; diff --git a/lib/systems.nix b/lib/systems.nix index fd46b2a..ba894b7 100644 --- a/lib/systems.nix +++ b/lib/systems.nix @@ -172,6 +172,7 @@ rec { modules = [ inputs.nixos-modules.nixosModule + inputs.nix-index-database.nixosModules.nix-index (genHostName hostname) (configPath + "/hardware.nix") (configPath + "/configuration.nix") diff --git a/users/alice/home/zsh.nix b/users/alice/home/zsh.nix index a2d3c73..14390a2 100644 --- a/users/alice/home/zsh.nix +++ b/users/alice/home/zsh.nix @@ -72,7 +72,7 @@ "sgc" = "sudo git -C /root/dotfiles"; ## SSH "ssh-init" = - "ssh-add -t 2h ~/.ssh/id_rsa_tails ~/.ssh/id_ed25519_tails ~/.ssh/id_rsa_palatine ~/.ssh/id_ed25519_palatine ~/.ssh/id_ed25519_rota ~/.ssh/id_ed25519_gh"; + "ssh-add -t 2h ~/.ssh/id_rsa_tails ~/.ssh/id_ed25519_tails ~/.ssh/id_rsa_palatine ~/.ssh/id_ed25519_palatine ~/.ssh/id_ed25519_rota ~/.ssh/id_ed25519_gh ~/.ssh/id_ed25519"; ## Backups "borgmatic-backup-quick" =