flake.lock

@@ -825,11 +825,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754696412,
-        "narHash": "sha256-NphnpnnD5/hHiKRuSDeHnPSxaKf8SJjMaOL2xzXJqcs=",
+        "lastModified": 1752968690,
+        "narHash": "sha256-8795clbksJi4RTEf9OI4+1rZ9FQsqxrl6/e3xTWcLfM=",
         "owner": "xunuwu",
         "repo": "nvim-config",
-        "rev": "8c608d5359757b5b13a98a8fd41e7f65f4a0c080",
+        "rev": "bbcffc07bdbf52ba359fb6e1c1678104525fc330",
         "type": "github"
       },
       "original": {
@@ -846,11 +846,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1754428097,
-        "narHash": "sha256-e+2gFKE+yyj72B/5K3QX9lPJ6PP42r/0hNcHoXkWuso=",
+        "lastModified": 1749197856,
+        "narHash": "sha256-Vk9HO8RMe8fsDCzFQJlp4hAUDFMrduOMDmh6ZifiVHA=",
         "ref": "refs/heads/main",
-        "rev": "a5f69e7dddf807af6478e566a73992bd52f11e4d",
-        "revCount": 9,
+        "rev": "3943ddd64bf04e3631d39f110723f1aee27c3a82",
+        "revCount": 7,
         "type": "git",
         "url": "https://git.xunuwu.xyz/xun/xunuwu.xyz"
       },

hosts/hopper/profiles/lab/acme.nix

@@ -11,7 +11,7 @@ in {
     certs = {
       "${domain}" = {
         domain = "${domain}";
-        extraDomainNames = ["*.${domain}" "*.hopper.priv.${domain}" "*.s3-web.hopper.priv.${domain}"];
+        extraDomainNames = ["*.${domain}" "*.hopper.priv.${domain}"];
         dnsProvider = "cloudflare";
         reloadServices = ["caddy.service"];
         credentialFiles = {

hosts/hopper/profiles/lab/caddy.nix

@@ -49,8 +49,6 @@ in {
       vaultwarden = mkPublicEntry "vw" "${bridge}:${toString config.services.vaultwarden.config.ROCKET_PORT}";
       abs = mkPublicEntry "abs" "${bridge}:${toString config.services.audiobookshelf.port}";
       miniflux = mkPublicEntry "rss" "${bridge}:18632";
-      s3 = mkPublicEntry "s3" "unix//run/garage/s3.sock";
-      s3-2 = mkPublicEntry "*.s3" "unix//run/garage/s3.sock";
 
       navidrome2 = mkPrivateEntry "navidrome" "${bridge}:${toString config.services.navidrome.settings.Port}";
       slskd = mkPrivateEntry "slskd" "localhost:${toString config.services.slskd.settings.web.port}";
@@ -60,8 +58,6 @@ in {
       absPriv = mkPrivateEntry "abs" "${bridge}:${toString config.services.audiobookshelf.port}";
       glances = mkPrivateEntry "glances" "${bridge}:${toString config.services.glances.port}";
       alertmanager = mkPrivateEntry "alerts" "${bridge}:${toString config.services.prometheus.alertmanager.port}";
-      s3-web = mkPrivateEntry "s3-web" "unix//run/garage/web.sock";
-      s3-web2 = mkPrivateEntry "*.s3-web" "unix//run/garage/web.sock";
 
       other = {
         hostName = "*.${domain}:80";

hosts/hopper/profiles/lab/default.nix

@@ -6,7 +6,6 @@
     ./audiobookshelf.nix
     ./caddy.nix
     ./dnsmasq.nix
-    ./garage.nix
     ./glances.nix
     ./homepage.nix
     ./minecraft.nix

hosts/hopper/profiles/lab/garage.nix

@@ -1,32 +0,0 @@
-{
-  pkgs,
-  vars,
-  config,
-  ...
-}: {
-  services.garage = {
-    enable = true;
-    package = pkgs.garage_2_0_0;
-    settings = {
-      replication_factor = 1;
-
-      rpc_bind_addr = "[::]:8005";
-      rpc_secret = "4425f5c26c5e11581d3223904324dcb5b5d5dfb14e5e7f35e38c595424f5f1e6";
-
-      s3_api = {
-        api_bind_addr = "/run/garage/s3.sock";
-        s3_region = "garage";
-        root_domain = "s3.${vars.domain}";
-      };
-
-      s3_web = {
-        bind_addr = "/run/garage/web.sock";
-        root_domain = ".s3-web.hopper.priv.${vars.domain}";
-      };
-
-      admin.api_bind_addr = "127.0.0.1:3903";
-    };
-  };
-
-  systemd.services.garage.serviceConfig.RuntimeDirectory = "garage";
-}

hosts/hopper/profiles/lab/prometheus.nix

@@ -112,13 +112,6 @@
           targets = ["rackserv:9615"];
         };
       }
-
-      {
-        job_name = "garage";
-        static_configs = lib.singleton {
-          targets = ["localhost:3903"];
-        };
-      }
     ];
     exporters = {
       node = {

hosts/nixdesk/hardware.nix

@@ -12,8 +12,6 @@
     inputs.hardware.nixosModules.gigabyte-b550
   ];
 
-  hardware.i2c.enable = true;
-
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
     initrd = {

hosts/nixdesk/home.nix

@@ -144,7 +144,6 @@
 
     # system things
     kdePackages.dolphin
-    ddcui
 
     # music
     puddletag

hosts/rackserv/profiles/caddy.nix

@@ -16,7 +16,7 @@ in {
     certs = {
       "${domain}" = {
         domain = "${domain}";
-        extraDomainNames = ["*.${domain}" "*.s3.${domain}"];
+        extraDomainNames = ["*.${domain}"];
         dnsProvider = "cloudflare";
         reloadServices = ["caddy.service"];
         credentialFiles.CF_DNS_API_TOKEN_FILE = config.sops.secrets.cloudflare.path;
@@ -45,8 +45,6 @@ in {
           "vw.${domain}"
           "abs.${domain}"
           "rss.${domain}"
-          "s3.${domain}"
-          "*.s3.${domain}"
         ];
         useACMEHost = domain;
         logFormat = "output file ${config.services.caddy.logDir}/access-hopper.log";

pkgs/audio-abtest/default.nix

@@ -1,11 +0,0 @@
-{writeShellScriptBin}:
-writeShellScriptBin "audio-abtest" ''
-  track_1=$(shuf -i 0-1 -n 1)
-  track_2=$(( 1 - track_1 ))
-
-  ffmpeg -i "$1" -i "$2" -f lavfi -i color=c=black:s=100x100:r=3 \
-    -c:v libx264 -tune stillimage -b:v 100k \
-    -c:a copy \
-    -map $track_1:a:0 -map $track_2:a:0 -map 2:v:0 \
-    -shortest output.mkv
-''

pkgs/default.nix

@@ -4,6 +4,5 @@
     ida-pro = pkgs.callPackage ./ida-pro {};
     cartograph-cf = pkgs.callPackage ./cartograph-cf {};
     keyboard-state = pkgs.callPackage ./keyboard-state {};
-    audio-abtest = pkgs.callPackage ./audio-abtest {};
   };
 }

sys/profiles/programs/tools.nix

@@ -20,6 +20,5 @@
     yt-dlp
     inotify-tools
     dig
-    python3
   ];
 }