fix ports

flake.lock

@@ -76,11 +76,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1770437015,
+        "lastModified": 1767473845,
-        "narHash": "sha256-+FHN9EthS+kHxnMoSDZEiGLoxwiIuij6ltK3aTmlLMA=",
+        "narHash": "sha256-Pvd0l14qYA4jBS+JSCufoj8qFpeu2dt0Q9zBvpeLKac=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "65d59f814068d04e532cad2773d281e4951acd95",
+        "rev": "7f7d9e8b61abade02c6dc0d530ba6b43a50acead",
         "type": "gitlab"
       },
       "original": {
@@ -93,11 +93,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1764873433,
+        "lastModified": 1764724327,
-        "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
+        "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
+        "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1769996383,
+        "lastModified": 1765835352,
-        "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
         "type": "github"
       },
       "original": {
@@ -146,11 +146,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767609335,
+        "lastModified": 1763759067,
-        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
+        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
+        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
         "type": "github"
       },
       "original": {
@@ -220,11 +220,11 @@
       "flake": false,
       "locked": {
         "host": "gitlab.gnome.org",
-        "lastModified": 1767737596,
+        "lastModified": 1764524476,
-        "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
+        "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
+        "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
         "type": "gitlab"
       },
       "original": {
@@ -242,11 +242,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770491427,
+        "lastModified": 1767556355,
-        "narHash": "sha256-8b+0vixdqGnIIcgsPhjdX7EGPdzcVQqYxF+ujjex654=",
+        "narHash": "sha256-RDTUBDQBi9D4eD9iJQWtUDN/13MDLX+KmE+TwwNUp2s=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cbd8a72e5fe6af19d40e2741dc440d9227836860",
+        "rev": "f894bc4ffde179d178d8deb374fcf9855d1a82b7",
         "type": "github"
       },
       "original": {
@@ -283,11 +283,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768426687,
+        "lastModified": 1766066098,
-        "narHash": "sha256-CopNx3j//gZ2mE0ggEK9dZ474UcbDhpTw+KMor8mSxI=",
+        "narHash": "sha256-d3HmUbmfTDIt9mXEHszqyo2byqQMoyJtUJCZ9U1IqHQ=",
         "owner": "hyprwm",
         "repo": "contrib",
-        "rev": "541628cebe42792ddf5063c4abd6402c2f1bd68f",
+        "rev": "41dbcac8183bb1b3a4ade0d8276b2f2df6ae4690",
         "type": "github"
       },
       "original": {
@@ -337,11 +337,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770315571,
+        "lastModified": 1765267181,
-        "narHash": "sha256-hy0gcAgAcxrnSWKGuNO+Ob0x6jQ2xkR6hoaR0qJBHYs=",
+        "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "2684bb8080a6f2ca5f9d494de5ef875bc1c4ecdb",
+        "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
         "type": "github"
       },
       "original": {
@@ -402,11 +402,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769813415,
+        "lastModified": 1764234087,
-        "narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=",
+        "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "8946737ff703382fda7623b9fab071d037e897d5",
+        "rev": "032a1878682fafe829edfcf5fdfad635a2efe748",
         "type": "github"
       },
       "original": {
@@ -417,11 +417,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1769302137,
+        "lastModified": 1767185284,
-        "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
+        "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
+        "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe",
         "type": "github"
       },
       "original": {
@@ -440,11 +440,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769643685,
+        "lastModified": 1766370075,
-        "narHash": "sha256-F0Ey/SpMah0BRsz9hWNb89NMS4kvF9Q1Ex2EciWJzzM=",
+        "narHash": "sha256-gbhR8+gNrhmYxKaNJpTjFivuibr3ZdlB5eU0a8yE36I=",
         "owner": "NuschtOS",
         "repo": "nixos-modules",
-        "rev": "4a2307f709f3abab9935dc8c455212fdcbe13795",
+        "rev": "db6f2a33500dadb81020b6e5d4281b4820d1b862",
         "type": "github"
       },
       "original": {
@@ -471,11 +471,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1769909678,
+        "lastModified": 1765674936,
-        "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
+        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "72716169fe93074c333e8d0173151350670b824c",
+        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
         "type": "github"
       },
       "original": {
@@ -502,11 +502,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1770197578,
+        "lastModified": 1767379071,
-        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
+        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
+        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
         "type": "github"
       },
       "original": {
@@ -528,11 +528,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767810917,
+        "lastModified": 1764773531,
-        "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
+        "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
+        "rev": "1d9616689e98beded059ad0384b9951e967a17fa",
         "type": "github"
       },
       "original": {
@@ -552,11 +552,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1769939035,
+        "lastModified": 1767281941,
-        "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=",
+        "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "a8ca480175326551d6c4121498316261cbb5b260",
+        "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
         "type": "github"
       },
       "original": {
@@ -596,11 +596,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770520253,
+        "lastModified": 1767495280,
-        "narHash": "sha256-6rWuHgSENXKnC6HGGAdRolQrnp/8IzscDn7FQEo1uEQ=",
+        "narHash": "sha256-hEEgtE/RSRigw8xscchGymf/t1nluZwTfru4QF6O1CQ=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "ebb8a141f60bb0ec33836333e0ca7928a072217f",
+        "rev": "cb24c5cc207ba8e9a4ce245eedd2d37c3a988bc1",
         "type": "github"
       },
       "original": {
@@ -616,11 +616,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770526836,
+        "lastModified": 1767499857,
-        "narHash": "sha256-xbvX5Ik+0inJcLJtJ/AajAt7xCk6FOCrm5ogpwwvVDg=",
+        "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "d6e0e666048a5395d6ea4283143b7c9ac704720d",
+        "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190",
         "type": "github"
       },
       "original": {
@@ -650,11 +650,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1770504996,
+        "lastModified": 1767559556,
-        "narHash": "sha256-CjgGVXmYuEqx9rT4o1EKZVhacp6TuwZRicmaekkSvfE=",
+        "narHash": "sha256-Pf1d9Hh9UUQ/oS+evq6dU0MiaDczXXNztTlQekaMbW0=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "044ac0cc6d914f1dac22a728013bc3797f77cfab",
+        "rev": "b135edbdd403896d1ef507934c045f716deb5609",
         "type": "github"
       },
       "original": {
@@ -729,11 +729,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1767710407,
+        "lastModified": 1763914658,
-        "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
+        "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
+        "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
         "type": "github"
       },
       "original": {
@@ -745,11 +745,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1767489635,
+        "lastModified": 1764465359,
-        "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
+        "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
+        "rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
         "type": "github"
       },
       "original": {
@@ -761,11 +761,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1767488740,
+        "lastModified": 1764464512,
-        "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
+        "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
+        "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
         "type": "github"
       },
       "original": {

flake.nix

@@ -171,7 +171,7 @@
       inherit lib; # for allowing use of custom functions in nix repl
 
       hydraJobs = import ./hydra/jobs.nix { inherit inputs outputs systems; };
-      formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt);
+      formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);
 
       nixosConfigurations = genSystems inputs outputs src (src + "/systems");
       homeConfigurations = {

hydra/jobs.nix

@@ -8,7 +8,10 @@ let
   pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux;
 
   getCfg = _: cfg: cfg.config.system.build.toplevel;
+  hostToAgg = _: cfg: cfg;
+
   getHome = _: cfg: cfg.config.home.activationPackage;
+  homeToAgg = _: cfg: cfg;
 
   # get per-system check derivation (with optional postfix)
   mapSystems =
@@ -24,6 +27,15 @@ rec {
   host = lib.mapAttrs getCfg outputs.nixosConfigurations;
   home = lib.mapAttrs getHome outputs.homeConfigurations; # homeConfigurations.alice.config.home.activationPackage
 
+  hosts = pkgs.releaseTools.aggregate {
+    name = "hosts";
+    constituents = lib.mapAttrsToList hostToAgg host;
+  };
+  homes = pkgs.releaseTools.aggregate {
+    name = "homes";
+    constituents = lib.mapAttrsToList homeToAgg home;
+  };
+
   devChecks = pkgs.releaseTools.aggregate {
     name = "devChecks";
     constituents = lib.flatten [

shell.nix

@@ -44,7 +44,7 @@ forEachSystem (
         pre-commit
         treefmt
         statix
-        nixfmt
+        nixfmt-rfc-style
         jsonfmt
         mdformat
         shfmt

systems/artemision/configuration.nix

@@ -82,6 +82,8 @@
 
   system.stateVersion = "24.05";
 
+  programs.adb.enable = true;
+
   environment.variables = {
     "KWIN_DRM_NO_DIRECT_SCANOUT" = "1";
   };

systems/artemision/programs.nix

@@ -5,7 +5,6 @@
     alacritty
     attic-client
     amdgpu_top
-    android-tools
     bat
     bitwarden-cli
     bfg-repo-cleaner
@@ -37,9 +36,6 @@
     ipmiview
     iperf3
     # ipscan
-    javaPackages.compiler.temurin-bin.jdk-25
-    javaPackages.compiler.temurin-bin.jdk-21
-    javaPackages.compiler.temurin-bin.jdk-17
     jp2a
     jq
     kdePackages.kdenlive

systems/palatine-hill/docker/minecraft.nix

@@ -4,8 +4,6 @@ let
   servers = {
     atm6 = "atm6.alicehuston.xyz";
     stoneblock3 = "sb3.alicehuston.xyz";
-    stoneblock-4 = "sb4.alicehuston.xyz";
-    submerged-2 = "sm4.alicehuston.xyz";
     RAD2 = "rad.alicehuston.xyz";
     skyfactory = "sf.alicehuston.xyz";
     divinejourney = "dj.alicehuston.xyz";
@@ -13,38 +11,30 @@ let
     arcanum-institute = "arcanum.alicehuston.xyz";
     meits = "meits.alicehuston.xyz";
     # bcg-plus = "bcg.alicehuston.xyz";
-    pii = "pii.alicehuston.xyz";
   };
 
   defaultServer = "rlcraft";
 
-  defaultEnv = {
+  # defaultEnv = {
-    EULA = "true";
+  #   EULA = "true";
-    TYPE = "AUTO_CURSEFORGE";
+  #   TYPE = "AUTO_CURSEFORGE";
-    STOP_SERVER_ANNOUNCE_DELAY = "120";
+  #   STOP_SERVER_ANNOUNCE_DELAY = "120";
-    STOP_DURATION = "600";
+  #   STOP_DURATION = "600";
-    SYNC_CHUNK_WRITES = "false";
+  #   SYNC_CHUNK_WRITES = "false";
-    USE_AIKAR_FLAGS = "true";
+  #   USE_AIKAR_FLAGS = "true";
-    MEMORY = "12G";
+  #   MEMORY = "8GB";
-    ALLOW_FLIGHT = "true";
+  #   ALLOW_FLIGHT = "true";
-    MAX_TICK_TIME = "-1";
+  #   MAX_TICK_TIME = "-1";
-    ENABLE_RCON = "true";
+  # };
-    TZ = "America/New_York";
-    REGION_FILE_COMPRESSION = "none";
-    OPS = ''
-      magpiecat
-      chesiregirl1105
-    '';
-  };
 
-  defaultOptions = [
+  # defaultOptions = [
-    "--stop-signal=SIGTERM"
+  #   "--stop-signal=SIGTERM"
-    "--stop-timeout=1800"
+  #   "--stop-timeout=1800"
-    "--network=minecraft-net"
+  #   "--network=minecraft-net"
-  ];
+  # ];
 
-  vars = import ../vars.nix;
+  # vars = import ../vars.nix;
-  minecraft_path = "${vars.primary_games}/minecraft";
+  # minecraft_path = "${vars.primary_games}/minecraft";
 in
 {
   virtualisation.oci-containers.containers = {
@@ -62,94 +52,45 @@ in
         )
       ];
     };
-    #rlcraft = {
+    # rlcraft = {
-    #  image = "itzg/minecraft-server:java8";
+    #   image = "itzg/minecraft-server:java8";
-    #  volumes = [
+    #   volumes = [
-    #    "${minecraft_path}/rlcraft/modpacks:/modpacks:ro"
+    #     "${minecraft_path}/rlcraft/modpacks:/modpacks:ro"
-    #    "${minecraft_path}/rlcraft/data:/data"
+    #     "${minecraft_path}/rlcraft/data:/data"
-    #  ];
+    #   ];
-    #  hostname = "rlcraft";
+    #   hostname = "rlcraft";
-    #  environment = defaultEnv // {
+    #   environment = defaultEnv // {
-    #    VERSION = "1.12.2";
+    #     VERSION = "1.12.2";
-    #    CF_SLUG = "rlcraft";
+    #     CF_SLUG = "rlcraft";
-    #    DIFFICULTY = "hard";
+    #     DIFFICULTY = "hard";
-    #    ENABLE_COMMAND_BLOCK = "true";
+    #     ENABLE_COMMAND_BLOCK = "true";
-    #  };
+    #   };
-    #  extraOptions = defaultOptions;
+    #   extraOptions = defaultOptions;
-    #  log-driver = "local";
+    #   log-driver = "local";
-    #  environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
+    #   environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
-    #};
+    # };
-    prominence-ii = {
+    # bcg-plus = {
-      image = "itzg/minecraft-server:java25-graalvm";
+    #   image = "itzg/minecraft-server:java17";
-      volumes = [
+    #   volumes = [
-        "${minecraft_path}/prominence-ii/modpacks:/modpacks:ro"
+    #     "${minecraft_path}/bcg-plus/modpacks:/modpacks:ro"
-        "${minecraft_path}/prominence-ii/data:/data"
+    #     "${minecraft_path}/bcg-plus/data:/data"
-      ];
+    #   ];
-      hostname = "pii";
+    #   hostname = "bcg-plus";
-      environment = defaultEnv // {
+    #   environment = defaultEnv // {
-        VERSION = "1.20.1";
+    #     VERSION = "1.17";
-        CF_SLUG = "prominence-2-hasturian-era";
+    #     CF_SLUG = "bcg";
-        CF_FILENAME_MATCHER = "3.9.14hf";
+    #     DIFFICULTY = "normal";
-        MEMORY = "8G";
+    #     DEBUG = "true";
-        USE_AIKAR_FLAGS = "false";
+    #     # ENABLE_COMMAND_BLOCK = "true";
-        USE_MEOWICE_FLAGS = "true";
+    #   };
-        USE_MEOWICE_GRAALVM_FLAGS = "true";
+    #   extraOptions = defaultOptions;
-        DIFFICULTY = "hard";
+    #   log-driver = "local";
-        ENABLE_COMMAND_BLOCK = "true";
+    #   environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
-        CF_FORCE_INCLUDE_FILES = ''
+    # };
-          emi
-        '';
-      };
-      extraOptions = defaultOptions;
-      log-driver = "local";
-      environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
-    };
-    stoneblock-4 = {
-      image = "itzg/minecraft-server:java25-graalvm";
-      volumes = [
-        "${minecraft_path}/stoneblock-4/modpacks:/modpacks:ro"
-        "${minecraft_path}/stoneblock-4/data:/data"
-      ];
-      hostname = "stoneblock-4";
-      environment = defaultEnv // {
-        VERSION = "1.21.1";
-        CF_SLUG = "ftb-stoneblock-4";
-        CF_FILENAME_MATCHER = "1.6.0";
-        MEMORY = "8G";
-        USE_AIKAR_FLAGS = "false";
-        USE_MEOWICE_FLAGS = "true";
-        USE_MEOWICE_GRAALVM_FLAGS = "true";
-        DIFFICULTY = "hard";
-        ENABLE_COMMAND_BLOCK = "true";
-      };
-      extraOptions = defaultOptions;
-      log-driver = "local";
-      environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
-    };
-    submerged-2 = {
-      image = "itzg/minecraft-server:java25-graalvm";
-      volumes = [
-        "${minecraft_path}/submerged-2/modpacks:/modpacks:ro"
-        "${minecraft_path}/submerged-2/data:/data"
-      ];
-      hostname = "submerged-2";
-      environment = defaultEnv // {
-        VERSION = "1.21.1";
-        CF_SLUG = "submerged-2";
-        CF_FILENAME_MATCHER = "B6.1";
-        USE_AIKAR_FLAGS = "false";
-        USE_MEOWICE_FLAGS = "true";
-        USE_MEOWICE_GRAALVM_FLAGS = "true";
-        DIFFICULTY = "hard";
-        ENABLE_COMMAND_BLOCK = "true";
-      };
-      extraOptions = defaultOptions;
-      log-driver = "local";
-      environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
-    };
   };
 
   sops = {
+    defaultSopsFile = ../secrets.yaml;
     secrets = {
       "docker/minecraft".owner = "docker-service";
     };

systems/palatine-hill/docker/torr.nix

@@ -25,25 +25,17 @@ in
       # webui port is 8082, torr port is 29432
       environment = qbitBase.environment // {
         WEBUI_PORT = "8082";
-        TORRENTING_PORT = "29432";
       };
       volumes = [
         "${qbit_path}/config:/config" # move from docker/qbit to qbit_path
-        "${torr_path}/data/:/data"
+        "${qbit_path}/data/:/data"
         "/etc/localtime:/etc/localtime:ro"
       ];
