pinned python 3.12

fixed telegraf
fixed extraPaths
2025-08-25 22:10:04 -05:00 · 2025-06-19 13:54:06 -05:00 · 2025-06-16 14:26:43 -05:00 · 2025-06-16 14:23:54 -05:00 · 2025-06-16 14:19:48 -05:00 · 2025-06-16 14:14:51 -05:00
10 changed files with 171 additions and 224 deletions
--- a/ad-nix.code-workspace
+++ b/ad-nix.code-workspace
@@ -27,7 +27,11 @@
 		},
 		"python.defaultInterpreterPath": "${workspaceFolder}/.devenv/state/venv/bin/python3",
 		"python.autoComplete.extraPaths": ["~/ad-lola", "${fileWorkspaceFolder}/apps/room_control/src"],
-		"python.analysis.extraPaths": ["~/ad-lola", "${fileWorkspaceFolder}/apps/room_control/src"],
+		"python.analysis.extraPaths": [
+			"~/ad-lola",
+			"${workspaceFolder:conf}/lola/apps/room_control/src",
+			"${workspaceFolder:conf}/lola/apps/lola-parking/src"
+		],
 		"python.analysis.autoFormatStrings": true,
 		"python.analysis.completeFunctionParens": true,
 		"python.analysis.autoImportCompletions": true,
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,7 +1,7 @@
 { pkgs, lib, userSettings, systemSettings, ... }:
 {
  imports = [
-    (import ./home-manager {inherit systemSettings userSettings lib pkgs;})
+    # (import ./home-manager {inherit systemSettings userSettings lib pkgs;})
     ./nixos
     ./scripts
  ];
@@ -23,12 +23,8 @@
  # sops.age.keyFile = "${userSettings.adHome}/.config/sops/age/keys.txt";

  environment.systemPackages = with pkgs; [
-    bash
-    git
-    eza
    sops
    gdbm
-    btop
  ];

  virtualisation.docker.enable = true;
--- a/flake.lock
+++ b/flake.lock
@@ -9,16 +9,20 @@
          "devenv"
        ],
        "git-hooks": [
-          "devenv"
+          "devenv",
+          "git-hooks"
        ],
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "devenv",
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1742042642,
-        "narHash": "sha256-D0gP8srrX0qj+wNYNPdtVJsQuFzIng3q43thnHXQ/es=",
+        "lastModified": 1748883665,
+        "narHash": "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=",
        "owner": "cachix",
        "repo": "cachix",
-        "rev": "a624d3eaf4b1d225f918de8543ed739f2f574203",
+        "rev": "f707778d902af4d62d8dd92c269f8e70de09acbe",
        "type": "github"
      },
      "original": {
@@ -39,11 +43,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1743783972,
-        "narHash": "sha256-5wPsNCnWmeLpLxavsftA9L7tnYgtlexV7FwLegxtpy4=",
+        "lastModified": 1756048064,
+        "narHash": "sha256-mVgB6qWhLrCW6AciLyFXosDKKZFtBgqvixcA8a07s+g=",
        "owner": "cachix",
        "repo": "devenv",
-        "rev": "2f53e2f867e0c2ba18b880e66169366e5f8ca554",
+        "rev": "3fb20c149d329b01a2b519fbb2a9ca3e6e6e1b05",
        "type": "github"
      },
      "original": {
@@ -55,11 +59,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
        "type": "github"
      },
      "original": {
@@ -71,11 +75,11 @@
    "flake-compat_2": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
        "type": "github"
      },
      "original": {
@@ -93,11 +97,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1712014858,
-        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
        "type": "github"
      },
      "original": {
@@ -127,7 +131,8 @@
    "git-hooks": {
      "inputs": {
        "flake-compat": [
-          "devenv"
+          "devenv",
+          "flake-compat"
        ],
        "gitignore": "gitignore",
        "nixpkgs": [
@@ -136,11 +141,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742649964,
-        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+        "lastModified": 1750779888,
+        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
        "type": "github"
      },
      "original": {
@@ -178,11 +183,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1744172174,
-        "narHash": "sha256-Ud0ClYf8YHhbYmg1piPJx2iuYOh62HQiRzDObD2gzsk=",
+        "lastModified": 1756022458,
+        "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "4040c5779ce56d36805bc7a83e072f0f894eae7d",
+        "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740",
        "type": "github"
      },
      "original": {
@@ -191,62 +196,92 @@
        "type": "github"
      }
    },
-    "libgit2": {
-      "flake": false,
+    "home-manager_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-home",
+          "nixpkgs"
+        ]
+      },
      "locked": {
-        "lastModified": 1697646580,
-        "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
-        "owner": "libgit2",
-        "repo": "libgit2",
-        "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
+        "lastModified": 1750033262,
+        "narHash": "sha256-TcFN78w6kPspxpbPsxW/8vQ1GAtY8Y3mjBaC+oB8jo4=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "66523b0efe93ce5b0ba96dcddcda15d36673c1f0",
        "type": "github"
      },
      "original": {
-        "owner": "libgit2",
-        "repo": "libgit2",
+        "owner": "nix-community",
+        "repo": "home-manager",
        "type": "github"
      }
    },
    "nix": {
      "inputs": {
        "flake-compat": [
-          "devenv"
+          "devenv",
+          "flake-compat"
        ],
        "flake-parts": "flake-parts",
-        "libgit2": "libgit2",
-        "nixpkgs": "nixpkgs_2",
+        "git-hooks-nix": [
+          "devenv",
+          "git-hooks"
+        ],
+        "nixpkgs": [
+          "devenv",
+          "nixpkgs"
+        ],
        "nixpkgs-23-11": [
          "devenv"
        ],
        "nixpkgs-regression": [
          "devenv"
-        ],
-        "pre-commit-hooks": [
-          "devenv"
        ]
      },
      "locked": {
-        "lastModified": 1741798497,
-        "narHash": "sha256-E3j+3MoY8Y96mG1dUIiLFm2tZmNbRvSiyN7CrSKuAVg=",
-        "owner": "domenkozar",
+        "lastModified": 1755029779,
+        "narHash": "sha256-3+GHIYGg4U9XKUN4rg473frIVNn8YD06bjwxKS1IPrU=",
+        "owner": "cachix",
        "repo": "nix",
-        "rev": "f3f44b2baaf6c4c6e179de8cbb1cc6db031083cd",
+        "rev": "b0972b0eee6726081d10b1199f54de6d2917f861",
        "type": "github"
      },
      "original": {
-        "owner": "domenkozar",
-        "ref": "devenv-2.24",
+        "owner": "cachix",
+        "ref": "devenv-2.30",
        "repo": "nix",
        "type": "github"
      }
    },
