update flake lock, swap off of adb and nixfmt-rfc-style

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 [

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

@@ -37,9 +37,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

@@ -23,7 +23,7 @@ let
     STOP_DURATION = "600";
     SYNC_CHUNK_WRITES = "false";
     USE_AIKAR_FLAGS = "true";
-    MEMORY = "12G";
+    MEMORY = "12GB";
     ALLOW_FLIGHT = "true";
     MAX_TICK_TIME = "-1";
     ENABLE_RCON = "true";
@@ -86,20 +86,17 @@ in
       hostname = "pii";
       environment = defaultEnv // {
         VERSION = "1.20.1";
-        CF_SLUG = "prominence-2-hasturian-era";
-        CF_FILENAME_MATCHER = "3.9.14hf";
+        TYPE = "modrinth";
+        MODRINTH_MODPACK = "prominence-2-fabric";
+        MODRINTH_VERSION = "3.9.14hf";
         USE_AIKAR_FLAGS = "false";
         USE_MEOWICE_FLAGS = "true";
         USE_MEOWICE_GRAALVM_FLAGS = "true";
         DIFFICULTY = "hard";
         ENABLE_COMMAND_BLOCK = "true";
-        CF_FORCE_INCLUDE_FILES = ''
-          emi
-        '';
       };
       extraOptions = defaultOptions;
       log-driver = "local";
-      environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
     };
     #stop_signal: SIGTERM
     #stop_grace_period: 5m

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/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;
+  ];
 }