feat: use colima on Lithic

feat: add procps to Darwin baseline
chore: convert from podman to docker
2026-07-07 14:16:27 -05:00 · 2026-07-07 14:15:59 -05:00 · 2026-07-07 14:15:19 -05:00 · 2026-07-07 14:15:17 -05:00 · 2026-07-07 14:14:09 -05:00 · 2026-07-07 14:09:05 -05:00
13 changed files with 153 additions and 65 deletions
@@ -32,10 +32,38 @@ let
  };
 in
 {
-  environment.systemPackages = with pkgs; [
-    agenix
-    pkgs'.hms
-  ];
+  environment = {
+    launchDaemons = {
+      "limit.maxfiles.plist" = {
+        enable = true;
+        text = ''
+        <?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+        <plist version="1.0">
+          <dict>
+            <key>Label</key>
+            <string>limit.maxfiles</string>
+            <key>ProgramArguments</key>
+            <array>
+              <string>launchctl</string>
+              <string>limit</string>
+              <string>maxfiles</string>
+              <string>524288</string>
+              <string>524288</string>
+            </array>
+            <key>RunAtLoad</key>
+            <true/>
+          </dict>
+        </plist>
+        '';
+      };
+    };
+    systemPackages = with pkgs; [
+      agenix
+      pkgs'.hms
+      procps  # Includes tools like `watch`, `kill`, and `ps`
+    ];
+  };

  fonts.packages = with pkgs; [
    dejavu_fonts
@@ -11,6 +11,7 @@ in
    enable = true;
    brews = [
      "bitwarden-cli"
+      "colima"
      "direnv"
      "github-mcp-server"
      {
@@ -37,7 +38,6 @@ in
      "notion"
      "notunes"
      "onlyoffice"
-      "podman-desktop"
      "tabby"
      "zed"
    ];
@@ -31,11 +31,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1780652294,
-        "narHash": "sha256-pW0RrDJvj8EcbxXPxWVwMQ+x8LdEij3S3oB+inIUeKU=",
+        "lastModified": 1780813292,
+        "narHash": "sha256-auBqMf0ROzaSvdO6Ot/vxDzGswZs05sGYOZymi4/aAs=",
        "owner": "nix-community",
        "repo": "buildbot-nix",
-        "rev": "b16ef5c60459c94bd7f512977908c69b6e53b1e0",
+        "rev": "0c1190ae2c9518d7e7fb631c10a685e2fb83501e",
        "type": "github"
      },
      "original": {
@@ -95,11 +95,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1779036909,
-        "narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=",
+        "lastModified": 1780795403,
+        "narHash": "sha256-AkWx4Zt9pQbD/f82Z8N57+d0HGLN/rV3gdMKJTpBPKs=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "56c666e108467d87d13508936aade6d567f2a501",
+        "rev": "6a771120d607dcccb279a27d227650e324815c35",
        "type": "github"
      },
      "original": {
@@ -239,11 +239,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1780679734,
-        "narHash": "sha256-KmRNvpNOb7QEORa06bVgjW9kITcx0VhsI7w0vhmZyD8=",
+        "lastModified": 1780885330,
+        "narHash": "sha256-aMA5oAq2Iv467U9s8YOb50DYQT9w0WJbyWqwlzHuLMs=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "b2b7db486e06e098711dc291bb25db82850e1d16",
+        "rev": "4fe95527cbe952713318ada8a4d122e1a6ab120f",
        "type": "github"
      },
      "original": {
@@ -300,11 +300,11 @@
        "treefmt-nix": "treefmt-nix_2"
      },
      "locked": {
-        "lastModified": 1780530521,
-        "narHash": "sha256-728J4gTwpnug5C6QpnPbFyceYlfhPeX6SEP/K4PPbVs=",
+        "lastModified": 1780922506,
+        "narHash": "sha256-/JsYspjkvMXmtcHjZ9o4+rznCuI5RxruJ228TQN5slY=",
        "owner": "Mic92",
        "repo": "niks3",
-        "rev": "c9a54708e881d51a76309168c5cda516bb2daeb0",
+        "rev": "1be2c7feaa5f5d99136e148cb9458971b31b5a88",
        "type": "github"
      },
      "original": {
@@ -385,11 +385,11 @@
    },
    "nixpkgs-lib_2": {
      "locked": {
-        "lastModified": 1780195591,
-        "narHash": "sha256-/LAL+E75c0ioCHxyVFGwzXorfuHzToKgqPUCRq4RTIY=",
+        "lastModified": 1780800655,
+        "narHash": "sha256-eVQuIiDIy24NIAW+yEirKosWHFYAml6dghmevWgruBE=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "49d924421d7c3175edc499fdc738bd70d69d97d5",
+        "rev": "78afa8e310f34cba09443a5ef2fb47bfd21d294f",
        "type": "github"
      },
      "original": {
@@ -445,11 +445,27 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1780243769,
-        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
+        "lastModified": 1780747962,
+        "narHash": "sha256-IX7G1dlKrOqPOImfbo7ADDfV5yU1+j+MRChI3TL4tAA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1780749050,
+        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
+        "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
        "type": "github"
      },
      "original": {
@@ -459,7 +475,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_6": {
+    "nixpkgs_7": {
      "locked": {
        "lastModified": 1777207419,
        "narHash": "sha256-V3bmPWAajDiC+1ClDOp55gianW2EyRJSJOyu1RUQibc=",
@@ -477,11 +493,11 @@
    },
    "nixunstable": {
      "locked": {
-        "lastModified": 1780243769,
-        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
+        "lastModified": 1780749050,
+        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
+        "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
        "type": "github"
      },
      "original": {
@@ -494,17 +510,15 @@
    "nixvimunstable": {
      "inputs": {
        "flake-parts": "flake-parts_2",
-        "nixpkgs": [
-          "nixunstable"
-        ],
+        "nixpkgs": "nixpkgs_5",
        "systems": "systems_3"
      },
      "locked": {
-        "lastModified": 1780646548,
-        "narHash": "sha256-Ckyl/l1XBmEwnaHcHD8PvBZk1uph0NqwbJ//CAvB7iE=",
+        "lastModified": 1780884186,
+        "narHash": "sha256-ueTLp7DofvIZ0BXEWwi8AjP1cCsuEfO445dk6DtmfKc=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "816a15282e58678dde831477964987d0262d4293",
+        "rev": "82f2ec369eb597554a71ec82f33922d01b7dba8f",
        "type": "github"
      },
      "original": {
@@ -517,14 +531,14 @@
    "nurpkgs": {
      "inputs": {
        "flake-parts": "flake-parts_3",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1780789357,
-        "narHash": "sha256-YrZPqCwHzUYb+fbH9tp8T90x3pN37D7onc4X7+bzktc=",
+        "lastModified": 1780927127,
+        "narHash": "sha256-bnqVaMBjXP9yXyn09Y+ffCh+xl15ukiFZKeR5ikXdZM=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "55cbac785808e7e62aee241f5b789b8f5adb8e95",
+        "rev": "537e92f6133a889617f03a84f4d2741c5662f61a",
        "type": "github"
      },
      "original": {
@@ -622,11 +636,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1775636079,
-        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
+        "lastModified": 1780220602,
+        "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
+        "rev": "db947814a175b7ca6ded66e21383d938df01c227",
        "type": "github"
      },
      "original": {
@@ -658,14 +672,14 @@
    },
    "vsext": {
      "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_7"
      },
      "locked": {
-        "lastModified": 1780718391,
-        "narHash": "sha256-hQOS9bTTzVXQNYaW4bi2EyXN8jqDe7ge07xPPbvUMuA=",
+        "lastModified": 1780892930,
+        "narHash": "sha256-YjT3Kf3tEdh6LK7YtW1d3DP02mH+Cf331Xt8CDuBg9s=",
        "owner": "nix-community",
        "repo": "nix-vscode-extensions",
-        "rev": "e2ccd7477aa7174e34bd32c135dc470a3f822a82",
+        "rev": "ebd0101b03e316f3a62089335102d47e4bf65d5a",
        "type": "github"
      },
      "original": {
@@ -27,10 +27,7 @@
    niks3.url = "github:Mic92/niks3";
    nix-hardware.url = "github:nixos/nixos-hardware";
    nixpkgs-lib.url = "github:nix-community/nixpkgs.lib";
-    nixvimunstable = {
-      url = "github:nix-community/nixvim/main";
-      inputs.nixpkgs.follows = "nixunstable";
-    };
+    nixvimunstable.url = "github:nix-community/nixvim/main";
    nixunstable.url = "github:nixos/nixpkgs/nixos-unstable";
    nurpkgs.url = "github:nix-community/NUR";
    vsext.url = "github:nix-community/nix-vscode-extensions";
@@ -65,7 +62,10 @@
          config = {
            allowUnfree = true;
            allowUnfreePredicate = _: true;
-            permittedInsecurePackages = [ "ventoy-1.1.05" ];
+            permittedInsecurePackages = [
+              "ventoy-1.1.05"
+              "electron-39.8.10"
+            ];
          };
        }
      );
@@ -1,5 +1,5 @@
 # vim: set filetype=nushell :
-let servers = [isaiah jeremiah zeke genesis]
+let servers = [isaiah jeremiah zeke genesis hosea]

 def par-map [ items: list, c: closure ] {
  let results = $items | par-each -k $c
@@ -12,15 +12,15 @@ def --env unlock [] {
    }
 }

-def rebuild [] {
+def rebuild [ $target: string = "switch" ] {
    if (uname | get operating-system) == "Darwin" {
-        sudo darwin-rebuild switch
+        sudo darwin-rebuild $target
    } else {
        let hostname = uname | get nodename
        let build = ^nom build --keep-going $"/etc/nixos#nixosConfigurations.($hostname).config.system.build.toplevel"
        if $env.LAST_EXIT_CODE == 0 {
            nvd diff /run/current-system result
-            run0 result/bin/switch-to-configuration switch
+            run0 result/bin/switch-to-configuration $target
        } else {
            print "Error during build"
        }
@@ -69,13 +69,6 @@ def dc [ $cmd: string = "sh" ] {
    }
 }

-def claude [ ] {
-    unlock
-    $env.GITLAB_TOKEN = ^bw get item 7d3da4e9-5f9a-49d0-8e14-b39c010a4001 | from json | get fields | find claudeapi | get value
-    #$env.ANTHROPIC_API_KEY = ^bw get item e122fd08-3506-4f21-9c6a-b42b00fe5be1 | from json | get login.password
-    ^claude
-}
-
 if ("/usr/local/bin" | path exists) {
    $env.PATH = $env.PATH | append "/usr/local/bin"
 }
@@ -23,6 +23,7 @@
    mattermost-desktop
    minio-client
    mumble
+    nix-index
    pre-commit
    prismlauncher
    restic
@@ -1,5 +1,6 @@
 {
  pkgs,
+  pkgs',
  lib,
  username,
  ...
@@ -20,6 +21,7 @@
      claude-code
      direnv
      home-manager
+      pkgs'.dockerCompat
      python3Packages.ipython
      just
      glab
@@ -48,6 +50,10 @@
        ignore-error-codes = [403]
      '';
    };
+    sessionVariables = {
+      BW_GITLAB_ITEM = "7d3da4e9-5f9a-49d0-8e14-b39c010a4001";
+      BW_ANTHROPIC_ITEM = "e122fd08-3506-4f21-9c6a-b42b00fe5be1";
+    };
    username = username;
    homeDirectory = "/Users/${username}";
  };
@@ -1,5 +1,6 @@
 {
  pkgs,
+  pkgs',
  lib,
  ...
 }:
@@ -28,14 +29,15 @@ in
      cargo
      clippy
      direnv
+      docker
+      docker-compose
+      docker-buildx
      go
      home-manager
      just
      mcp-grafana
      nil
      nixVersions.stable
-      podman
-      podman-compose
      poetry
      pre-commit
      (pulumi.withPackages (
@@ -77,6 +77,7 @@ in

      programs.firefox = {
        enable = true; # (!pkgs.stdenv.hostPlatform.isDarwin);
+        configPath = if pkgs.stdenv.hostPlatform.isDarwin then "${config.home.homeDirectory}/Library/Application Support/Firefox" else "${config.xdg.configHome}/mozilla/firefox";
        package = pkgs.firefox-bin;
        policies = {
          DisableAppUpdate = true;
@@ -316,6 +316,26 @@
                name = "Buildbot";
                url = "http://jeremiah.shire-zebra.ts.net:8010/";
              }
+              {
+                name = "Garage WebUI";
+                url = "http://nas1.shire-zebra.ts.net:30186/";
+              }
+              {
+                name = "Garage RPC";
+                url = "http://nas1.shire-zebra.ts.net:30187/";
+              }
+              {
+                name = "Garage S3 API";
+                url = "http://nas1.shire-zebra.ts.net:30188/";
+              }
+              {
+                name = "Garage S3 Web";
+                url = "http://nas1.shire-zebra.ts.net:30189/";
+              }
+              {
+                name = "Garage Admin";
+                url = "http://nas1.shire-zebra.ts.net:30190/";
+              }
            ];
          }
          {
@@ -415,8 +435,8 @@
            url = "http://nas1.shire-zebra.ts.net:30025/";
          }
          {
-            name = "Transmission";
-            url = "http://nas1.shire-zebra.ts.net:30096/";
+            name = "Deluge";
+            url = "http://nas1.shire-zebra.ts.net:30038/";
          }
        ];
      }
@@ -14,6 +14,7 @@ let
    url = "https://github.com/fluxcd/flux2/releases/download/v2.7.2/install.yaml";
    sha256 = "sha256-Qs1qJmgZm8q9xZsORjT/N/wzpbWVVODXtzDpjnAYMuQ=";
  };
+  keepaliveIp = "10.42.5.1";
 in
 {
  options.greg = {
@@ -95,6 +96,7 @@ in
          "--supervisor-metrics=true"
          "--tls-san ${config.networking.hostName}.thehellings.lan"
          "--tls-san ${config.networking.hostName}.shire-zebra.ts.net"
+          "--tls-san ${keepaliveIp}"
        ];
        manifests = {
          cert-manager.source = cert-manager;
@@ -116,7 +118,7 @@ in
          state = if (config.networking.hostName == "isaiah") then "MASTER" else "BACKUP";
          virtualIps = [
            {
-              addr = "10.42.5.1/16";
+              addr = "${keepaliveIp}/16";
              dev = cfg.vipInterface;
            }
          ];
@@ -122,6 +122,21 @@
      "external": true,
      "system": "x86_64-linux"
    },
+    "pve2": {
+      "external": true,
+      "ip": "10.42.1.15",
+      "system": "x86_64-linux"
+    },
+    "pve3": {
+      "external": true,
+      "ip": "10.42.1.16",
+      "system": "x86_64-linux"
+    },
+    "pve4": {
+      "external": true,
+      "ip": "10.42.1.17",
+      "system": "x86_64-linux"
+    },
    "wsl": {
      "external": true,
      "system": "aarch64-linux"
@@ -16,6 +16,12 @@ let
    adblock_update = c ./adblock_update.nix { };
    brew = c ./homebrew.nix { };
    create_ssl = c ./create_ssl.nix { };
+    dockerCompat = pkgs.runCommand "docker-compat" {
+      nativeBuildInputs  = [];
+    } ''
+      mkdir -p $out/bin
+      ln -s ${pkgs.podman}/bin/podman $out/bin/docker
+    '';
    gcc-tune = c ./gcc-tune.nix { };
    #gen-build = c ./gen-build { };
    hms = c ./hms { };
Author	SHA1	Message	Date
Greg Hellings	a145f6ca43	feat: use colima on Lithic buildbot/nix-eval Build done. (10 warnings) Details buildbot/nix-build Build done. Details buildbot/nix-effects Build done. Details	2026-07-07 14:16:27 -05:00
Greg Hellings	f77f46c4e5	feat: add procps to Darwin baseline	2026-07-07 14:15:59 -05:00
Greg Hellings	c2ea5ff472	chore: convert from podman to docker	2026-07-07 14:15:19 -05:00
Greg Hellings	0e972936d3	chore: update macOS settings	2026-07-07 14:15:17 -05:00
Greg Hellings	b35004a3ad	chore: add ulimit raise to Darwin	2026-07-07 14:14:09 -05:00
Greg Hellings	d7e98290c3	chore: add new pve hosts buildbot/nix-eval Build done. (10 warnings) Details buildbot/nix-build Build done. Details buildbot/nix-effects Build done. Details	2026-07-07 14:09:05 -05:00
Greg Hellings	f5922887bf	chore: clean up IP name duplication	2026-07-07 14:08:48 -05:00
Greg Hellings	879230dca7	feat: add nix-index to Exodus	2026-06-26 11:08:43 -05:00
Greg Hellings	1c7e2ff268	feat: rebuild optional targets	2026-06-24 12:49:32 -05:00
Greg Hellings	b324ee5352	chore: update bookmarks	2026-06-15 22:43:24 -05:00
Greg Hellings	d21cbcb85d	feat: podman compat also on mbp buildbot/nix-eval Build done. (10 warnings) Details buildbot/nix-build Build done. Details buildbot/nix-effects Build done. Details	2026-06-11 13:13:43 -05:00
Greg Hellings	6a0c87b77d	feat: add dockerCompat package from podman buildbot/nix-eval Build done. (10 warnings) Details buildbot/nix-build Build done. Details buildbot/nix-effects Build done. Details	2026-06-11 09:20:19 -05:00
Greg Hellings	db5ef17dba	chore: bump flake version buildbot/nix-eval Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.nixos-proxmoxtemplate Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.nixos-genesis Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.nixos-icdm-root Build done. Details buildbot/nix-build gitea:greg/nixos#checks.x86_64-linux.nixos-hosea Build done. Details buildbot/nix-build Build done. Details buildbot/nix-effects Build done. Details	2026-06-08 11:28:56 -05:00
Greg Hellings	251f2804c6	chore: transmission to deluge	2026-06-08 11:18:12 -05:00