+    "nix-home": {
+      "inputs": {
+        "home-manager": "home-manager_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1750825763,
+        "narHash": "sha256-gUtcO/8Bcw4YerJpSIRu+Q2MYKxWrtT+8Bp3Mh1Qfmw=",
+        "ref": "refs/heads/main",
+        "rev": "1ab1e4b9e610dcd40a3d728f377b6ac8a302d977",
+        "revCount": 26,
+        "type": "git",
+        "url": "https://gitea.john-stream.com/john/nix-home"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://gitea.john-stream.com/john/nix-home"
+      }
+    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1733212471,
-        "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
+        "lastModified": 1755615617,
+        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
+        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
        "type": "github"
      },
      "original": {
@@ -264,11 +299,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1743514126,
-        "narHash": "sha256-8zYFAsE4zlmc3MRZVLDBSHYF37posV+TxD6CNXqdxG0=",
+        "lastModified": 1755249745,
+        "narHash": "sha256-lDIbUfJ8xK62ekG+qojTlA1raHpKdScBTx8IFlQYx9U=",
        "owner": "cachix",
        "repo": "nixpkgs-python",
-        "rev": "40d2237867f219de1c1362e3d067a1673afa5f82",
+        "rev": "b6632af2db9f47c79dac8f4466388c7b1b6c3071",
        "type": "github"
      },
      "original": {
@@ -278,38 +313,6 @@
      }
    },
    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1717432640,