-      networks = [ "host" ];
       ports = [
         "8082:8082"
         "29432:29432"
-        "29432:29432/udp"
-      ];
-      extraOptions = [
-        "--dns=9.9.9.9"
       ];
     };
-
-    # temp instance
     qbitVPN = qbitBase // {
       # webui port is 8081, torr port is 39274
       networks = [
@@ -55,7 +47,22 @@ in
       dependsOn = [ "gluetun-qbit" ];
       volumes = [
         "${qbitvpn_path}/config:/config"
-        "${torr_path}/data:/data"
+        "${qbit_path}/data:/data"
+        "/etc/localtime:/etc/localtime:ro"
+      ];
+    };
+    qbitPerm = qbitBase // {
+      # webui port is 8083, torr port is 29434
+      networks = [
+        "container:gluetun-qbit"
+      ];
+      environment = qbitBase.environment // {
+        WEBUI_PORT = "8083";
+      };
+      dependsOn = [ "gluetun-qbit" ];
+      volumes = [
+        "${qbitperm_path}/config:/config"
+        "${qbit_path}/data:/data"
         "/etc/localtime:/etc/localtime:ro"
       ];
     };
@@ -68,44 +75,13 @@ in
         "/dev/net/tun:/dev/net/tun"
       ];
       ports = [
+        # qbitvpn
         "8081:8081"
-      ];
+        "39274:39274"
-      environment = {
-        TZ = "America/New_York";
-        # SOPS prep
-      };
-      environmentFiles = [
-        config.sops.secrets."docker/gluetun".path
-        config.sops.secrets."docker/gluetun-qbitvpn".path
-      ];
-    };
 
