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

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,16 +23,9 @@ let
     STOP_DURATION = "600";
     SYNC_CHUNK_WRITES = "false";
     USE_AIKAR_FLAGS = "true";
-    MEMORY = "12G";
+    MEMORY = "8GB";
     ALLOW_FLIGHT = "true";
     MAX_TICK_TIME = "-1";
-    ENABLE_RCON = "true";
-    TZ = "America/New_York";
-    REGION_FILE_COMPRESSION = "none";
-    OPS = ''
-      magpiecat
-      chesiregirl1105
-    '';
   };
 
   defaultOptions = [
@@ -91,19 +84,12 @@ in
         MODRINTH_VERSION = "3.9.14hf";
         USE_AIKAR_FLAGS = "false";
         USE_MEOWICE_FLAGS = "true";
-        USE_MEOWICE_GRAALVM_FLAGS = "true";
         DIFFICULTY = "hard";
         ENABLE_COMMAND_BLOCK = "true";
-        MODRINTH_FORCE_SYNCHRONIZE = "true";
-        MODRINTH_FORCE_INCLUDE_FILES = ''
-          emi
-        '';
       };
       extraOptions = defaultOptions;
       log-driver = "local";
     };
-    #stop_signal: SIGTERM
-    #stop_grace_period: 5m
     # bcg-plus = {
     #   image = "itzg/minecraft-server:java17";
     #   volumes = [

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