diff --git a/.sops.yaml b/.sops.yaml index ca78916..071f3c5 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,7 +1,6 @@ keys: - &sakura age1yzapmznelujajfyrpw5mxmy86ckg377494w5ap4yej39jatewursfxls9w - &violet age1zegau3chyn53tqvkwud6tuyggpkazc88pdkqv8cknavaudu49enqm2f0h3 - - &dandelion age1dpzajxcx7dcumda55qc3hncxqd43a7k85t2cdwtcvy5qsgp6k5tsugxqmd creation_rules: - path_regex: secrets/secrets.yaml key_groups: @@ -12,8 +11,3 @@ creation_rules: - age: - *sakura - *violet - - path_regex: secrets/dandelion/secrets.yaml - key_groups: - - age: - - *sakura - - *dandelion diff --git a/hosts/hazel/disko.nix b/hosts/hazel/disko.nix index 957609b..d308f8b 100644 --- a/hosts/hazel/disko.nix +++ b/hosts/hazel/disko.nix @@ -5,11 +5,11 @@ ]; disko.devices = { disk = { - sda = { + my-disk = { device = "/dev/sda"; type = "disk"; content = { - type = "mbr"; + type = "gpt"; partitions = { ESP = { type = "EF00"; diff --git a/modules/core/network.nix b/modules/core/network.nix index 9cb9355..dd950fc 100644 --- a/modules/core/network.nix +++ b/modules/core/network.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: { networking = { networkmanager = { @@ -11,6 +11,6 @@ }; }; services = { - avahi.enable = lib.mkDefault false; + avahi.enable = false; }; } diff --git a/modules/core/sops.nix b/modules/core/sops.nix index 1ec50d1..1e4847a 100644 --- a/modules/core/sops.nix +++ b/modules/core/sops.nix @@ -26,10 +26,6 @@ { "systemMailerPassword" = { }; } - else if (host == "dandelion") then - { - "systemMailerPassword" = { }; - } else { }; }; diff --git a/modules/home/packages.nix b/modules/home/packages.nix index d1ec514..ec02ef3 100644 --- a/modules/home/packages.nix +++ b/modules/home/packages.nix @@ -28,7 +28,6 @@ let lxqt.pavucontrol-qt mpv plasma5Packages.kdeconnect-kde - winbox # onthespot-overlay # Gaming diff --git a/modules/services/nfs.nix b/modules/services/nfs.nix index f49ee2e..5391100 100644 --- a/modules/services/nfs.nix +++ b/modules/services/nfs.nix @@ -26,7 +26,7 @@ # ^^ Needed to allow samba to automatically register mDNS records (without the need for an `extraServiceFile` #nssmdns4 = true; # ^^ Not one hundred percent sure if this is needed- if it aint broke, don't fix it - enable = lib.mkForce true; + enable = true; openFirewall = true; }; samba-wsdd = { diff --git a/secrets/dandelion/secrets.yaml b/secrets/dandelion/secrets.yaml deleted file mode 100644 index 110de11..0000000 --- a/secrets/dandelion/secrets.yaml +++ /dev/null @@ -1,25 +0,0 @@ -systemMailerPassword: ENC[AES256_GCM,data:b9Mmxo3beDpo1pi1Y+5TZn64ZeKJzJXlJwYFs5BjVMngeej+Y0naWmwBdlTEwzPm6OiO/N1haNQUlwT4KdOTx7t8PsZwQ5dOQl1gjWp0T+0ImWLImvINyvDIg6uh9RsvqLIJBvgLAtiUHE3jq7vLwDPaZ69tvjmGACNfNKX8A0A=,iv:BvmZ7GtDsHFWSY+cL10P1e7I75ZwrzjFJ6e5J2IbEic=,tag:g9yqAQtJ9kD3o1cfng0gTA==,type:str] -sops: - age: - - recipient: age1yzapmznelujajfyrpw5mxmy86ckg377494w5ap4yej39jatewursfxls9w - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBIcHFGUFltcUVSNnJXNWhI - TU5ySU1SQXVYdUFNOUlXdmZzYTZnZFhWQVJnCmV6T1duSnlGejNMc1hDUHovYTJE - Ri93OURqaEVrd0xCRUZZdWhsKzI1QkEKLS0tIExDeE9BNUxoYjhzWjBrM1FIUzV1 - cGpiNmJ6blQ2c1FiOEFnNllrbWxjWmsKDXsXc2tlmgXHmEveCVq1WMrFRtzLttgc - 0sMlwMFo71eV5JWrDjPbg0WwXonGI9TILJ09FFSTK7FRhwyFpgL6TA== - -----END AGE ENCRYPTED FILE----- - - recipient: age1dpzajxcx7dcumda55qc3hncxqd43a7k85t2cdwtcvy5qsgp6k5tsugxqmd - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxS250MmZyazRFVGMzdzVy - T09EaE1lY1h1d3BiMFRlNWV2SXNXNFBuekRnClRieVJrbGFMRjdCZEFVUjdoa2JQ - K1RzalZBVThOMWl3T2pZakxUTUI5cXcKLS0tIHBPeVdtUmtCUmtOTVVRZlNwUXpO - L1d2bW5tRDhjQ2VaU0xDWWlZYi94TEUKvjD1Pk8/Jq18nCJioeVBYbfaT3rSYr4l - aZ+j21bb7tE3JbUQfGkYo2blJqZsxFxblZlvf6tK2DU39Tl64naUpQ== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-08-01T08:17:35Z" - mac: ENC[AES256_GCM,data:WrMLYUSjwh0MOPPAjGTzLip5I+4LxrQoSreKANsl6xwakMmDKzENgp3kzsZyAqWaX6OgLWh1YrpnN+9z6n3UDi+LGYj1WZwHeZnBCwnuyq9cyAhLdPxcvqp0bcNaZfI04IUPpMTk/8o14gpTsbCYy+eIUc/19golYN2NKr2B03Y=,iv:Np1OeYCWdnun3QlQ8MAPd2TRMFwdx1l3Ca0JffqCv64=,tag:jTLzww9TKQnmkla2PhCR1Q==,type:str] - unencrypted_suffix: _unencrypted - version: 3.10.2