-    # permanent instance
+        # qbitperm
-    qbitPerm = qbitBase // {
-      # webui port is 8083, torr port is 29434
-      networks = [
-        "container:gluetun-qbit"
-      ];
-      environment = qbitBase.environment // {
-        WEBUI_PORT = "8083";
-      };
-      dependsOn = [ "gluetun-qbit" ];
-      volumes = [
-        "${qbitperm_path}/config:/config"
-        "${torr_path}/data:/data"
-        "/etc/localtime:/etc/localtime:ro"
-      ];
-    };
-    gluetun-qbitperm = {
-      image = "qmcgaw/gluetun:v3";
-      capabilities = {
-        NET_ADMIN = true;
-      };
-      devices = [
-        "/dev/net/tun:/dev/net/tun"
-      ];
-      ports = [
         "8083:8083"
+        "29433:24933"
       ];
       environment = {
         TZ = "America/New_York";
@@ -113,7 +89,6 @@ in
       };
       environmentFiles = [
         config.sops.secrets."docker/gluetun".path
-        config.sops.secrets."docker/gluetun-qbitperm".path
       ];
     };
   };
@@ -121,22 +96,7 @@ in
   sops.secrets = {
     "docker/gluetun" = {
       owner = "docker-service";
-      restartUnits = [
+      restartUnits = [ "docker-gluetun-qbit.service" ];
-        "docker-gluetun-qbit.service"
-        "docker-gluetun-qbitperm.service"
-      ];
-    };
-    "docker/gluetun-qbitvpn" = {
-      owner = "docker-service";
-      restartUnits = [
-        "docker-gluetun-qbit.service"
-      ];
-    };
-    "docker/gluetun-qbitperm" = {
-      owner = "docker-service";
-      restartUnits = [
-        "docker-gluetun-qbitperm.service"
-      ];
     };
   };
 }

