automated: Update flake.lock

Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/flake-update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request
Merge pull request 'switch to CF' (#176 ) from feature/pii into main
2026-01-17 12:09:44 +00:00 · 2026-01-16 19:58:39 -05:00 · 2026-01-16 19:54:56 -05:00 · 2026-01-16 19:50:45 -05:00 · 2026-01-16 18:31:09 -05:00 · 2026-01-16 18:27:16 -05:00
12 changed files with 181 additions and 118 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -76,11 +76,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1767473845,
-        "narHash": "sha256-Pvd0l14qYA4jBS+JSCufoj8qFpeu2dt0Q9zBvpeLKac=",
+        "lastModified": 1768622624,
+        "narHash": "sha256-Em6PP667PeXbEjidbV2LnNwmUYohbrSFvVPLYLUDHms=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "7f7d9e8b61abade02c6dc0d530ba6b43a50acead",
+        "rev": "8061c6d9199dc6cc0727d4241959eea28f2fa0a6",
        "type": "gitlab"
      },
      "original": {
@@ -93,11 +93,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1764724327,
-        "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
+        "lastModified": 1764873433,
+        "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
+        "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
        "type": "github"
      },
      "original": {
@@ -125,11 +125,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1765835352,
-        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
+        "lastModified": 1768135262,
+        "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
+        "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
        "type": "github"
      },
      "original": {
@@ -146,11 +146,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1763759067,
-        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
+        "lastModified": 1767609335,
+        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
+        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
        "type": "github"
      },
      "original": {
@@ -220,11 +220,11 @@
      "flake": false,
      "locked": {
        "host": "gitlab.gnome.org",
-        "lastModified": 1764524476,
-        "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
+        "lastModified": 1767737596,
+        "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
        "owner": "GNOME",
        "repo": "gnome-shell",
-        "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
+        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
        "type": "gitlab"
      },
      "original": {
@@ -242,11 +242,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1767556355,
-        "narHash": "sha256-RDTUBDQBi9D4eD9iJQWtUDN/13MDLX+KmE+TwwNUp2s=",
+        "lastModified": 1768598210,
+        "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "f894bc4ffde179d178d8deb374fcf9855d1a82b7",
+        "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
        "type": "github"
      },
      "original": {
@@ -283,11 +283,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766066098,
-        "narHash": "sha256-d3HmUbmfTDIt9mXEHszqyo2byqQMoyJtUJCZ9U1IqHQ=",
+        "lastModified": 1768426687,
+        "narHash": "sha256-CopNx3j//gZ2mE0ggEK9dZ474UcbDhpTw+KMor8mSxI=",
        "owner": "hyprwm",
        "repo": "contrib",
-        "rev": "41dbcac8183bb1b3a4ade0d8276b2f2df6ae4690",
+        "rev": "541628cebe42792ddf5063c4abd6402c2f1bd68f",
        "type": "github"
      },
      "original": {
@@ -417,11 +417,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1767185284,
-        "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=",
+        "lastModified": 1768584846,
+        "narHash": "sha256-IRPmIOV2tPwxbhP/I9M5AmwhTC0lMPtoPStC+8T6xl0=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe",
+        "rev": "cce68f4a54fa4e3d633358364477f5cc1d782440",
        "type": "github"
      },
      "original": {
@@ -440,11 +440,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1766370075,
-        "narHash": "sha256-gbhR8+gNrhmYxKaNJpTjFivuibr3ZdlB5eU0a8yE36I=",
+        "lastModified": 1768443651,
+        "narHash": "sha256-hmIo/e6mo40Y2v1DaH2yTtvB3lZ/zcf6gVNmgYhBgYc=",
        "owner": "NuschtOS",
        "repo": "nixos-modules",
-        "rev": "db6f2a33500dadb81020b6e5d4281b4820d1b862",
+        "rev": "31108e0d75bd47ddfc217b58df598e78fe3bcd42",
        "type": "github"
      },
      "original": {
@@ -502,11 +502,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1767379071,
-        "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
+        "lastModified": 1768564909,
+        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
+        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
        "type": "github"
      },
      "original": {
@@ -528,11 +528,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1764773531,
-        "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
+        "lastModified": 1767810917,
+        "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "1d9616689e98beded059ad0384b9951e967a17fa",
+        "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
        "type": "github"
      },
      "original": {
@@ -596,11 +596,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1767495280,
-        "narHash": "sha256-hEEgtE/RSRigw8xscchGymf/t1nluZwTfru4QF6O1CQ=",
+        "lastModified": 1768617670,
+        "narHash": "sha256-Z3+6dxoWZn+QFwjxAt5ZGXkiuCvCLgQP6pTS5eSWXqk=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "cb24c5cc207ba8e9a4ce245eedd2d37c3a988bc1",
+        "rev": "56d0fbdd732f3686e8414b857cf885038fc17d57",
        "type": "github"
      },
      "original": {
@@ -616,11 +616,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1767499857,
-        "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=",
+        "lastModified": 1768481291,
+        "narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190",
+        "rev": "e085e303dfcce21adcb5fec535d65aacb066f101",
        "type": "github"
      },
      "original": {
@@ -650,11 +650,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1767559556,
-        "narHash": "sha256-Pf1d9Hh9UUQ/oS+evq6dU0MiaDczXXNztTlQekaMbW0=",
+        "lastModified": 1768603455,
+        "narHash": "sha256-ih6dYNhX1oSg0emfSAvf3iRcgsJtMmS6RUaoCX8kNoU=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "b135edbdd403896d1ef507934c045f716deb5609",
+        "rev": "590e5c68c4d5e8c766420473c0185d75113f653b",
        "type": "github"
      },
      "original": {
@@ -729,11 +729,11 @@
    "tinted-schemes": {
      "flake": false,
      "locked": {
-        "lastModified": 1763914658,
-        "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
+        "lastModified": 1767710407,
+        "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
        "owner": "tinted-theming",
        "repo": "schemes",
-        "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
+        "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
        "type": "github"
      },
      "original": {
@@ -745,11 +745,11 @@
    "tinted-tmux": {
      "flake": false,
      "locked": {
-        "lastModified": 1764465359,
-        "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
+        "lastModified": 1767489635,
+        "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
        "owner": "tinted-theming",
        "repo": "tinted-tmux",
-        "rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
+        "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
        "type": "github"
      },
      "original": {
@@ -761,11 +761,11 @@
    "tinted-zed": {
      "flake": false,
      "locked": {
-        "lastModified": 1764464512,
-        "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
+        "lastModified": 1767488740,
+        "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
        "owner": "tinted-theming",
        "repo": "base16-zed",
-        "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
+        "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/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-rfc-style);
+      formatter = forEachSystem (system: nixpkgs.legacyPackages.${system}.nixfmt);

      nixosConfigurations = genSystems inputs outputs src (src + "/systems");
      homeConfigurations = {
--- a/hydra/jobs.nix
+++ b/hydra/jobs.nix
@@ -8,10 +8,7 @@ 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 =
@@ -27,15 +24,6 @@ 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 [
--- a/shell.nix
+++ b/shell.nix
@@ -44,7 +44,7 @@ forEachSystem (
        pre-commit
        treefmt
        statix
-        nixfmt-rfc-style
+        nixfmt
        jsonfmt
        mdformat
        shfmt
--- a/systems/artemision/configuration.nix
+++ b/systems/artemision/configuration.nix
@@ -82,8 +82,6 @@

  system.stateVersion = "24.05";

-  programs.adb.enable = true;
-
  environment.variables = {
    "KWIN_DRM_NO_DIRECT_SCANOUT" = "1";
  };
--- a/systems/artemision/programs.nix
+++ b/systems/artemision/programs.nix
@@ -5,6 +5,7 @@
    alacritty
    attic-client
    amdgpu_top
+    android-tools
    bat
    bitwarden-cli
    bfg-repo-cleaner
@@ -36,6 +37,9 @@
    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
--- a/systems/palatine-hill/docker/minecraft.nix
+++ b/systems/palatine-hill/docker/minecraft.nix
@@ -11,30 +11,38 @@ let
    arcanum-institute = "arcanum.alicehuston.xyz";
    meits = "meits.alicehuston.xyz";
    # bcg-plus = "bcg.alicehuston.xyz";
+    pii = "pii.alicehuston.xyz";
  };

  defaultServer = "rlcraft";

-  # defaultEnv = {
-  #   EULA = "true";
-  #   TYPE = "AUTO_CURSEFORGE";
-  #   STOP_SERVER_ANNOUNCE_DELAY = "120";
-  #   STOP_DURATION = "600";
-  #   SYNC_CHUNK_WRITES = "false";
-  #   USE_AIKAR_FLAGS = "true";
-  #   MEMORY = "8GB";
-  #   ALLOW_FLIGHT = "true";
-  #   MAX_TICK_TIME = "-1";
-  # };
+  defaultEnv = {
+    EULA = "true";
+    TYPE = "AUTO_CURSEFORGE";
+    STOP_SERVER_ANNOUNCE_DELAY = "120";
+    STOP_DURATION = "600";
+    SYNC_CHUNK_WRITES = "false";
+    USE_AIKAR_FLAGS = "true";
+    MEMORY = "12G";
+    ALLOW_FLIGHT = "true";
+    MAX_TICK_TIME = "-1";
+    ENABLE_RCON = "true";
+    TZ = "America/New_York";
+    REGION_FILE_COMPRESSION = "none";
+    OPS = ''
+      magpiecat
+      chesiregirl1105
+    '';
+  };

-  # defaultOptions = [
-  #   "--stop-signal=SIGTERM"
-  #   "--stop-timeout=1800"
-  #   "--network=minecraft-net"
-  # ];
+  defaultOptions = [
+    "--stop-signal=SIGTERM"
+    "--stop-timeout=1800"
+    "--network=minecraft-net"
+  ];

-  # vars = import ../vars.nix;
-  # minecraft_path = "${vars.primary_games}/minecraft";
+  vars = import ../vars.nix;
+  minecraft_path = "${vars.primary_games}/minecraft";
 in
 {
  virtualisation.oci-containers.containers = {
@@ -69,6 +77,32 @@ in
    #  log-driver = "local";
    #  environmentFiles = [ config.sops.secrets."docker/minecraft".path ];
    #};
+    prominence-ii = {
+      image = "itzg/minecraft-server:java25-graalvm";
+      volumes = [
+        "${minecraft_path}/prominence-ii/modpacks:/modpacks:ro"
+        "${minecraft_path}/prominence-ii/data:/data"
+      ];
+      hostname = "pii";
+      environment = defaultEnv // {
+        VERSION = "1.20.1";
+        CF_SLUG = "prominence-2-hasturian-era";
+        CF_FILENAME_MATCHER = "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
    # bcg-plus = {
    #   image = "itzg/minecraft-server:java17";
    #   volumes = [
--- a/systems/palatine-hill/docker/torr.nix
+++ b/systems/palatine-hill/docker/torr.nix
@@ -42,6 +42,8 @@ in
        "--dns=9.9.9.9"
      ];
    };
+
+    # temp instance
    qbitVPN = qbitBase // {
      # webui port is 8081, torr port is 39274
      networks = [
@@ -57,6 +59,29 @@ in
        "/etc/localtime:/etc/localtime:ro"
      ];
    };
+    gluetun-qbit = {
+      image = "qmcgaw/gluetun:v3";
+      capabilities = {
+        NET_ADMIN = true;
+      };
+      devices = [
+        "/dev/net/tun:/dev/net/tun"
+      ];
+      ports = [
+        "8081:8081"
+        "8083:8083"
+      ];
+      environment = {
+        TZ = "America/New_York";
+        # SOPS prep
+      };
+      environmentFiles = [
+        config.sops.secrets."docker/gluetun".path
+        config.sops.secrets."docker/gluetun-qbitvpn".path
+      ];
+    };
+
+    # permanent instance
    qbitPerm = qbitBase // {
      # webui port is 8083, torr port is 29434
      networks = [
@@ -72,7 +97,7 @@ in
        "/etc/localtime:/etc/localtime:ro"
      ];
    };
-    gluetun-qbit = {
+    gluetun-qbitperm = {
      image = "qmcgaw/gluetun:v3";
      capabilities = {
        NET_ADMIN = true;
@@ -81,15 +106,7 @@ in
        "/dev/net/tun:/dev/net/tun"
      ];
      ports = [
-        # qbitvpn
-        "8081:8081"
-        "39274:39274"
-        "39274:39274/udp"
-
-        # qbitperm
        "8083:8083"
-        "29433:24933"
-        "29433:24933/udp"
      ];
      environment = {
        TZ = "America/New_York";
@@ -97,6 +114,7 @@ in
      };
      environmentFiles = [
        config.sops.secrets."docker/gluetun".path
+        config.sops.secrets."docker/gluetun-qbitperm".path
      ];
    };
  };
@@ -104,7 +122,22 @@ in
  sops.secrets = {
    "docker/gluetun" = {
      owner = "docker-service";
-      restartUnits = [ "docker-gluetun-qbit.service" ];
+      restartUnits = [
+        "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"
+      ];
    };
  };
 }
--- a/systems/palatine-hill/secrets.yaml
+++ b/systems/palatine-hill/secrets.yaml
@@ -32,7 +32,9 @@ 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: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: ENC[AES256_GCM,data:ryhYVOYEZl5zDs+xMgbWI6q/Ei2AiNZJMxT/TcaHzTEocINgbczWk9GKeeZKno71vFXiF9/tPpYavLqvjWNL77doWDB+wiYrtBJ97PkQ70dqWntua9E8eCalYlIZpRbLsl5OA9ZHorIMPjjSB2CRYLCqq30PPi5I2TtRvs/g6LRUN4sZ/E2TTUjz7AEY7228ZEuHt1UkU+dY/jEbx6fwrm/ocP8xKvYUuAR1/Cx/z4N0mqmVl+FX/5dRSkmhpfAxO9ss898XKiJW4rewQIbG5ccYal+reZZr70TaEJQqg5KIfAnbp6dEjAsSXnRiEF801JXM0h+d14ECT4tQmdyvYBdCVnJ/Ibqw9D15cViHmeDbR68spqOCj67FSMKxgCVx4KFrxPOualsULX7RL/UbHq2cwyziSFkH4n2ljFlKohyj39F7EparJbiCOumNfhRWknDDwvXY+BjJhbAe19ccKP6QWrS68uBp0cTXqb0rVN/qlfz6Sj5EYj5M/u0rl6d5xctnKmOzfLjI2m5+E9WfDJaAUcP/Ihs+p2eD7aSQTIj+O7I66ju+UAz66D9ZoU1U3uVQ9gaPI5dOMmYdLKS3b19EVytwW2W13d0WXKIw5Vfb7MvFh9I0iPWq+ntL4jQzMYSwV5Y=,iv:Cy3h5I3vbqKORdqw91SHL4tRMeGHMLsXgQ0USJ2jtzk=,tag:0J/p1sUQfXR4ujjY7VzZuQ==,type:str]
+    gluetun-qbitvpn: ENC[AES256_GCM,data:3IdmuLvWs5YRQZuG9y1GRTMKMbR7OynUUVluezviDOV22EkABvo3Ic/+xZrWi/lzAhQRwRsCGjinlUJf7lBvPLg53HaIplbzSIyd3IPLbKzEVAK32WYB/M5cGNQW+XV8TiKK72HO8+WG588A0bsuvp/wQ86ohpRHVrnlboANLS3diCNXI3VdFIHPGpvM77TqB3/vo2AFLKjxi2es4l6KRam8cEUFAz0eH03tTUYaxy+ewA5IZCQSbMURLFKKdh0EATTG5jIz3jFp372fnk8UBgFPeH8+N9VHNM6rnV6zAsC2Vlj2E1YQRTRqOwSK0NRAAV5NBbr7zumS3VS0rVUpIbZVrW/C2BSAVbzowkHuo5o1B7UFsryb3s2FJJGF2biaDoL+ijM5a0Qi4LfNeaSLNKrzaTin0wYq8rPrQKOUBZL4t6FsRbG7KHmfwM4uYdWqV5h1syjI9WWReuePVb416YvqSH9p8HhNsDTka8IGgYkHcYAXYuuxUc6sgQONBwrsdeN5Dhq1IedhuOW+3qAV+hHl8qmVgiWZ8Ss+nmo016nsikifEp08N7J8t3f86/SFZO+YMBxQ/K9PJLsJzR2jsBcf2aTlq0cuzXDvb4cMtro=,iv:N9zdyKJDsj049j5hZOSnAkS/VTWlC3crTODJKIpYYko=,tag:uYHq3CZj0P/BAv+0Ak5ZEw==,type:str]
+    gluetun-qbitperm: ENC[AES256_GCM,data:kzSrILs78UkzNeAvxoDU3QsLKdapQNyQW9nq0it+7HhhwDQ0MJB1s2Ek8zKErTatpwzG8xiUK0HwX5hFLgNZYc+OE0CH4PUrgX1t6dykuPLD2rKQL7veElNgqhX0/39xNyopyJk2UMVFNSqoV1DCC/ja9MqX9+jBYk++7DeX7v1Gl1ntjzJ+zIscg0nOTN1eQAHtiOWtFU0COC/aA8KS+HLIsMkjrIk9UD4C/DE8AOS07s+gDxPRtl6L7324FRqjEHNyxAobWOOLeG711RZcskF7dlminVJu4aVGbBwIy/zDdHFxRwO6yaLr/AqrTlRVOa2O8Qu2Ydpv8ZNj2F6fHrVNNmVwvMEKYibV6oMVo72uT+DTz/mFaYuTUeuJfkdCy7tnQYhBnpbd5J4mKfVb8uOF9Tx02kL2fTFKyvtET3nrtakQUjv8mEqHn4F8136O2JvUBN5RmC3B3vRdFjYgdfwy8hUT9b0Cmi8w0Zzs+XGMRdvWv2g6b5fmlAn0K+a0KB1fdDLhvbIXhY+sYzR3yOH01K0lW3xVdnl1eMIFjZkUGRTi32HyCYb0SUA1EcXmtA4XmyZ6HHFEXFA5y2guVqU4xLyXXldM+lGB7yGLMcM=,iv:kuueHxYafrEdyBxGUBoU2ks7kdr/rWMnXZmE3Kx/iK4=,tag:bNIfP3H5/Kh3ofuCGGx5Hg==,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]
@@ -51,8 +53,8 @@ sops:
            cXNZWmZqd0R0SmhINExscHBKWmxvblUKEFEQvt/zQFARba4S8vHz/1SoKdKg69At
            LZ58XQGOmlGbBhPr7EzYQ2XSY4flWbnnD174cmCR8DNFm15DsNA5fw==
            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-01-08T04:11:30Z"
-    mac: ENC[AES256_GCM,data:dSrAVkL44NOXqgFog7XjD+zSane7YeqKM/SnAPaDNEYJVUcS3V1RYdL8Br1Vjrgac9ZVMU2W04jXCuZPg13uFsyYgczC0l1s39FodKnRc7Xt8eoHSejsETBeaaC8aLH7xVhWGk+fR4w7o4Vw+gtOzKPyvobuevBZfg7ugfObn10=,iv:vfHm3jjKXdi8V+2x8br5DqVgDgchJ9yewgP0vfeOP9M=,tag:z4bkPbK6weHaPyYbGJxaOw==,type:str]
+    lastmodified: "2026-01-10T05:52:21Z"
+    mac: ENC[AES256_GCM,data:DyLjQrIXJD7udT32xJ20WgCYr+4zXr7s0uuVMxOYSiC1VphhV+BQ2BgGF0bxAfx1n+JiO2BnyX8uD+z/iWh/k/9+UBGnL3MPJ5L5ffvno8hktVU9NHO72xkugYIkbSievTYrJGcSwWAsfJGTm4+1rG9GgcSoxIvRUoR6QJss22s=,iv:pHkPR0Va4bKjZVzNtvsDJ211ORNvNyZfWRf70OWI01w=,tag:/gEp09I+1nD6Cn6dPGZglA==,type:str]
    pgp:
        - created_at: "2024-11-28T18:56:39Z"
          enc: |-
--- a/users/alice/default.nix
+++ b/users/alice/default.nix
@@ -17,4 +17,7 @@ import ../default.nix {
    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILWG3cIBju6vzX6s8JlmGNJOiWY7pQ19bHvcqDADtWzv snowi@DESKTOP-EVIR8IH"
    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEMfC0IXl9sGx+9FjuYZT2OUfffGjciJIHWqZdEU1d3n alice@parthenon-7588"
  ];
+  groups = [
+    "adbusers"
+  ];
 }
--- a/users/alice/non-server.nix
+++ b/users/alice/non-server.nix
@@ -66,7 +66,7 @@

    # nix tools
    nil
-    nixfmt-rfc-style
+    nixfmt
    nix-init

    # markdown
--- a/users/default.nix
+++ b/users/default.nix
@@ -4,6 +4,7 @@
  pkgs,
  name,
  publicKeys ? [ ],
+  groups ? [ ],
  defaultShell ? "zsh",
 }:

@@ -18,7 +19,6 @@
    "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,5 +28,6 @@
    "plugdev"
    "uaccess"
    "ydotool"
-  ];
+  ]
+  ++ groups;
 }
Author	SHA1	Message	Date
github-actions[bot]	4e12851039	automated: Update `flake.lock` All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 18s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 4m24s Details Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/flake-update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request	2026-01-17 12:09:44 +00:00
ahuston-0	ef7287c76e	Merge pull request 'switch to CF' (#176 ) from feature/pii into main Some checks failed Check flake.lock / Check health of `flake.lock` (push) Successful in 11s Details Check Nix flake / Perform Nix flake checks (push) Failing after 13m23s Details Update flakes / update_lockfile (push) Successful in 10m17s Details Reviewed-on: #176	2026-01-16 19:58:39 -05:00
ahuston-0	1614015fca	remove agg jobs All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 10s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 3m30s Details	2026-01-16 19:54:56 -05:00
ahuston-0	0a215cb588	switch to CF Some checks failed Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 10s Details Check Nix flake / Perform Nix flake checks (pull_request) Failing after 3m19s Details	2026-01-16 19:50:45 -05:00
ahuston-0	e802e32e58	Merge pull request 'update flake lock, swap off of adb and nixfmt-rfc-style' (#173 ) from update_flake_lock_action into main All checks were successful Check flake.lock / Check health of `flake.lock` (push) Successful in 11s Details Check Nix flake / Perform Nix flake checks (push) Successful in 3m40s Details Reviewed-on: #173	2026-01-16 18:31:09 -05:00
ahuston-0	a52250876b	remove adb All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 10s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 3m49s Details	2026-01-16 18:27:16 -05:00
ahuston-0	9db5a4c073	remove adb	2026-01-16 18:27:16 -05:00
ahuston-0	0f4c578c40	add temurin	2026-01-16 18:27:16 -05:00
ahuston-0	aa945446a6	update flake lock, swap off of adb and nixfmt-rfc-style	2026-01-16 18:27:16 -05:00
ahuston-0	21fe5efd26	Merge pull request 'fix pii' (#175 ) from feature/pii into main All checks were successful Check flake.lock / Check health of `flake.lock` (push) Successful in 10s Details Check Nix flake / Perform Nix flake checks (push) Successful in 3m27s Details Reviewed-on: #175	2026-01-16 18:08:39 -05:00
ahuston-0	ccff72ace2	fix pii All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 13s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 4m17s Details	2026-01-16 18:04:18 -05:00
ahuston-0	b1cb79e39f	Merge pull request 'update pii' (#174 ) from feature/pii into main All checks were successful Check flake.lock / Check health of `flake.lock` (push) Successful in 12s Details Check Nix flake / Perform Nix flake checks (push) Successful in 3m38s Details Reviewed-on: #174	2026-01-16 12:55:57 -05:00
ahuston-0	0745540839	update pii All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 15s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 3m51s Details	2026-01-16 12:51:38 -05:00
ahuston-0	5f8cd26ac8	Merge pull request 'feature/qbit' (#172 ) from feature/qbit into main Some checks failed Check flake.lock / Check health of `flake.lock` (push) Successful in 12s Details Check Nix flake / Perform Nix flake checks (push) Failing after 3m50s Details Reviewed-on: #172	2026-01-16 12:29:45 -05:00
ahuston-0	49f4303af0	set up prominence II server All checks were successful Check Nix flake / Perform Nix flake checks (pull_request) Successful in 3m47s Details Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 8s Details	2026-01-16 12:25:01 -05:00
ahuston-0	1397f3bce8	split gluetun instances Some checks failed Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 10s Details Check Nix flake / Perform Nix flake checks (pull_request) Failing after 39s Details	2026-01-10 01:07:18 -05:00
ahuston-0	31ca3ebc18	port forwarding All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 17s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 3m59s Details	2026-01-09 23:27:03 -05:00
ahuston-0	65cfa5a29c	port forwarding All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 11s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 3m49s Details	2026-01-09 23:25:05 -05:00
ahuston-0	14d2998fcb	port forwarding All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 15s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 3m33s Details	2026-01-09 23:12:54 -05:00
ahuston-0	f5e22ad04a	port forwarding All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 11s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 3m37s Details	2026-01-09 23:08:05 -05:00