Remove attic (#20)

Justfile

@@ -25,4 +25,4 @@ repl:
     nix repl --extra-experimental-features repl-flake .#
 
 format:
-    treefmt
+    nix fmt

flake.nix

@@ -6,14 +6,12 @@
       "https://nix-community.cachix.org"
       "https://e10.cachix.org"
       "https://numtide.cachix.org"
-      "https://attic.e10.camp/e10"
     ];
 
     extra-trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       "e10.cachix.org-1:/++Tmo/ghEqnLwsQJdXn04c262agRCK5PaPYz8NcVfo="
       "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
-      "attic.e10.camp-e10:GRxL2EezM+0vZXpa9fePFqTM1qstxiV56tc5K3eDugk="
     ];
   };
 
@@ -40,9 +38,6 @@
     colmena.url = "github:zhaofengli/colmena";
     colmena.inputs.nixpkgs.follows = "nixpkgs";
 
-    attic.url = "github:zhaofengli/attic";
-    attic.inputs.nixpkgs.follows = "nixpkgs";
-
     devenv.url = "github:cachix/devenv";
     devenv.inputs.nixpkgs.follows = "nixpkgs";
 

hosts/gateway/configuration.nix

@@ -38,19 +38,6 @@
       port = hosts.gateway.config.services.headscale.port;
     };
 
-    "attic.e10.camp" = mkVirtualHost {
-      host = hosts.omnibus;
-      port = 8080;
-      extraConfig = ''
-        client_header_buffer_size 64k;
-      '';
-      extraSettings = {
-        http3 = false;
-        http2 = false;
-        kTLS = true;
-      };
-    };
-
     "blocky.e10.camp" = mkVirtualHost {
       host = hosts.controller;
       port = hosts.controller.config.services.blocky.settings.ports.http;

hosts/omnibus/configuration.nix

@@ -1,4 +1,4 @@
-{ config, suites, profiles, ... }: {
+{ config, pkgs, suites, profiles, ... }: {
   imports = with suites;
     core ++ homelab ++ proxmox-vm ++ [
       profiles.telemetry.smartd
@@ -10,8 +10,6 @@
       profiles.users.ethan
       profiles.users.proxmox
       profiles.databases.postgresql.default
-      profiles.databases.postgresql.atticd
-      profiles.services.atticd.default
       profiles.power.client.tripp-lite
     ] ++ [ ./hardware-configuration.nix ./disk-config.nix ];
 
@@ -64,5 +62,11 @@
     paths = [ "/data/files" ];
   };
 
+  programs.fish.shellAliases.iotop = ''
+    bash -c "sudo sysctl kernel.task_delayacct=1 && sudo ${
+      pkgs.lib.getExe pkgs.iotop
+    } ; sudo sysctl kernel.task_delayacct=0"
+  '';
+
   system.stateVersion = "23.11";
 }

modules/development/shell.nix

@@ -1,7 +1,7 @@
 { inputs, ... }: {
   imports = [ inputs.devenv.flakeModule ];
 
-  perSystem = { inputs', pkgs, ... }: {
+  perSystem = { pkgs, ... }: {
     devenv.shells.default = _:
       {
         # TODO: Move this to be within the `keys/` directory?
@@ -13,20 +13,13 @@
             export ${key}=$(${sops} -d --extract '["${key}"]' ./secrets.json)
           '';
         in ''
-          export SOPS_AGE_KEY_FILE="/Users/$USER/.config/sops/age/keys.txt"
+          export SOPS_AGE_KEY_FILE="$HOME/.config/sops/age/keys.txt"
 
           ${setSopsValueToEnvironmentVariable "AWS_ACCESS_KEY_ID"}
           ${setSopsValueToEnvironmentVariable "AWS_SECRET_ACCESS_KEY"}
         '';
 
-        packages = with pkgs; [
-          cachix
-          deadnix
-          just
-          statix
-          sops
-          inputs'.attic.packages.attic
-        ];
+        packages = with pkgs; [ cachix deadnix just statix sops ];
       } // {
         containers = pkgs.lib.mkForce { };
       };

modules/profiles/core/caching.nix

@@ -1,20 +1,12 @@
-{ inputs, pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    inputs.attic.packages.x86_64-linux.attic
-    cachix
-  ];
+{ pkgs, ... }: {
+  environment.systemPackages = with pkgs; [ cachix ];
 
   nix.settings = {
-    substituters = [
-      "https://e10.cachix.org"
-      "https://numtide.cachix.org"
-      "https://attic.e10.camp"
-    ];
+    substituters = [ "https://e10.cachix.org" "https://numtide.cachix.org" ];
 
     trusted-public-keys = [
       "e10.cachix.org-1:/++Tmo/ghEqnLwsQJdXn04c262agRCK5PaPYz8NcVfo="
       "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
-      "attic.e10.camp-e10:GRxL2EezM+0vZXpa9fePFqTM1qstxiV56tc5K3eDugk="
     ];
   };
 }

modules/profiles/networking/blocky.nix

@@ -85,11 +85,11 @@
           }";
       };
       ede.enable = true;
-      queryLog = {
-        type = "postgresql";
-        target = "postgres://blocky?host=/run/postgresql";
-        logRetentionDays = 90;
-      };
+      # queryLog = {
+      #   type = "postgresql";
+      #   target = "postgres://blocky?host=/run/postgresql";
+      #   logRetentionDays = 90;
+      # };
     };
   };