From a5f9b67d2a24b64649799eb04b7c1de650e50951 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Sat, 1 Aug 2026 21:37:53 -0400 Subject: [PATCH 1/4] ran nix flake update, got new brew version --- flake.lock | 146 ++++++++++++++++++++--------------------------------- 1 file changed, 56 insertions(+), 90 deletions(-) diff --git a/flake.lock b/flake.lock index 6743ab39..e2a4e82b 100644 --- a/flake.lock +++ b/flake.lock @@ -35,16 +35,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1784068757, - "narHash": "sha256-7KnV7rTlMpys+2J+TFVxUDDyKPLXFs4wIMtckMC72VM=", + "lastModified": 1785146564, + "narHash": "sha256-Sa7/HrfB04H32OJ7/ofxXjiZEbkWtCNOriONYYTL1OA=", "owner": "Homebrew", "repo": "brew", - "rev": "6bd951d96e7ebc54787799dba77bfb26ec956c4c", + "rev": "b2cfc03346d482f79886de108fee5dc49a6efc10", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "6.0.11", + "ref": "6.0.13", "repo": "brew", "type": "github" } @@ -111,15 +111,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1764114543, - "narHash": "sha256-+C39E8qmGODT6eB0rhE/VX+DcekXW/Xww5IL/xlERNY=", + "lastModified": 1785105427, + "narHash": "sha256-2fBillHndQn/eHOAkDttCxRygc6f6BzhRzIY4q0TKMg=", "owner": "astro", "repo": "deadnix", - "rev": "d590041677add62267bef35ddec63cd9402d3505", + "rev": "4fc88a77cf436e9671dea4b28d1aab37a75f6ea2", "type": "github" }, "original": { @@ -134,14 +133,14 @@ "nixpkgs": [ "nixpkgs" ], - "utils": "utils_2" + "utils": "utils" }, "locked": { - "lastModified": 1781627888, - "narHash": "sha256-5yHuAh9k7rT7rtf3uRaXkiUyYvQE9oaCgzhprLm2mr8=", + "lastModified": 1785518313, + "narHash": "sha256-anlq3YQDCsNrkNlu3HTg4dEIpRugwnyAVUxoPcBmA/U=", "owner": "serokell", "repo": "deploy-rs", - "rev": "6d3087eedff75a715b40c0e124ba15d2dd7bec28", + "rev": "b974715a27b49fadbf3bf6d85e26bcb3109daa6d", "type": "github" }, "original": { @@ -406,7 +405,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -602,11 +601,11 @@ ] }, "locked": { - "lastModified": 1784350909, - "narHash": "sha256-ZWyzLbS1yKUTeFJLmdVuWNnHttL333/ldJbEE+KzCrM=", + "lastModified": 1785119570, + "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=", "owner": "nix-community", "repo": "home-manager", - "rev": "4ce190229c73d44536caa7072f6308fb2d8feeb3", + "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d", "type": "github" }, "original": { @@ -648,11 +647,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1784439141, - "narHash": "sha256-vRs+cWjVgvPdn9mjFIUd0IwlcoMhGBGrEw7zTGZrMro=", + "lastModified": 1785388697, + "narHash": "sha256-T45hq3Ggyl5q3ZkkYTGYCIACJEdXiIYD1BYW2teOjk8=", "owner": "numtide", "repo": "nix-auth", - "rev": "47b39a56d7ef5ca7db5320aa4aac90435e07bda3", + "rev": "4623a0c5a733ae1c881a03e5190a4b249861e998", "type": "github" }, "original": { @@ -702,11 +701,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1784159664, - "narHash": "sha256-I/B6YoRLImHEqNWh8bs+tPjEDeteACeFhcLyoSMo1GE=", + "lastModified": 1785544760, + "narHash": "sha256-qV6OoNuly4ntqpCg7esIeJjUboxSnQNlLPxz+y5h9/o=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "842eeb863ecca0eeb463f7a814cdc51e1d925776", + "rev": "937ce52c7d046310571f3a070713804ead496843", "type": "github" }, "original": { @@ -808,11 +807,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1784099966, - "narHash": "sha256-h+q9j0ivHhll0sXIPCuJJ+Ivcqh7QDL8eulVUl+CqTQ=", + "lastModified": 1785356851, + "narHash": "sha256-UYKTcayxYPE3yIruCv525WMbcYDLlkv79bRfkOuFNLs=", "owner": "nix-community", "repo": "nixos-anywhere", - "rev": "7239104f1a38546b999cd817658407d80f56e7db", + "rev": "5887f1c72fbf0e88000716237194de414d2299ee", "type": "github" }, "original": { @@ -851,11 +850,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1784310968, - "narHash": "sha256-rkSPTePrKqs4dg+i7ZFCq93+HrClac6oSwXX927SVjA=", + "lastModified": 1785232496, + "narHash": "sha256-65EQYIRRpTdpH8lUiB6Mvo5uBkG60aBIzAJuALfx+O0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "779c32a00155994c86cde8213a8dd4df139d4355", + "rev": "2e790b0a6be8ec2b76174ac0931b8ff11919ec98", "type": "github" }, "original": { @@ -877,11 +876,11 @@ ] }, "locked": { - "lastModified": 1783593136, - "narHash": "sha256-zy5an02BdZ65OgVKdRkz2TpbdBrsW+uQD7AA2wLuiTM=", + "lastModified": 1784802994, + "narHash": "sha256-4PcD0Ibzdkh85G+70w5dLlR9YgQ2bmNIjiPPMSzO57w=", "owner": "nix-community", "repo": "nixos-images", - "rev": "803f28511c7d5f39f2537c342122fd94b8e1d519", + "rev": "6ece16b0c97986fe085122e796044add4cc3ff64", "type": "github" }, "original": { @@ -924,11 +923,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1784434257, - "narHash": "sha256-Feyvs5OkNaiG2ymUdOxWirTy9/HPJopywhnwlBIAPiY=", + "lastModified": 1785602337, + "narHash": "sha256-lWfCgeR+zfKOm8i4uqxCD47j5f753izd1d96/d9hTd4=", "owner": "nvmd", "repo": "nixos-raspberrypi", - "rev": "2bbb6ee54ed431a59b38d8aa1e254a9e848b7f2b", + "rev": "67616c24ed74573750f4864abfc358296a077466", "type": "github" }, "original": { @@ -939,11 +938,11 @@ }, "nixos-stable": { "locked": { - "lastModified": 1784011430, - "narHash": "sha256-lDebytrYdd47IBLwvNOD+6AGeoqZ78CIKlp70hzW280=", + "lastModified": 1785133411, + "narHash": "sha256-Yjv0WEg39KRYS0rBdTbu6Fc/or/ihAKk13W9sQ6VWd0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eeec934ae0dbeca3d7868c059568a65c08b2fc3", + "rev": "2f5a153c270b70cb0f8c11f46d96d6d3bc39f4e3", "type": "github" }, "original": { @@ -986,11 +985,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1784555310, - "narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=", + "lastModified": 1785542685, + "narHash": "sha256-sjfvXMbG5pCFgpvw2OZAFcZiTvrppCWvnB6cuGrSY08=", "owner": "nixos", "repo": "nixpkgs", - "rev": "421eebfd0ec7bccd4abe826ce62d7e6e83129493", + "rev": "f8e81fc7eb063db454f563cdd596fb96a5ad1497", "type": "github" }, "original": { @@ -1031,11 +1030,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1784280462, - "narHash": "sha256-DtoqIqM7VkR6NxAkcLpMwmi02USwWb3JdmNGLyhthc0=", + "lastModified": 1785491804, + "narHash": "sha256-p00vplVOyfKGlhju0+eGGPAxyYYKaY0lpyuoHLFIx2Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "293d6abedf0478e681a4dfcfcb35b30fc796a32f", + "rev": "5b4f72e1705a63aace42900610c4db82cb4af0ec", "type": "github" }, "original": { @@ -1047,11 +1046,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1784432872, - "narHash": "sha256-n3gKTBIV4ZA5VQpUakffBe3KGu4+mhPoA34rrqS0GkA=", + "lastModified": 1785491804, + "narHash": "sha256-p00vplVOyfKGlhju0+eGGPAxyYYKaY0lpyuoHLFIx2Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fd1462031fdee08f65fd0b4c6b64e22239a77870", + "rev": "5b4f72e1705a63aace42900610c4db82cb4af0ec", "type": "github" }, "original": { @@ -1281,11 +1280,11 @@ ] }, "locked": { - "lastModified": 1784546415, - "narHash": "sha256-uGguGzFhFbzdC46Uwiu+8V7a/VPMdt8VU04HHcVOTcQ=", + "lastModified": 1785198005, + "narHash": "sha256-falBPi+PJtMx0vwII8L24wjDGXNZMwRiVXsw8WTXLEo=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "9e3c3510ced1cb278e3522a6a0f6fe302cc805eb", + "rev": "d357b9f048c5532ec81b0e0034c0b8463d5ddd46", "type": "gitlab" }, "original": { @@ -1418,31 +1417,16 @@ "type": "github" } }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1784369104, - "narHash": "sha256-47cxbcZODibHv3rELFQ9vZly0vUNkND/atn/U7HLeb0=", + "lastModified": 1785360170, + "narHash": "sha256-XE1lKgQ3eIO3E7zWryqcRsax+mYXod/5RHBn4YaR9YE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "df3c0640565d04a0261253cdd89fce78ec50168a", + "rev": "d1187f8bc71fb8aab02395869ec3f5c1920f75c0", "type": "github" }, "original": { @@ -1459,11 +1443,11 @@ ] }, "locked": { - "lastModified": 1780220602, - "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", + "lastModified": 1784369104, + "narHash": "sha256-47cxbcZODibHv3rELFQ9vZly0vUNkND/atn/U7HLeb0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "db947814a175b7ca6ded66e21383d938df01c227", + "rev": "df3c0640565d04a0261253cdd89fce78ec50168a", "type": "github" }, "original": { @@ -1484,7 +1468,7 @@ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1770377964, @@ -1519,24 +1503,6 @@ "type": "github" } }, - "utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "viscosity-cli": { "inputs": { "flake-utils": "flake-utils_3", From f3c8ed2e8f3e9dafde7943478129e85859c897dd Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Sat, 1 Aug 2026 21:38:26 -0400 Subject: [PATCH 2/4] fixed bug in loading of oh-my-posh --- modules/genebean/home/programs/zsh.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/genebean/home/programs/zsh.nix b/modules/genebean/home/programs/zsh.nix index 62ecadb5..4dc33a88 100644 --- a/modules/genebean/home/programs/zsh.nix +++ b/modules/genebean/home/programs/zsh.nix @@ -134,10 +134,10 @@ in # ─── Darwin ─────────────────────────────────────────────────────────── // lib.optionalAttrs genebeanLib.isDarwin { currentwifi = "networksetup -getairportnetwork en0 |cut -d ':' -f2- | cut -d ' ' -f2-"; - nixup = "sudo darwin-rebuild switch --flake ~/repos/dots"; + nixup = "sudo darwin-rebuild switch --flake ~/repos/dots && exec zsh"; uwgconnect = "networksetup -setairportnetwork en0 SecureWest"; uwgforget = "networksetup -removepreferredwirelessnetwork en0 SecureWest"; - ykey = "pkill -9 gpg-agent && source ~/.zshrc; ssh-add -L"; + ykey = "pkill -9 gpg-agent && zsh -ic 'ssh-add -L'; exec zsh"; } # ─── Linux (all Linux) ──────────────────────────────────────────────── // lib.optionalAttrs pkgs.stdenv.isLinux { @@ -146,15 +146,15 @@ in # ─── NixOS ──────────────────────────────────────────────────────────── // lib.optionalAttrs genebeanLib.isNixOS { nixboot = "sudo nixos-rebuild boot --flake ~/repos/dots && echo 'Time to reboot!'"; - nixup = "sudo nixos-rebuild switch --flake ~/repos/dots"; + nixup = "sudo nixos-rebuild switch --flake ~/repos/dots && exec zsh"; nixroutes = "cd ~/repos/dots && echo '=== Current Routes ===' && ip route show && ip -6 route show && echo '' && echo '=== New Build Routes ===' && nix eval --json '.#nixosConfigurations.${hostname}.config.systemd.network.networks.\"10-wan\".routes'"; uwgconnect = "nmcli dev wifi connect SecureWest password"; uwgforget = "nmcli connection delete SecureWest"; - ykey = "sudo systemctl restart pcscd && sudo pkill -9 gpg-agent && source ~/.zshrc; ssh-add -L"; + ykey = "sudo systemctl restart pcscd && sudo pkill -9 gpg-agent && zsh -ic 'ssh-add -L'; exec zsh"; } # ─── HM-only (non-NixOS Linux) ──────────────────────────────────────── // lib.optionalAttrs genebeanLib.isHMOnly { - nixup = "nix run ~/repos/dots#system-manager -- switch --sudo --flake ~/repos/dots#${username}-${system} && home-manager switch --flake ~/repos/dots#${username}-${system}"; + nixup = "nix run ~/repos/dots#system-manager -- switch --sudo --flake ~/repos/dots#${username}-${system} && home-manager switch --flake ~/repos/dots#${username}-${system} && exec zsh"; }; }; }; From 67c78a0bdc9dbf53f122fae74e0e65ac54d65f52 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Sat, 1 Aug 2026 21:39:03 -0400 Subject: [PATCH 3/4] Manage displaylink again --- modules/hosts/darwin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hosts/darwin/default.nix b/modules/hosts/darwin/default.nix index 804dd74e..cf4781a1 100644 --- a/modules/hosts/darwin/default.nix +++ b/modules/hosts/darwin/default.nix @@ -50,7 +50,7 @@ "appcleaner" "balenaetcher" "bartender" - #"displaylink" + "displaylink" "font-hack-nerd-font" "font-inconsolata-g-for-powerline" "font-source-code-pro-for-powerline" From 44507e579fd16adfff7bc6e538cf57ae1ba8490f Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Sat, 1 Aug 2026 21:39:19 -0400 Subject: [PATCH 4/4] install dnclient for nebula --- modules/hosts/darwin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/hosts/darwin/default.nix b/modules/hosts/darwin/default.nix index cf4781a1..ee59ddb5 100644 --- a/modules/hosts/darwin/default.nix +++ b/modules/hosts/darwin/default.nix @@ -51,6 +51,7 @@ "balenaetcher" "bartender" "displaylink" + "dnclient" "font-hack-nerd-font" "font-inconsolata-g-for-powerline" "font-source-code-pro-for-powerline"