systems/palatine-hill/firewall.nix

@@ -45,14 +45,6 @@
       8686
       8787
       5055
-
-      # torr
-      29432
-    ];
-
-    allowedUDPPorts = [
-      # torr
-      29432
     ];
 
   };

systems/palatine-hill/secrets.yaml

@@ -17,7 +17,7 @@ minio:
     credentials: ENC[AES256_GCM,data:5Z/cTmxSuMq8BfRgYLGZZJ7o6AtmrQM3yNjR17YHr29S7ZWvGsjfM7DsLKectem01nvv3HoT4uyWSdhkOmZahzDb5OF1NEgjJhLqkKlCETMu0mmpwe1cx6iOd7kjB3E6Az/MWpXqZ/TrryL9FrQD2nnx9bHyWWIHRQv8,iv:jiYZXfU+OssC0rh/3yFZLEzD1+5mVDDl6gQ3oyk76E4=,tag:bevDszFv1zSa+/2qQIgC0w==,type:str]
     loki: ENC[AES256_GCM,data:ShC6hfsKifVaxLWRo1fqaOpsrYh4+w==,iv:KVSlPd0mBvPZikg/Agnl6q0UhxTmsNOeYdercYOhqMg=,tag:cj6ex9m7vDjInTJDGUlqFQ==,type:str]
 docker:
