From 743830f7c655386c023d6de071dc1a4d545ed865 Mon Sep 17 00:00:00 2001 From: derped Date: Sat, 7 Dec 2024 21:07:53 +0100 Subject: [PATCH] Remove old Marid --- .sops.yaml | 7 -- machines/Marid/certs/proxy | 11 --- machines/Marid/configuration.nix | 9 --- machines/Marid/hardware-configuration.nix | 92 ----------------------- machines/Marid/options.nix | 56 -------------- machines/Marid/secrets.yaml | 35 --------- machines/Marid/sops.nix | 14 ---- 7 files changed, 224 deletions(-) delete mode 100644 machines/Marid/certs/proxy delete mode 100644 machines/Marid/configuration.nix delete mode 100644 machines/Marid/hardware-configuration.nix delete mode 100644 machines/Marid/options.nix delete mode 100644 machines/Marid/secrets.yaml delete mode 100644 machines/Marid/sops.nix diff --git a/.sops.yaml b/.sops.yaml index b4dd603..d736a19 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,7 +1,6 @@ keys: - &admins 1F2EA6D9A57A9BE5A7F3AA035BEBEE4EE57DC7E2 - &lilim age1w3uhx6han0frfvg2t3t3wnwnzpkplzeyhun0dmqpkqwscmzlz4ms3elug4 - - &marid age10vw4q40dq0tk9xzexeyn7cl6qka0hz7mfkmhv9g322k0u4dacd5sq8gg67 - &ophanim age1u386j7v4yrxm6psykfk4wyy5ay2ugcfcemve2msfwv0klnf3x34stz34du - &sheol age12uvysactuucun05nk8l3azpaclz9k04ygcurtlqqjg6dsvarvcqs0s9d2y creation_rules: @@ -11,12 +10,6 @@ creation_rules: - *admins age: - *lilim - - path_regex: machines/Marid/[^/]+.yaml$ - key_groups: - - pgp: - - *admins - age: - - *marid - path_regex: machines/Ophanim/[^/]+.yaml$ key_groups: - pgp: diff --git a/machines/Marid/certs/proxy b/machines/Marid/certs/proxy deleted file mode 100644 index 84ae9bb..0000000 --- a/machines/Marid/certs/proxy +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBpTCCAUqgAwIBAgIRAIflL1WWaHxgiJbOCWYfGi8wCgYIKoZIzj0EAwIwMDEu -MCwGA1UEAxMlQ2FkZHkgTG9jYWwgQXV0aG9yaXR5IC0gMjAyMiBFQ0MgUm9vdDAe -Fw0yMjEyMjMwOTE5MzZaFw0zMjEwMzEwOTE5MzZaMDAxLjAsBgNVBAMTJUNhZGR5 -IExvY2FsIEF1dGhvcml0eSAtIDIwMjIgRUNDIFJvb3QwWTATBgcqhkjOPQIBBggq -hkjOPQMBBwNCAAR+7NPc1wU+ABpAhYeuyRzEeV1v01hWrMjdPvy6G4dD/Oon2A2Q -Usi6QL/c5tuEfbqbWcZDkwLJcMxJaRQtqN3do0UwQzAOBgNVHQ8BAf8EBAMCAQYw -EgYDVR0TAQH/BAgwBgEB/wIBATAdBgNVHQ4EFgQUQZIPAhP0jaREFGTlSfy+uWfs -gjUwCgYIKoZIzj0EAwIDSQAwRgIhAN5Qh5IzCxIL04ms8lmcOzjcSmB38VV5Bcrs -mnskmEZvAiEAiEORBtKwR6WaxRDzWdYgZDLVg2Q3QH3Yu4m8denQMV4= ------END CERTIFICATE----- \ No newline at end of file diff --git a/machines/Marid/configuration.nix b/machines/Marid/configuration.nix deleted file mode 100644 index 9ac7145..0000000 --- a/machines/Marid/configuration.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: -{ - services.cron.enable = false; - security.pki.certificateFiles = [ - ./certs/proxy - ]; - networking.dhcpcd.extraConfig = "noarp"; - system.stateVersion = "21.05"; -} diff --git a/machines/Marid/hardware-configuration.nix b/machines/Marid/hardware-configuration.nix deleted file mode 100644 index fd2f810..0000000 --- a/machines/Marid/hardware-configuration.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - config, - pkgs, - modulesPath, - ... -}: -let - cfg = config.machine; -in -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot = { - loader.systemd-boot = { - enable = true; - }; - loader.efi.canTouchEfiVariables = true; - tmp = { - useTmpfs = true; - cleanOnBoot = true; - }; - - kernelPackages = pkgs.linuxPackages_latest; - initrd.availableKernelModules = [ - "nvme" - "xhci_pci" - "usb_storage" - "sd_mod" - "rtsx_pci_sdmmc" - ]; - kernelModules = [ "kvm-amd" ]; - kernelParams = [ - # get backlight service to work part one (fixes systemd backlight service) - "acpi_backlight=native" - ]; - kernel.sysctl = { - "kernel.nmi_watchdog" = 0; - "fs.inotify.max_user_watches" = 524288; - "vm.dirty_writeback_centisecs" = 1500; - }; - }; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/cf8db7d5-5da7-4fb9-818d-ed5dd2815f0d"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/96E4-9DF3"; - fsType = "vfat"; - }; - - hardware = { - firmware = with pkgs; [ firmwareLinuxNonfree ]; - enableAllFirmware = true; - ksm.enable = true; - opengl = { - driSupport = true; - driSupport32Bit = true; - }; - - pulseaudio = { - enable = true; - support32Bit = true; - package = pkgs.pulseaudioFull; - zeroconf.discovery.enable = false; - extraClientConf = '' - autospawn = no - ''; - }; - - bluetooth = { - enable = true; - powerOnBoot = true; - }; - }; - - powerManagement = { - enable = true; - cpuFreqGovernor = "powersave"; - }; - services = { - upower.enable = true; - # Fix Backlight Part 2 (allows acpilight to modify brightness) - udev.extraRules = '' - ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chgrp video /sys/class/backlight/%k/brightness" - ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chmod 664 /sys/class/backlight/%k/brightness" - ''; - }; - - time.timeZone = "Europe/Berlin"; -} diff --git a/machines/Marid/options.nix b/machines/Marid/options.nix deleted file mode 100644 index f6da60b..0000000 --- a/machines/Marid/options.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ - pkgs, - lib, - ... -}: -with lib; -{ - imports = [ - ../../options/copySysConf.nix - ]; - config.machine = { - allowUnfree = true; - hostName = "Marid"; - administrators = [ - { - name = "derped"; - id = 1337; - } - ]; - conffiles = [ - "etcfiles" - "etcvars" - "fonts" - "zsh" - ]; - pkgs = [ - "base" - "dict" - "nodejs" - "extra" - "mail_utils" - "python3" - "xpkgs" - ]; - services = [ - "docker" - "desktop" - "desktop::i3" - "udev" - "fprintd" - ]; - firewall = { - enable = true; - allowPing = true; - allowedUDPPorts = [ ]; - allowedTCPPorts = [ ]; - allowedUDPPortRanges = [ ]; - allowedTCPPortRanges = [ ]; - }; - }; - - config.system.copySysConf = { - enable = false; - addToNixPath = false; - }; -} diff --git a/machines/Marid/secrets.yaml b/machines/Marid/secrets.yaml deleted file mode 100644 index b0ea653..0000000 --- a/machines/Marid/secrets.yaml +++ /dev/null @@ -1,35 +0,0 @@ -users: - derped: - password: ENC[AES256_GCM,data:bSkIZ3CrpnYPzmOZSp/J6y2IUXOe2kszqRYH1ffv7UQgE0sbbbRD/Re5b/p2RfJMhF7vRGH7QfSX6rcTMktyf4cnq14L655OHrah4/+J9YgRRYtGKNeVxr6DJAFPcoW3nc99,iv:NI9lm0SeNN0keDxeLoa+tU6LCfDkICJNCMm90+kKd5c=,tag:edoH4DVqjnu4233DXk5GIg==,type:str] -sops: - kms: [] - gcp_kms: [] - azure_kv: [] - hc_vault: [] - age: - - recipient: age10vw4q40dq0tk9xzexeyn7cl6qka0hz7mfkmhv9g322k0u4dacd5sq8gg67 - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3Rnd5UndnWlVUd3RQdEs1 - S2c3OTFMbmwwdE1WWE5wSEhVQ1NIenJDMG5vCm0xMk1jTGJqTzVtVGwrMVBKNlF5 - bGxHaURhSzRkdndZalRpT2VLOXhDbEkKLS0tIEd0T1AyR3RsT3NCaGhiZ3BtQUFi - MHl3cFVaa0pnbTR3NGhuTXp0dk5ob2cKh2aFZqv1C/m3rZvEKSl9sCYJ8lC/mofq - oaigG2BXkgVkcT9xhZufWkMDhS+mOZW7oL0m2DDM3M8cnSMx55ONFg== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-06-20T07:56:36Z" - mac: ENC[AES256_GCM,data:tBRPhDw4GUhtWT33zx1YwdHq0lT5DrMC5QYCat6CsD6jgbrRMZ3ZMH3JDr2/ZtqicyxR0lx789aNrZTL4aGbf+2XRgJzrH7gTPCWOTavbs/Yovv02JQV1nX+LCH0/wxYuS+50Z9p8rnIoSFaCb+bNU1c51EaNRPnHWmTwQpprL4=,iv:AGC34KpJ4YBUvVCrO/+8fkDRts2BnPWdLvWQIMs64i0=,tag:v2mqqBkX6P0L4zcLCvGWBg==,type:str] - pgp: - - created_at: "2023-06-17T16:07:20Z" - enc: | - -----BEGIN PGP MESSAGE----- - - hF4DVbZwA9DOvl8SAQdAcdYIYiBbPSGSTJBzT5ZTV+4fJr8AdZcE5IpSEno7pVIw - k6f2fPf2VuXdfnHOFtSMvPfDCsWIqO9JLuue5Bgjd6yxyq7Ss7QqZpFFWjlW6V1A - 1GgBCQIQI8f3q64+P9CSec9gjmIhAv/ohOsMfBI3CozxHJhQO4B+N4CyZsCYvHrF - 6qUXpvXEMm6xkTvmXnMc6EEKEuIRMTm+pHEf8Uoz9NCGsWSBbNRFtL6fUZVKLQ09 - lglDc2ZHhC6XJg== - =uWvi - -----END PGP MESSAGE----- - fp: 1F2EA6D9A57A9BE5A7F3AA035BEBEE4EE57DC7E2 - unencrypted_suffix: _unencrypted - version: 3.7.3 diff --git a/machines/Marid/sops.nix b/machines/Marid/sops.nix deleted file mode 100644 index b6183b9..0000000 --- a/machines/Marid/sops.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - config, - lib, - ... -}: -{ - sops = { - defaultSopsFile = ./secrets.yaml; - age = { - keyFile = "/var/lib/sops-nix/key.txt"; - generateKey = true; - }; - }; -}