-        "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1744098102,
-        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
      "locked": {
        "lastModified": 1682134069,
        "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=",
@@ -327,7 +330,8 @@
      "inputs": {
        "devenv": "devenv",
        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_3",
+        "nix-home": "nix-home",
+        "nixpkgs": "nixpkgs",
        "nixpkgs-python": "nixpkgs-python",
        "sops-nix": "sops-nix",
        "vscode-server": "vscode-server"
@@ -340,11 +344,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1744103455,
-        "narHash": "sha256-SR6+qjkPjGQG+8eM4dCcVtss8r9bre/LAxFMPJpaZeU=",
+        "lastModified": 1754988908,
+        "narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "69d5a5a4635c27dae5a742f36108beccc506c1ba",
+        "rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
        "type": "github"
      },
      "original": {
@@ -371,14 +375,14 @@
    "vscode-server": {
      "inputs": {
        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1729422940,
-        "narHash": "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=",
+        "lastModified": 1753541826,
+        "narHash": "sha256-foGgZu8+bCNIGeuDqQ84jNbmKZpd+JvnrL2WlyU4tuU=",
        "owner": "nix-community",
        "repo": "nixos-vscode-server",
-        "rev": "8b6db451de46ecf9b4ab3d01ef76e59957ff549f",
+        "rev": "6d5f074e4811d143d44169ba4af09b20ddb6937d",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -18,6 +18,10 @@
      url = "github:cachix/devenv";
      inputs.nixpkgs.follows = "nixpkgs";
    };
+    nix-home = {
+      url = "git+https://gitea.john-stream.com/john/nix-home";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
  };

  nixConfig = {
@@ -25,14 +29,12 @@
    extra-substituters = "https://devenv.cachix.org";
  };

-  outputs = { self, ... }@args:
+  outputs = { self, ... }@inputs:
  let
    inherit (self) outputs;
-    nixosSystem = args.nixpkgs.lib.nixosSystem;
+    nixosSystem = inputs.nixpkgs.lib.nixosSystem;

    userSettings = {
-      gitUserName = "John Lancaster";
-      gitUserEmail = "32917998+jsl12@users.noreply.github.com";
      userName = "appdaemon";
      adHome = "/home/appdaemon";
    };
@@ -43,29 +45,26 @@
      system = "x86_64-linux";
      timeZone = "America/Chicago";
      locale = "en_US.UTF-8";
-      # pythonVersion = "3.11.10"; # This is largely irrelevant because uv will handle it
+      pythonVersion = "3.12"; # This is largely irrelevant because uv will handle it
    };

-    pkgs = args.nixpkgs.legacyPackages.${systemSettings.system};
+    pkgs = inputs.nixpkgs.legacyPackages.${systemSettings.system};

  in
  {
    nixosConfigurations.${systemSettings.hostName} = nixosSystem {
      system = systemSettings.system;
-      specialArgs =
-      let
-        inputs = args;
-      in
-      {
+      specialArgs = {
        inherit inputs;
        inherit systemSettings;
        inherit userSettings;
      };
      modules = [
-        (args.nixpkgs + "/nixos/modules/virtualisation/proxmox-lxc.nix")
-        args.home-manager.nixosModules.default
-        args.vscode-server.nixosModules.default
-        args.sops-nix.nixosModules.sops
+        (inputs.nixpkgs + "/nixos/modules/virtualisation/proxmox-lxc.nix")
+        inputs.home-manager.nixosModules.default
+        inputs.nix-home.nixosModules.default { user = "${userSettings.userName}"; }
+        inputs.vscode-server.nixosModules.default
+        inputs.sops-nix.nixosModules.sops
        ./configuration.nix
      ];
    };
@@ -76,18 +75,14 @@
      devenv-test = self.devShells.${systemSettings.system}.default.config.test;
    };

-    devShells.${systemSettings.system}.default =
-      let
-        inputs = args;
-      in
-      args.devenv.lib.mkShell {
+    devShells.${systemSettings.system}.default = inputs.devenv.lib.mkShell {
      inherit inputs pkgs;
      modules = [
        ({ pkgs, config, ... }: {
          # This is your devenv configuration

          # https://devenv.sh/reference/options/#pre-commithooks
-            pre-commit.hooks = {
+          git-hooks.hooks = {
            end-of-file-fixer.enable = true;
            trim-trailing-whitespace.enable = true;
          };
@@ -95,7 +90,7 @@
          # https://devenv.sh/supported-languages/python/
          languages.python = {
            enable = true;
-              # version = systemSettings.pythonVersion;
+            version = systemSettings.pythonVersion;
            uv = {
              enable = true;
              package = pkgs.uv;
@@ -127,7 +122,7 @@

          enterShell = ''
            alias fix="${pkgs.uv}/bin/uv run ruff check --fix"
-              # alias appdaemon="${pkgs.uv}/bin/uv run --frozen python -m appdaemon"
+            alias appdaemon="${pkgs.uv}/bin/uv run --frozen appdaemon"
            # alias ad="appdaemon"

            export PS1="\[\e[0;34m\](AppDaemon)\[\e[0m\] \[\033[1;32m\][\[\e]0;\u@\h: \w\a\]\u@\h:\w]\$\[\033[0m\] "
--- a/home-manager/git.nix
+++ b/home-manager/git.nix
@@ -1,12 +0,0 @@
-{ userSettings, ... }:
-{
-  programs.git = {
-    enable = true;
-    extraConfig.credential.helper = "store --file ~/.git-credentials";
-    userName = "${userSettings.gitUserName}";
-    userEmail = "${userSettings.gitUserEmail}";
-    extraConfig = {
-      safe.directory = "/home/appdaemon/ad-nix";
-    };
-  };
-}
--- a/home-manager/zsh.nix
+++ b/home-manager/zsh.nix
@@ -1,23 +0,0 @@
-{ ... }:
-{
-  programs.zsh = {
-    enable = true;
-    oh-my-zsh = {
-      enable = true;
-      # https://github.com/ohmyzsh/ohmyzsh/wiki/themes
-      # theme = "robbyrussell";
-      # theme = "simple";
-      theme = "risto";
-      plugins = [
-        "sudo"
-        "dotenv"
-        "git"
-        "ssh"
-        "ssh-agent"
-      ];
-    };
-    shellAliases = {
-      ls = "eza -lgs type -o --no-time";
-    };
-  };
-}
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -1,6 +1,7 @@
 { ... }:
 {
  imports = [
+    ./home-manager.nix
    ./docker
    ./services
  ];
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -9,28 +9,19 @@
  users.users.${userSettings.userName} = {
    isNormalUser = true;
    extraGroups = [ "wheel" "docker" ];
-    openssh.authorizedKeys.keyFiles = [ ../secrets/authorized_keys ];
-    shell = "${pkgs.zsh}/bin/zsh";
  };

  home-manager = {
    useGlobalPkgs = true;
-    users.${userSettings.userName} = { ... }: {
+    users.${userSettings.userName} = {
      home.stateVersion = systemSettings.stateVersion;
      home.homeDirectory = lib.mkForce "${userSettings.adHome}";
      systemd.user.startServices = "sd-switch"; # helps with handling systemd services when switching
-      imports = [
-        (import ./zsh.nix)
-        (import ./git.nix {inherit userSettings;})
-      ];
+      programs.gh.enable = true;
+      programs.git.extraConfig.safe.directory = "/home/appdaemon/ad-nix";
      home.packages = with pkgs; [
-        # Add any additional packages you want to install in your home directory
-        superfile
+        lazydocker
      ];
-      programs = {
-        ssh.enable = true;
-        gh.enable = true;
-      };
    };
  };
 }
--- a/nixos/services/telegraf.nix
+++ b/nixos/services/telegraf.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 let
-  influxURL = "http://panoptes.john-stream.com:8086";
+  influxURL = "https://influxdb.john-stream.com";
  organization = "homelab";
  bucket = "docker";
  token = "${builtins.readFile config.sops.secrets."telegraf_influx_token".path}";
@@ -41,7 +41,6 @@ in
          container_name_include = [];
          timeout = "5s";
          perdevice_include = ["cpu" "blkio" "network"];
-          total = false;
          docker_label_include = [];
        };
      };
--- a/scripts/default.nix
+++ b/scripts/default.nix
@@ -1,17 +1,9 @@
 { pkgs, systemSettings, ... }:
 {
  environment.systemPackages = with pkgs; [
-    (pkgs.writeShellScriptBin "nfs" ''
-      sudo nixos-rebuild switch --flake $(readlink -f /etc/nixos)#${systemSettings.hostName} --impure
-    '')
-    (pkgs.writeShellScriptBin "nfsu" ''
-      FLAKE=$(readlink -f /etc/nixos)
-      nix flake update --flake $FLAKE --impure
-      git -C $FLAKE add "$FLAKE/flake.lock" > /dev/null 2>&1
-      sudo nixos-rebuild switch --flake $FLAKE#${systemSettings.hostName} --impure
-    '')
    (pkgs.writeShellScriptBin "ads" "nix develop --no-pure-eval $(readlink -f /etc/nixos)")
    (pkgs.writeShellScriptBin "link-nix" "${builtins.readFile ./link-nix.sh}")
    (pkgs.writeShellScriptBin "sops-ad" "sops $(readlink -f /etc/nixos)/secrets/encrypted_secrets.yaml")
+    (pkgs.writeShellScriptBin "lola-up" "docker compose -f /conf/lola/docker-compose.yml up -d")
  ];
 }
Author	SHA1	Message	Date
John Lancaster	3e4dd6d1d2	pinned python 3.12	2025-08-25 22:10:04 -05:00
John Lancaster	4466e39a55	fixed telegraf	2025-06-19 13:54:06 -05:00
John Lancaster	ba912d0562	fixed extraPaths	2025-06-16 14:26:43 -05:00
John Lancaster	0b5a00afb6	moved home-manager	2025-06-16 14:23:54 -05:00
John Lancaster	367a21894e	using variable userName	2025-06-16 14:19:48 -05:00
John Lancaster	9bc1120795	flake update	2025-06-16 14:14:51 -05:00
John Lancaster	fc29989709	added lazydocker	2025-06-16 14:14:36 -05:00
John Lancaster	45840d962d	pruning	2025-06-16 14:14:28 -05:00
John Lancaster	fbda875a6f	restructuring for new nix-home flake	2025-06-16 14:05:08 -05:00
John Lancaster	83db5f51ce	renamed git-hooks to silence warning	2025-06-02 09:56:35 -05:00
John Lancaster	a501d9f4b1	flake updates	2025-06-02 09:54:39 -05:00