-    minecraft: ENC[AES256_GCM,data:krSM870t/IATwpUWNuKX8D5HHEvk+HeimKgodXssIYcBmdF1SZAwjUsSlx9fL3JiRtxfu0jSbhyD/2jLHMWqcix1WQGOVgs=,iv:ZTMxmzeSLQRCBF2t6r3dCDlcZ5BsBwZen6jOZN/HvGU=,tag:SES3lhRrRI8zBH1jnaV82w==,type:str]
+    minecraft: ENC[AES256_GCM,data:2k/m0ksnE92fACxQuBlOO72b19T7Nbnr58ezRddmKUVvePEgrdSnIsR3sh7PnmzwmG/ez0WTD+NKbtkQmRMDQ25vruA8gCf8Ig==,iv:X2SUidKTNAPZfbyiXFKprUbAhBxJcbF5bz+YTy4nuEA=,tag:AAvLXO888r9XvtnNfQgCpA==,type:str]
     foundry: ENC[AES256_GCM,data:5Z0FvVhJBzTwDPRN6c//caZokiTnkdqiLGFFuyen+tYsdjbQ3AXH5y7HfxKbxsJvU5uShOuIg0jVMvow2NYmzyYDDKBKPOz0bgXOmFq06wzCJubjyZmR/mDcWBBDzAFzaazpyW8=,iv:6wLS00zhX0tjJUe5uADAjzEshJP8QOkF2i4Aw+Y9RSk=,tag:sNr/exY1u3evYGcImyCUlA==,type:str]
     nextcloud: ENC[AES256_GCM,data:dm2Cha+CvFORgdcBvJAzzdOGcJ95vLJYTZcUJnjNp6HOQIIoJrDone1NOAYJh9rdWG/17/ntOmd+TysAj4AsD0dw/PatZmy3I+dcVghkt2XNTc7jD64QjctIHzR+om1joAbKemG1R3St7qDU68TWYxoxIfYZcJvg3ds/lJcYgFRh079UZ/IRlGVR6sWPEXyY+UUrwtk0Fr+y8UtwwWZiLp0akUbIV06huRGiAp/PeWETuPPuacl2++ayIgJFZkJjUl/a52RI1Q0nLG5iyK6QYpY1JSRJTOkiQQ4PB5GRdLCdoM5/ZXTQ6gGcoM5jXFllsTn+yRicNRucuBp7Z2achbk6eITCdjjdXVI7zM4YXpzVLu5fJckLAu07aEIGYCBT7ZXd7TRgfB68POwtwaJGBozg+nuhq8xEH04yi8jFODH6aFplIgJ+bbaP72zw+92lzZa33FEtOwKdtx+YUv0eLLDJs+8Z6Sn6RyN8prwIz1/9LuIMx39g4R7id9W2bV2MXqTU4nN8f0TXWqe+hnb5pDLBaZOBMkwbRka6Vptsi4dbL5Lnexa2DoIHZ2unyxZ+4SkRt9LH39j8fXf2w5JPFCSLstf7+Zu7xzRS0TTCug7k,iv:oOWcFdQJb/+KZKJmQChhJ5jOCcM3o+ojZSMyiRnO9n8=,tag:PWGQkwPe0juLgAdlKiWKpg==,type:str]
     redis: ENC[AES256_GCM,data:c+55cN6IpUNeKd+wC2zv3eunYjBsmZtXTczokqaxB2Q=,iv:M3pwNUlT9kUMv4JDE6bp/gub9CdBGxdApIvpOt3JpgE=,tag:3rPlV3U0AP9zAeF7xDouKw==,type:str]
@@ -32,9 +32,7 @@ docker:
     sonarr: ENC[AES256_GCM,data:X/hM31ZyHybvy2eQzVnmq8CH1AqBgz1pxq7tKC4lZB3ryAbnEIJksffem8+35tWt/0r5cEH4aaIKD1kS7Q+Ma+8JrRLcWkt6CZq/wspz,iv:44FfdVpQCposXshzNe5DXAxExeQzjVKhkZaVbgKo8KU=,tag:WIWWUt1XBngUTwwqhCrcNw==,type:str]
     lidarr: ENC[AES256_GCM,data:xERBECneutNUMZRrHukp8CaNrpI7SXUB16zUkauNP2+wto3eIc/K+2nMCkbwSC9AKlSjnUGSiORmAWn/jofTAuEzQljkCR1XCSkJRMmL,iv:iKf4fZtCfdjT/KuMFK5VFoLAV+Lll8uJowe9Q4cHyYw=,tag:xzmATTkrYRYm9Mw23zEO5g==,type:str]
     jellyseerr: ENC[AES256_GCM,data:7dDfHFp8+WbJqrf7Ms/gmfroBePwegXh5CXn5FcOz8IEK7rTvr9KZfz9x/1BwdD8,iv:ZPi3OcMfH76A08piKY4P7hFbeMyouwBoeN5oL3ExzKU=,tag:oOZ37dy/y+DFqNRfAHexvQ==,type:str]
-    gluetun: ENC[AES256_GCM,data:PV6SWwKfpC77fVvF9Pss8WFgLVA569h3PR9wLw6BkcNXKNA301qttV160FR5SeeNrvX1UtF3r4OclJ2ja0EXeiRRUXE/tHhY7aosAZoF7mwea+BcgQagwBqfP0LRMni/cKWP8UKnhyEXYt8aR0JfYCqEf+XcjX+9cljPnb7/OpmcDe0XmNYI2I2fKAmKjjKbbxX1o51P1N5gSWwKb/6FTeEaKI1k0JgCS8HcEnl1pzuMUA1bk18y7PTNhSSJWOBoovnShDYo/8/nJJN8qXFbdlC+NQfRMe9s8rkZPnHVEzLQVHxCgrYEDZCrjLydc0FTFqeb4eOhekCWkjsoK0HEYc28sa65LHhJ5t4U/tB5iIyWGSQAaqjH0wnAniqaCPpxJ1Se7aPiQlKvYYJjM7T8ZK3tQsRJzuD7NRF9/kZuLPgOV3ZtIAO4haI=,iv:UmXk+/QSeSdgtqwNTumWbu2vq8Blehc3wKWMTK1g+g8=,tag:a0v7YLBAfEkG9FBpSoZRGQ==,type:str]
+    gluetun: ENC[AES256_GCM,data:LSIHzw4HXoegkPwpEzLGFZfrAJG37Qcb+1aPVkbqElMyezxgEXUMzA3IOjkI/2aREmfjnm2gQxuidtvL+50jT7bBP6I/8+BTifVfdgk1nqtLasyGRcjDi2BGvITFGoXoHMY+3cNp1bhrDp0VjOtkwR4S2EsTajvUjvuj+TKcPkBlBIjNhO0UXbBZhfh0cERCEa5BxKz/wOKgyu8Gqgts+QPFhVpV/xT8LzI1Wx3+fG6UxUFqeY3XKsPf8Ku9Ghw+D9ZEbMOxbXsRg0ljtwHJ+o8SJ1mQCSkkbCHKskFwM7mH3xqBQT7HlnI3xKHpimCTB1FUQLxJoJ9eUWEfJKnFv363OgnUdB682vofFe1H/hzKP9/EbdGxe1JYqf+9VlYcoYXnFxJhBwvd3zjRJpDZRoiIndSTopi46A+nsw18jRtj6VQaNvbqe76bZWN7+cCzfNHy57qZSF0bUKqLj1HoBSDbPrxFAkuOdelHmMBx6Aer8MEepR1YDOS1rW9Uw60vYgyQDGdHz1pU4JUkD4Ny5gc2nOnAoHjzqCHX0rLqCiF/qOEfDI3cb0g48ccH5n8TyjO4mtoj0Q==,iv:0IQfKX0KcdCloo8KEyQOpoZ4NdwX6am46b0QPHOXguA=,tag:9hCV1TDycq0XUcc2Xd1//Q==,type:str]
-    gluetun-qbitvpn: ENC[AES256_GCM,data:2K39qItMm27Tso3jyYsju8kZwfeJGLKCLnuMbjnfvHtRuOzeFgBDmGHOPdNo6uw8W5XUEqlPVf2exp60S5xjEwNsoRNlPCtm5848yVtvgODcrU3icZ99GW/3qO5pO9r9VlTPQ15j9XhyYS0HpmBF7EzjLND/ph86MqfG4+v1R685i99+9uRmQwa+Z3ueEQ23DWdZMwyu8F2Vspz4MIMUA1hvJvgVOgGV7aNNKX3bbwu9w3wS+DlRgQk2NzON2SzK0pFRSfTgCQDSPQviZrdsn87k8s64X0XkhyJ4mSxtsyMPE6YYI0zlbL8TX2LO4r+iqGHrEiT8BezAKsCk1fOk+7WceHKbaQ6DBegG/iIq5EkZdIKcEWdLaeWxT1hXiMYeaF7+U+7iW8I7CDw3VT/n574HJFhljDfwwIw9KB3LGgKP7EB7fhzxqjfwl/RQWd4O5sNeTWdXDno/8Kh23hE3gvXaL+HuBOsMfE2qz7sQsRHuwGSjoHD1kD4CO8Ttyi72tZFp4z6//3rII/ZsvLvVjzu4BHi3elorcPIRRQQL0PhgHFufspcm9Plyt9GOSglHglKFNIb4DRyWlu8XPAhXYYjUD7023QmB7/s/Garq6LE6zCd9ctqX4uOPTz1eNL5nC6kfmvf+,iv:niYMaxvUFf3WAC4lfp/+RNZcVB/23bbBW1zTt6ckVpA=,tag:SR0pvk2PqZwDgPFqEuNAjw==,type:str]
-    gluetun-qbitperm: ENC[AES256_GCM,data:+qTTbkuTVANLyUlD8QWedt8+yV0kUcAc7354RxhfV15Vedjxpx5wtw2+kvWXi4KAP2udEbq1hssWBY6SsLQb50QD7S8pcsqh73m0mDmLYLXzDSU+8YXXFjPL8Jgndpz755W7n50rzLmKPSzfZADU6tj0+/kp4+V6Jv5q6fV/01liqfULhwCuqNeB4s52odbos4DjpLS0685jD1sPX3SpIg5oNwlyldXOrvQdZto1voViVRYt7LkSfPCnEuN5PzJ4HwJm5i48KrRSBLKqZ0lwjb4qbVzrN/yerCDv8o8WANL0+/aWMjsdYZgFxtc6Uk9ieRdF6+z60q0j3Y2fGabcTPeyZQx1XJZIDBRApYWEGKDApI5zffGEQs2Ji3AvaSn9IIx9v3F9fIC0J/IZm7mDYB8gecq3SvrvW3SfYAMhV334nRjquPc+1ggHO9QAt3DEBLQkVkwWW5SCYkZQvuI0U8vHsIuyuW9EDLqefT1UkvUVAgZ/8YnlRcXQvEd6mBkYxox5dfkEzRhj78OxLH+3WcvrbOMubJ26s1K8HpnLCVzpRUUXVa1pTL37SaZ0wRVmFAxSkEzuW/yCf+UFmAtTuSKz4D4Cjl2+z+Jp+PwlzptbKlWCCuVC1UdP0DP7k16rZ1SSSYEY,iv:Z4lMTlN4hBGIitRkdbzcQnngnikEf3I0DA/+8V1XsEc=,tag:C8Y19kBsHdXc05xBEiV2tQ==,type:str]
 acme:
     bunny: ENC[AES256_GCM,data:P2yROVUga9mORcq8VR/l0i4/2Vod1zvlYq+ZJLLNKow0SpblkwQX/i1ucQYAOkTTRddN+3C+t0zj1rMWkdLoaLjEUJJi3VsSxi+chV2FFiVKFQGEcg24,iv:aQvGgGLsgRGoEmwTgZHR8Jm/MYxmGtVTT/fZKaTLeMs=,tag:m3ssF4O8qs4yxvMu6yUcjw==,type:str]
     dnsimple: ENC[AES256_GCM,data:37FKyBibFtXZgI4EduJQ0z8F+shBc5Q6YlLa3YkVPh9XuJVS20eybi75bfJxiozcZ9d+YRaqcbkBQCSdFOCotDU=,iv:oq3JjqbfAm2C4jcL1lvUb2EOmnwlR07vPoO8H0BmydQ=,tag:E3NO/jMElL6Q817666gIyg==,type:str]
@@ -53,8 +51,8 @@ sops:
             cXNZWmZqd0R0SmhINExscHBKWmxvblUKEFEQvt/zQFARba4S8vHz/1SoKdKg69At
             LZ58XQGOmlGbBhPr7EzYQ2XSY4flWbnnD174cmCR8DNFm15DsNA5fw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-02-19T18:52:34Z"
+    lastmodified: "2026-01-08T04:11:30Z"
-    mac: ENC[AES256_GCM,data:c/rbSil5+IMpMsgqkGL2ycHOKiP0ml8MUB5PH40C1QimW7WYgjDg9lWpoLvn3fFrFEzHrt1gls23ImYCrrbNPlUEQQm69bV0I9tm6J0MiyFkxVPqrzLZdp6wn2l2ThwuAfLp674ZpltJuWHnHxusbW892QaVlGtQpN0yHSW57H0=,iv:37DbNJYIN3UIPmUinFJ6taO/INI4/wvCda/ARi70NFc=,tag:pQIPXRJWWu3I0zFY+ATSZg==,type:str]
+    mac: ENC[AES256_GCM,data:dSrAVkL44NOXqgFog7XjD+zSane7YeqKM/SnAPaDNEYJVUcS3V1RYdL8Br1Vjrgac9ZVMU2W04jXCuZPg13uFsyYgczC0l1s39FodKnRc7Xt8eoHSejsETBeaaC8aLH7xVhWGk+fR4w7o4Vw+gtOzKPyvobuevBZfg7ugfObn10=,iv:vfHm3jjKXdi8V+2x8br5DqVgDgchJ9yewgP0vfeOP9M=,tag:z4bkPbK6weHaPyYbGJxaOw==,type:str]
     pgp:
         - created_at: "2024-11-28T18:56:39Z"
           enc: |-

users/alice/default.nix

@@ -17,7 +17,4 @@ import ../default.nix {
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILWG3cIBju6vzX6s8JlmGNJOiWY7pQ19bHvcqDADtWzv snowi@DESKTOP-EVIR8IH"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEMfC0IXl9sGx+9FjuYZT2OUfffGjciJIHWqZdEU1d3n alice@parthenon-7588"
   ];
-  groups = [
-    "adbusers"
-  ];
 }

users/alice/home/hypr/hyprland.conf

@@ -122,7 +122,7 @@ gestures {
 
 misc {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    force_default_wallpaper = 1 # Set to 0 or 1 to disable the anime mascot wallpapers
+    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
 }
 
 # Example per-device config
@@ -137,7 +137,7 @@ device {
 # Example windowrule v2
 # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-windowrule = suppress_event maximize, match:class .* # You'll probably like this.
+windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
 
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more

users/alice/non-server.nix

@@ -66,7 +66,7 @@
 
     # nix tools
     nil
-    nixfmt
+    nixfmt-rfc-style
     nix-init
 
     # markdown

users/default.nix

@@ -4,7 +4,6 @@
   pkgs,
   name,
   publicKeys ? [ ],
-  groups ? [ ],
   defaultShell ? "zsh",
 }:
 
@@ -19,6 +18,7 @@
     "wheel"
     "media"
     (lib.mkIf config.networking.networkmanager.enable "networkmanager")
+    (lib.mkIf config.programs.adb.enable "adbusers")
     (lib.mkIf config.programs.wireshark.enable "wireshark")
     (lib.mkIf config.virtualisation.docker.enable "docker")
     (lib.mkIf (with config.services.locate; (enable && package == pkgs.plocate)) "plocate")
@@ -28,6 +28,5 @@
     "plugdev"
     "uaccess"
     "ydotool"
-  ]
+  ];
-  ++ groups;
 }