treewide: completely remove attic

soopyc · Jul 3, 2024 · 476ada7 · 476ada7
1 parent 4a6bc20
commit 476ada7
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 84 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -63,13 +63,5 @@ jobs:
             netrc-file = /etc/nix/netrc
             experimental-features = nix-command flakes
 
-      # - name: Setup attic cache
-      #   uses: ryanccn/[email protected]
-      #   with:
-      #     endpoint: https://nonbunary.soopy.moe
-      #     cache: gensokyo-systems
-      #     token: ${{ secrets.ATTIC_TOKEN }}
-      #     skip-push: ${{ github.event_name == 'pull_request' }}
-
       - name: Build configuration
         run: nix run github:Mic92/nix-fast-build -- --no-nom --skip-cached --flake .#nixosConfigurations."${{ matrix.host }}".config.system.build.toplevel
diff --git a/docs/src/internal/ext-files.md b/docs/src/internal/ext-files.md
@@ -4,7 +4,6 @@ due to the required secure nature of these files, we are unable to include
 thses sets of files/directories in this repository.
 
 <!-- These are coincidentally the same length. magic! -->
-- `-rw------- /etc/atticd.env`: attic credentials file
 - `-r-------- /etc/lego/desec`: acme credentials
 - `drwx------ /etc/secureboot`: secureboot keys
 - `-r-------- /v/l/forgejo/data/jwt/oauth.pem`: forgejo oauth jwt private key

diff --git a/flake.nix b/flake.nix
@@ -4,14 +4,10 @@
   nixConfig = {
     extra-substituters = [
       "https://cache.soopy.moe"
-      "https://nonbunary.soopy.moe/gensokyo-global"
-      "https://nonbunary.soopy.moe/gensokyo-systems"
     ];
 
     extra-trusted-public-keys = [
       "cache.soopy.moe-1:0RZVsQeR+GOh0VQI9rvnHz55nVXkFardDqfm4+afjPo="
-      "gensokyo-global:XiCN0D2XeSxF4urFYTprR+1Nr/5hWyydcETwZtPG6Ec="
-      "gensokyo-systems:r/Wx649dPuQrCN9Pgh3Jic526zQNk3oWMqYJHnob/Ok="
     ];
     allow-import-from-derivation = true;
     fallback = true;
@@ -42,12 +38,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    attic = {
-      url = "github:zhaofengli/attic";
-      # added back because it's gentoo either way
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";

diff --git a/global/programs/misc.nix b/global/programs/misc.nix
@@ -40,9 +40,6 @@
     nvd
     just
     inotify-tools
-
-    # attic
-    inputs.attic.packages.${pkgs.system}.attic-client
   ];
 
   programs.mtr.enable = true;

diff --git a/global/programs/nix/config.nix b/global/programs/nix/config.nix
@@ -26,18 +26,15 @@ lib.mkMerge [
 
       substituters = [
         "https://cache.soopy.moe"
-        "https://nonbunary.soopy.moe/gensokyo-global/"
       ];
 
       trusted-substituters = [
         "https://cache.soopy.moe"
-        "https://nonbunary.soopy.moe/gensokyo-global/"
         "https://nixpkgs.reverse.proxy.internal.soopy.moe/"
       ];
 
       trusted-public-keys = [
         "cache.soopy.moe-1:0RZVsQeR+GOh0VQI9rvnHz55nVXkFardDqfm4+afjPo="
-        "gensokyo-global:XiCN0D2XeSxF4urFYTprR+1Nr/5hWyydcETwZtPG6Ec="
       ];
 
       fallback = true;

diff --git a/systems/koumakan/configuration.nix b/systems/koumakan/configuration.nix
@@ -1,6 +1,5 @@
 {inputs, ...}: {
   imports = [
-    inputs.attic.nixosModules.atticd
     inputs.mystia.nixosModules.fixups
     inputs.mystia.nixosModules.vmauth
 

diff --git a/systems/koumakan/services/attic.nix b/systems/koumakan/services/attic.nix
diff --git a/systems/koumakan/services/default.nix b/systems/koumakan/services/default.nix
@@ -6,7 +6,6 @@
     ./scm
 
     # Gensokyo local stuff
-    ./attic.nix
     ./ftp.nix
 
     # fediverse

diff --git a/systems/koumakan/services/static-sites/default.nix b/systems/koumakan/services/static-sites/default.nix
@@ -3,6 +3,7 @@
     ./keine.nix
     ./photography.nix
     ./assets.nix
+    ./nonbunary.nix
   ];
 
   # Fallback site

diff --git a/systems/koumakan/services/static-sites/nonbunary.nix b/systems/koumakan/services/static-sites/nonbunary.nix
@@ -0,0 +1,20 @@
+{_utils, ...}: {
+  services.nginx.virtualHosts."nonbunary.soopy.moe" = _utils.mkVhost {
+    locations."/".return = "404";
+    locations."= /" = _utils.mkNginxFile {
+      content = ''
+        <!doctype html>
+        <html lang="en">
+          <body>
+            <svg xmlns="http://www.w3.org/2000/svg" width="300" height="200">
+            <path fill="#2D2D2D" d="m0,0h300v200H0"/>
+            <path fill="#9B59D0" d="m0,0h300v150H0"/>
+            <path fill="#FFFFFF" d="m0,0h300v100H0"/>
+            <path fill="#FFF433" d="m0,0h300v50H0"/>
+            </svg>
+          </body>
+        </html>
+      '';
+    };
+  };
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,9 +40,6 @@ @@
         nvd
         just
         inotify-tools
-        # attic
-        inputs.attic.packages.${pkgs.system}.attic-client
       ];
       programs.mtr.enable = true;
@@ Expand Down @@