diff --git a/.sops.yaml b/.sops.yaml index 7744871..fbba553 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -2,6 +2,7 @@ keys: - &admin_torjus age1lznyk4ee7e7x8n92cq2n87kz9920473ks5u9jlhd3dczfzq4wamqept56u - &server_gunter age1whxf34vjdndqzwgm7yyaexdm46gdnv9sf3nal7qqyjr0nyhhndlsrmc0g3 - &server_magicman age1stlqqspmt5fepyz35udrwr5avf9zuju79f787p26pu2d2j08yqps2q2t2c + - &server_prismo age1lznyk4ee7e7x8n92cq2n87kz9920473ks5u9jlhd3dczfzq4wamqept56u creation_rules: - path_regex: secrets/[^/]+\.(yaml|json|env|ini|toml) key_groups: @@ -17,6 +18,11 @@ creation_rules: - age: - *admin_torjus - *server_magicman + - path_regex: secrets/prismo/[^/]+\.(yaml|json|env|ini|toml) + key_groups: + - age: + - *admin_torjus + - *server_prismo - path_regex: secrets/torjus/[^/]+\.(yaml|json|env|ini|toml) key_groups: - age: diff --git a/flake.nix b/flake.nix index 18aa9ac..c590932 100644 --- a/flake.nix +++ b/flake.nix @@ -81,7 +81,16 @@ specialArgs = { inherit inputs self user; }; - modules = [ ./hosts/prismo ]; + modules = [ + ( + { config, pkgs, ... }: + { + nixpkgs.overlays = commonOverlays; + } + ) + ./hosts/prismo + sops-nix.nixosModules.sops + ]; }; magicman = nixpkgs.lib.nixosSystem { inherit system; diff --git a/home/hyprland/hyprland_prismo.nix b/home/hyprland/hyprland_prismo.nix index c700884..1c4d56d 100644 --- a/home/hyprland/hyprland_prismo.nix +++ b/home/hyprland/hyprland_prismo.nix @@ -27,7 +27,7 @@ wayland.windowManager.hyprland = { enable = true; - package = pkgs.unstable.hyprland; + package = pkgs.hyprland; settings = { "$mainMod" = "SUPER"; "$shiftMainMod" = "SUPER_SHIFT"; diff --git a/home/prismo.nix b/home/prismo.nix index 35a9ccf..b427efa 100644 --- a/home/prismo.nix +++ b/home/prismo.nix @@ -29,7 +29,7 @@ ./scripts ./zsh ./packages - ./hyprland + ./hyprland/hyprland_prismo.nix ./ssh ./services/backup-home.nix ./services/ghettoptt.nix diff --git a/hosts/prismo/configuration.nix b/hosts/prismo/configuration.nix index 3a3f2fc..51ff5e7 100644 --- a/hosts/prismo/configuration.nix +++ b/hosts/prismo/configuration.nix @@ -9,7 +9,7 @@ imports = [ ./hardware-configuration.nix ]; # Sops stuff - sops.defaultSopsFile = ../../secrets/gunter/secrets.yaml; + sops.defaultSopsFile = ../../secrets/prismo/secrets.yaml; sops.age.keyFile = "/var/lib/sops-nix/key.txt"; sops.age.generateKey = true; sops.secrets."gotify_tokens/backup-home" = { }; @@ -40,7 +40,7 @@ time.timeZone = "Europe/Oslo"; # Enable opengl - hardware.opengl = { + hardware.graphics = { enable = true; extraPackages = with pkgs; [ intel-media-driver diff --git a/hosts/prismo/default.nix b/hosts/prismo/default.nix index 81a4363..a709319 100644 --- a/hosts/prismo/default.nix +++ b/hosts/prismo/default.nix @@ -9,6 +9,6 @@ ./configuration.nix ./hardware-configuration.nix ../../system - ../../home + ../../home/prismo.nix ]; } diff --git a/secrets/prismo/secrets.yaml b/secrets/prismo/secrets.yaml new file mode 100644 index 0000000..502375c --- /dev/null +++ b/secrets/prismo/secrets.yaml @@ -0,0 +1,21 @@ +test: ENC[AES256_GCM,data:MtSN,iv:ag/LDkk0DgE6QPjB/08RhEw3LzQHDOkRH0/4OBn8KUU=,tag:FeiJfjtbd4MCwNmCezH44A==,type:str] +sops: + kms: [] + gcp_kms: [] + azure_kv: [] + hc_vault: [] + age: + - recipient: age1lznyk4ee7e7x8n92cq2n87kz9920473ks5u9jlhd3dczfzq4wamqept56u + enc: | + -----BEGIN AGE ENCRYPTED FILE----- + YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBhaGtaL0tkVFFuTk9ka0Rz + bHRpN0UyZFQxTG1ZSTRxSmI4eHJhbVM1ZWs0Cmx5UkdrSFNsRGU1eWRyU0hEcElH + WWJLWHdNTVR4RVpGYlcwMlJ4b2J5eHcKLS0tIGkrTWpNdVdERHpvaHZRdGxHN1Mr + WDJGWFA1M2kxQ1hHKzRwRTY4WUZwN2MKQIT//FEdXYWfEkI1knDD3uN+KMaIDtmR + H64031YMvAh67fVGekRv72S5DWzrft/Zr2libKpsN7T4G9fxGihhEw== + -----END AGE ENCRYPTED FILE----- + lastmodified: "2024-10-02T20:56:45Z" + mac: ENC[AES256_GCM,data:WQKHFMPmEvDTHS4eYYVcpsX7j8Xef9SV0VKNAbQh0hnZPMJEll4jtzR8sub2tUEt9/I1PvngXMWz6pPmINwOKRI+L3+gTSdg9QgPiikjE6wDA2qbpv9pd14uH22ABmCjkTeEZ9R+b9KbBl0GtMQof1sdTL9nUDrr9Fyfrr/UXs4=,iv:4DgDhwb2ksh2THtR/H5PiO57vF4yKSZ6FyCjWBqCQQI=,tag:dczk4ZAI8k6dareobGmt/w==,type:str] + pgp: [] + unencrypted_suffix: _unencrypted + version: 3.9.0