retire devterm for now

2023-05-31 16:09:41 +01:00 · 2023-05-31 16:09:41 +01:00 · 11b015c7ec
commit 11b015c7ec
parent cb17429fb5
5 changed files with 2 additions and 106 deletions
--- a/.sops.yaml
+++ b/.sops.yaml
@ -5,7 +5,6 @@ keys:
  - &thinkrac age15c2dquc22epmmndpmd8pa3077fdl8nyr5qehr7y0c9uvavrledsq326ak9
  - &nas age1c7y687sxh428wk34s8ws6kemu62mggafpt40rmanevgkuj5xa59q6f7tlc
  - &instance-20221213-1915 age1elra3uklw8rmwkevqms2l4tsd06d5utqda9d2w4qvqpz898uzuesugxkhc
-  - &devterm age1z5ryq3pehydapv0s90ljak3yct3qwwtt43wjp9kv48q2235s252s6fq4kc
 creation_rules:
  - path_regex: secrets/shared\.yaml$
    key_groups:
@ -15,7 +14,6 @@ creation_rules:
          - *thinkrac
          - *nas
          - *instance-20221213-1915
-          - *devterm
        pgp:
          - *lotte
  - path_regex: secrets/nixos-8gb-fsn1-1\.yaml$
@ -51,7 +49,6 @@ creation_rules:
      - age:
          - *nutty-noon
          - *thinkrac
-          - *devterm
        pgp:
          - *lotte
  - path_regex: secrets/instance-20221213-1915\.yaml$
@ -60,9 +57,3 @@ creation_rules:
          - *instance-20221213-1915
        pgp:
          - *lotte
-  - path_regex: secrets/devterm\.yaml$
-    key_groups:
-      - age:
-          - *devterm
-        pgp:
-          - *lotte
--- a/.woodpecker/pr.yaml
+++ b/.woodpecker/pr.yaml
@ -23,14 +23,14 @@ pipeline:
        EOF
      - nix-env -i python3
      - |
-          for job in nixos-8gb-fsn1-1.x86_64-linux nutty-noon.x86_64-linux thinkrac.x86_64-linux nas.x86_64-linux instance-20221213-1915.aarch64-linux devterm.aarch64-linux; do
+          for job in nixos-8gb-fsn1-1.x86_64-linux nutty-noon.x86_64-linux thinkrac.x86_64-linux nas.x86_64-linux instance-20221213-1915.aarch64-linux; do
            nix show-derivation -r "github:DarkKirb/nixos-config/main#hydraJobs.$job" > old-$job.json
          done

          echo "Difference between this PR and main:" > review
          echo "" >> review

-          for job in nixos-8gb-fsn1-1.x86_64-linux nutty-noon.x86_64-linux thinkrac.x86_64-linux nas.x86_64-linux instance-20221213-1915.aarch64-linux devterm.aarch64-linux; do
+          for job in nixos-8gb-fsn1-1.x86_64-linux nutty-noon.x86_64-linux thinkrac.x86_64-linux nas.x86_64-linux instance-20221213-1915.aarch64-linux; do
            nix show-derivation -r ".#hydraJobs.$job" > new-$job.json

            echo "## Changes for $job:" >> review
--- a/config/devterm.nix
+++ b/config/devterm.nix
@ -1,48 +0,0 @@
-{
-  config,
-  pkgs,
-  modulesPath,
-  lib,
-  nixos-hardware,
-  system,
-  ...
-}: {
-  networking.hostName = "devterm";
-  networking.hostId = "b83a2c93";
-
-  imports = [
-    ./desktop.nix
-    nixos-hardware.nixosModules.raspberry-pi-4
-  ];
-
-  hardware.raspberry-pi."4" = {
-    #audio.enable = true;
-    dwc2.enable = true;
-    #i2c0.enable = true;
-    #i2c1.enable = true;
-    #fkms-3d.enable = true;
-    apply-overlays-dtmerge.enable = true;
-    pwm0.enable = true;
-    #tc358743.enable = true;
-  };
-
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-label/NIXOS_SD";
-      fsType = "ext4";
-      options = ["noatime"];
-    };
-  };
-  boot.supportedFilesystems = lib.mkForce ["ext4" "vfat"];
-  system.stateVersion = "22.11";
-  nix.settings.cores = 4;
-  networking.networkmanager.enable = true;
-  users.users.darkkirb.extraGroups = ["networkmanager"];
-  nix.settings.max-jobs = 4;
-  nix.daemonCPUSchedPolicy = "idle";
-  nix.daemonIOSchedClass = "idle";
-  services.joycond.enable = true;
-  hardware.bluetooth.enable = true;
-  services.blueman.enable = true;
-  services.tailscale.useRoutingFeatures = "client";
-}
--- a/flake.nix
+++ b/flake.nix
@ -136,10 +136,6 @@ rec {
        name = "instance-20221213-1915"; # Oracle server
        system = "aarch64-linux";
      }
