diff --git a/.sops.yaml b/.sops.yaml index 921dbf8..45d9626 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/lib/systems.nix b/lib/systems.nix index 09136b4..8c24735 100644 --- a/lib/systems.nix +++ b/lib/systems.nix @@ -169,21 +169,20 @@ rec { system ; }; - modules = - [ - inputs.nixos-modules.nixosModule - inputs.nix-index-database.nixosModules.nix-index - (genHostName hostname) - (configPath + "/hardware.nix") - (configPath + "/configuration.nix") - ] - ++ modules - ++ (lib.adev.fileList (src + "/modules")) - ++ genWrapper sops genSops args - ++ genWrapper home genHome args - ++ genWrapper true genUsers args - #++ genWrapper lix ({ ... }: [ inputs.lix-module.nixosModules.default ]) args - ++ genWrapper (system != "x86_64-linux") genNonX86 args; + modules = [ + inputs.nixos-modules.nixosModule + inputs.nix-index-database.nixosModules.nix-index + (genHostName hostname) + (configPath + "/hardware.nix") + (configPath + "/configuration.nix") + ] + ++ modules + ++ (lib.adev.fileList (src + "/modules")) + ++ genWrapper sops genSops args + ++ genWrapper home genHome args + ++ genWrapper true genUsers args + #++ genWrapper lix ({ ... }: [ inputs.lix-module.nixosModules.default ]) args + ++ genWrapper (system != "x86_64-linux") genNonX86 args; }; # a convenience function for automatically generating NixOS systems by reading a directory via constructSystem diff --git a/modules/autopull.nix b/modules/autopull.nix index 545b1ea..6f2be16 100644 --- a/modules/autopull.nix +++ b/modules/autopull.nix @@ -59,11 +59,12 @@ in repos = lib.filterAttrs (_: { enable, ... }: enable) cfg.repo; in lib.mkIf cfg.enable { - environment.systemPackages = - [ pkgs.git ] - ++ lib.optionals (lib.any (ssh-key: ssh-key != "") (lib.adev.mapGetAttr "ssh-key" repos)) [ - pkgs.openssh - ]; + environment.systemPackages = [ + pkgs.git + ] + ++ lib.optionals (lib.any (ssh-key: ssh-key != "") (lib.adev.mapGetAttr "ssh-key" repos)) [ + pkgs.openssh + ]; systemd.services = lib.mapAttrs' ( _: diff --git a/modules/boot.nix b/modules/boot.nix index b9165b3..0f6382d 100644 --- a/modules/boot.nix +++ b/modules/boot.nix @@ -35,10 +35,11 @@ in config.boot = lib.mkIf cfg.default { supportedFilesystems = [ cfg.filesystem ]; tmp.useTmpfs = true; - kernelParams = - [ "nordrand" ] - ++ lib.optional (cfg.cpuType == "amd") "kvm-amd" - ++ lib.optional cfg.fullDiskEncryption "ip=:::"; + kernelParams = [ + "nordrand" + ] + ++ lib.optional (cfg.cpuType == "amd") "kvm-amd" + ++ lib.optional cfg.fullDiskEncryption "ip=:::"; initrd = { kernelModules = lib.mkIf cfg.amdGPU [ "amdgpu" ]; network = lib.mkIf cfg.fullDiskEncryption { diff --git a/systems/palatine-hill/configuration.nix b/systems/palatine-hill/configuration.nix index 7a2f455..5cf4a9b 100644 --- a/systems/palatine-hill/configuration.nix +++ b/systems/palatine-hill/configuration.nix @@ -53,7 +53,7 @@ vaapiVdpau libvdpau-va-gl intel-compute-runtime - intel-media-sdk + vpl-gpu-rt # replaces intel-media-sdk ]; }; }; diff --git a/users/alice/home.nix b/users/alice/home.nix index 85c98b8..f9194ee 100644 --- a/users/alice/home.nix +++ b/users/alice/home.nix @@ -7,18 +7,17 @@ }: { - imports = - [ - ./home/zsh.nix - ./home/git.nix - ] - ++ lib.optionals (!machineConfig.server) [ - ./home/gammastep.nix - ./home/doom - ./home/hypr - ./home/waybar.nix - ./non-server.nix - ]; + imports = [ + ./home/zsh.nix + ./home/git.nix + ] + ++ lib.optionals (!machineConfig.server) [ + ./home/gammastep.nix + ./home/doom + ./home/hypr + ./home/waybar.nix + ./non-server.nix + ]; home = { # # Adds the 'hello' command to your environment. It prints a friendly