-      {
-        name = "devterm"; # devterm
-        system = "aarch64-linux";
-      }
    ];
  in rec {
    nixosConfigurations = builtins.listToAttrs (map
--- a/secrets/devterm.yaml
+++ b/secrets/devterm.yaml
@ -1,43 +0,0 @@
-network:
-    wireguard:
-        privkey: ENC[AES256_GCM,data:cOCbrFajDznhQJTNkkmxRbf5y+AZRINFxFVcVJKHjoqlAJb8JoxOB7QQlRo=,iv:MI3ywbty59Wu+nEouZf3Jcgr9fUTs5jUe1Ti56AOWgY=,tag:01L3igLwoZsn7ZD97wEyeQ==,type:str]
-security:
-    restic:
-        password: ENC[AES256_GCM,data:1+Qi6hRmElj2ZgEqLfkV/n2FWBw=,iv:fnQYTFojbKmrtXFC2Vwgdx/cQwceak2l/RW1/+3gcX4=,tag:ITKq/SCMR+SAK0msfFh6GQ==,type:str]
-email:
-    lotte@chir.rs: ENC[AES256_GCM,data:BPhVTMiqv+J5GDYR5NAIYj/BIA==,iv:C2V4HqB68Us8PdxRB0WMl1VM2GHVse1U9SFf3IPNiwA=,tag:jq5SFq3Rg3dGFFfan6qxpA==,type:str]
-    mdelenk@hs-mittweida.de: ENC[AES256_GCM,data:wQR+YsnWmdOwNyXYGwAm8ZkGBax/ZLmWJvG78pb0cMYcZceVFBcH106td66whscIS3OmVeSPxUx9XbHlXtHXXg==,iv:4O7sa4Bp/ungGC6X41RAKt8ZHN8M9OTsedu/6jn2mS4=,tag:4BqLR6X6XNFcc6c0o5ZcJQ==,type:str]
-password:
-    root: ENC[AES256_GCM,data:tCdTl8m6r/znHHJdQxIU5+R09aW0j/PURsKHRhhgp5ntnyzigxgtJT71bOOu1UzOecL+ocfr9iI85QHNblh7zw23yIpqs5kI890l8FAsaKj7/XFFAmkiJAtIIwIiLUBfM6pamRIPYR0a1A==,iv:I82IXspWp6GsqxgNpPADeyDK1n26BT1Oymp8VFP3LbQ=,tag:EvUzn1DY+yK1R9qsZ0Rl9Q==,type:str]
-    darkkirb: ENC[AES256_GCM,data:r9HWfYbBp2LzQSFcNnv9p1kg0rdQoI7RCboOWO9/trOtB4W5R4hccpWphvZz58R9T7WuSUr0Nu7mKHAx3DjaLYvdGq+XjhGjZZrQo1iLdJ/rGGmNx987mV+cJqesKn4n69mfltqC80b/8g==,iv:iCYZSTDTm+1gyNhjBl0Z8NC57qSjmIJFP6GS+Uxv9fw=,tag:f3tD8wuiewwUfDXmMqhDiA==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1z5ryq3pehydapv0s90ljak3yct3qwwtt43wjp9kv48q2235s252s6fq4kc
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjdlVFdWlZY0lzSXc0NUEy
-            YWdWZDc3Ti8zZ2VJVVNKeFAvd0h3U1daK2t3Cm83bzJIWHJRdUk4bElnRVg5czIr
-            c0dFd2g3WUFKRkllemowcExCamZnVm8KLS0tIG5oYUg3Y2t5YkZUZG5hU1FCcjJt
-            NGNjSVhOWnExUjIrMWVEbEllMXNyam8K29sPci9LT7rQOdq2bwNXwPbgE9bk1SG3
-            Su+07MHegtQLOvY+zwG2aZVNtx6O4ImwM7l7AOyxqglcjNjIrSGMtw==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-03-27T19:51:12Z"
-    mac: ENC[AES256_GCM,data:9lxSLBxEy5TsNsf+BaO2cS9Z/et/IZoNx1Ry0S6EmcahQygZ5KDWl9WOv9Wq/UIaDliDo8Hpou9LcTxp8onL6ZPoG/xmR8qn6m6sFVib71m4o8o5okp5r0RQU+bI/mMb/4O/JKrMV4TaXp0HWeBk1DlxJd6KNSFocMkgf/t9I6s=,iv:yPTlvjYHU7b0fakZiQBgymfiND/L0zpcdS84ParaPx8=,tag:KdHwHGkh08N5czSQfia0LA==,type:str]
-    pgp:
-        - created_at: "2023-03-27T15:58:24Z"
-          enc: |
-            -----BEGIN PGP MESSAGE-----
-
-            hF4DAAAAAAAAAAASAQdAyzpAXrup095uERAbw+gmY7jdR3xmlBzvPUgXS/R4MzIw
-            S/NkuBPEb36hZRrZfneBvfuf1C1Lu0ezFTceWE8UygfuewHWrd2Emadr8gQEg8UD
-            0lwBItL40tr7u/o0bvd6F0r+proIRh76gzKNQ91ZIytZKVLTGebusAPuJ/eWSJ7u
-            yOkpKaCZbcc3o2g/7ZbJC0U9yxcSP2OKfEzG2V6lw/nZ2Ly+Ik6LOHGImhwqTQ==
-            =vIlD
-            -----END PGP MESSAGE-----
-          fp: 46C6A7E14BC7812E86C2700737FE303AAC2D06CD
-    unencrypted_suffix: _unencrypted
-    version: 3.7.3