update nixpkgs and add pi

fix session switching (using cli actions)
switch font to maple mono
2026-04-17 00:09:46 +00:00 · 2026-04-08 10:58:51 -04:00 · 2026-04-04 10:50:07 -04:00 · 2026-04-04 10:50:07 -04:00 · 2026-04-04 10:50:07 -04:00 · 2026-04-04 05:14:31 +00:00
9 changed files with 92 additions and 30 deletions
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -0,0 +1,8 @@
+{
+  "permissions": {
+    "allow": [
+      "WebFetch(domain:github.com)",
+      "WebFetch(domain:raw.githubusercontent.com)"
+    ]
+  }
+}
--- a/flake.lock
+++ b/flake.lock
@@ -28,11 +28,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773000227,
-        "narHash": "sha256-zm3ftUQw0MPumYi91HovoGhgyZBlM4o3Zy0LhPNwzXE=",
+        "lastModified": 1775037210,
+        "narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "da529ac9e46f25ed5616fd634079a5f3c579135f",
+        "rev": "06648f4902343228ce2de79f291dd5a58ee12146",
        "type": "github"
      },
      "original": {
@@ -197,11 +197,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1774007980,
-        "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=",
+        "lastModified": 1775622785,
+        "narHash": "sha256-/yFxO+7oS1SymDfJ2iVO7K5vJKcYfe9XGIJ+quLqz0Q=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "9670de2921812bc4e0452f6e3efd8c859696c183",
+        "rev": "527e47b78fe67213072f706bf933a9705a8c4974",
        "type": "github"
      },
      "original": {
@@ -409,11 +409,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1773821835,
-        "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
+        "lastModified": 1775423009,
+        "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
+        "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9",
        "type": "github"
      },
      "original": {
@@ -447,11 +447,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1774067930,
-        "narHash": "sha256-p8Dyrxb5VQH5WAoKPJoRKKgYtuPinnVDWQlfhcBs0O4=",
+        "lastModified": 1775654726,
+        "narHash": "sha256-4R6Bc5EIQ+HxVte1Mo1B3OkyYFVmehywOPiH3Z9CAIU=",
        "owner": "nix-community",
        "repo": "nur",
-        "rev": "08e7d1fc8fc15731a4d6a664207e18828fe028cb",
+        "rev": "c73a8885bd1bb5d329e16a4512e2c2708c5981a7",
        "type": "github"
      },
      "original": {
@@ -483,11 +483,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1774062094,
-        "narHash": "sha256-ba3c+hS7KzEiwtZRGHagIAYdcmdY3rCSWVCyn64rx7s=",
+        "lastModified": 1775617983,
+        "narHash": "sha256-2NWGA/I4j/qlx6qbg86QvJiK1/GyH9gnf0hFiARWVwE=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "c807e83cc2e32adc35f51138b3bdef722c0812ab",
+        "rev": "d98b91b1feae7ef07fa2ccb3aa3f83f11abfae54",
        "type": "github"
      },
      "original": {
@@ -615,11 +615,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1773882647,
-        "narHash": "sha256-VzcOcE0LLpEnyoxLuMuptZ9ZWCkSBn99bTgEQoz5Viw=",
+        "lastModified": 1774972752,
+        "narHash": "sha256-DnLIpFxznohpLkIFs390uZ0gxwkVyhtknhKNu+lQJK8=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "fd0eae98d1ecee31024271f8d64676250a386ee7",
+        "rev": "d97e078f4788cddb8d11c3c99f72a4bb9ddec221",
        "type": "github"
      },
      "original": {
--- a/platforms/home-manager/modules/nmasur/presets/fonts.nix
+++ b/platforms/home-manager/modules/nmasur/presets/fonts.nix
@@ -17,23 +17,27 @@ in
    home.packages = [
      pkgs.nerd-fonts.victor-mono # Used for Vim and Terminal
      pkgs.nerd-fonts.hack # For Polybar, Rofi
+
+      # Maple Mono NF (Ligature unhinted)
+      pkgs.maple-mono.NF-unhinted
    ];
    fonts.fontconfig = {
      enable = true;
-      defaultFonts.monospace = [ "Victor Mono" ];
+      defaultFonts.monospace = [ "Maple Mono NF" ];
    };

    xsession.windowManager.i3.config.fonts = {
-      names = [ "pango:Victor Mono" ];
+      # names = [ "pango:Victor Mono" ];
+      names = [ "pango:Maple Mono" ];
      # style = "Regular";
      # size = 11.0;
    };
    services.polybar.config."bar/main".font-0 = "Hack Nerd Font:size=10;2";
    programs.rofi.font = "Hack Nerd Font 14";
-    programs.alacritty.settings.font.normal.family = "VictorMono";
-    programs.kitty.font.name = "VictorMono Nerd Font Mono";
-    nmasur.presets.programs.wezterm.font = "VictorMono Nerd Font Mono";
-    programs.ghostty.settings.font-family = "VictorMono Nerd Font Mono";
+    programs.alacritty.settings.font.normal.family = "Maple Mono NF";
+    programs.kitty.font.name = "Maple Mono NF";
+    nmasur.presets.programs.wezterm.font = "Maple Mono NF";
+    programs.ghostty.settings.font-family = "Maple Mono NF";
    services.dunst.settings.global.font = "Hack Nerd Font 14";
  };
 }
--- a/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix
+++ b/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix
@@ -15,7 +15,7 @@ let
      return 1
    fi
    echo "$ZELLIJ_SESSION_NAME" > ~/.local/state/zellij-last-session
-    zellij pipe --plugin file:$(which zellij-switch.wasm) -- "--session $TARGET_SESSION"
+    ${lib.getExe pkgs.zellij} action switch-session $TARGET_SESSION
  '';
 in

@@ -42,13 +42,13 @@ in
                return 1
              end
              echo "$ZELLIJ_SESSION_NAME" > ~/.local/state/zellij-last-session
-              zellij pipe --plugin file:$(which zellij-switch.wasm) -- "--cwd $TARGET_DIR --layout default --session $(basename $TARGET_DIR)"
+              ${lib.getExe pkgs.zellij} action switch-session $(basename $TARGET_DIR) --cwd $TARGET_DIR --layout default
            '';
        };
        gh-run = {
          body = # fish
            ''
-              zellij action new-pane --start-suspended -- gh run watch
+              ${lib.getExe pkgs.zellij} action new-pane --start-suspended -- gh run watch
            '';
        };
      };
@@ -143,8 +143,8 @@ in
                _args =
                  if pkgs.stdenv.isDarwin then
                    [
-                      "env"
-                      "PATH=/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin"
+                      # "env"
+                      # "PATH=/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin"
                      (lib.getExe zellij-switch-to-last)
                    ]
                  else
--- a/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/Spoons/HideZoomWindow.spoon/init.lua
+++ b/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/Spoons/HideZoomWindow.spoon/init.lua
@@ -0,0 +1,45 @@
+--- === Hide Zoom Window ===
+-- Credit: https://news.ycombinator.com/item?id=47369091
+
+local obj = {}
+obj.__index = obj
+
+-- Metadata
+obj.name = "HideZoomWindow"
+obj.version = "0.1"
+
+function obj:init()
+    -- Hide Zoom's "share" windows so it doesn't come back on ESC keypress
+    local zoomWindow = nil
+    local originalFrame = nil
+
+    hs.hotkey.bind({"cmd", "ctrl", "alt"}, "H", function()
+      print("> trying to hide zoom")
+      if not zoomWindow then
+        print(">  looking for window")
+        zoomWindow = hs.window.find("zoom share statusbar window")
+      end
+
+      if zoomWindow then
+        print(">  found window")
+        if originalFrame then
+          print(">    restoring")
+          zoomWindow:setFrame(originalFrame)
+          originalFrame = nil
+          zoomWindow = nil
+        else
+          print(">    hiding")
+          originalFrame = zoomWindow:frame()
+          local screen = zoomWindow:screen()
+          local frame = zoomWindow:frame()
+          frame.x = screen:frame().w + 99000
+          frame.y = screen:frame().h + 99000
+          zoomWindow:setFrame(frame)
+        end
+      else
+        print(">  window not found")
+      end
+    end)
+end
+
+return obj
--- a/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/default.nix
+++ b/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/default.nix
@@ -29,6 +29,7 @@ in
          zed = "${config.programs.zed-editor.package}/Applications/Zed.app";
        };
    xdg.configFile."hammerspoon/Spoons/MoveWindow.spoon".source = ./Spoons/MoveWindow.spoon;
+    xdg.configFile."hammerspoon/Spoons/HideZoomWindow.spoon".source = ./Spoons/HideZoomWindow.spoon;

    home.activation.reloadHammerspoon = config.lib.dag.entryAfter [ "writeBoundary" ] ''
      $DRY_RUN_CMD /Applications/Hammerspoon.app/Contents/Frameworks/hs/hs -c "hs.reload()"
--- a/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/init.lua
+++ b/platforms/home-manager/modules/nmasur/presets/services/hammerspoon/init.lua
@@ -3,3 +3,4 @@ hs.loadSpoon("ControlEscape"):start() -- Load Hammerspoon bits from https://gith
 hs.loadSpoon("Launcher"):init()
 hs.loadSpoon("DismissAlerts"):init()
 hs.loadSpoon("MoveWindow"):init()
+hs.loadSpoon("HideZoomWindow"):init()
--- a/platforms/home-manager/modules/nmasur/profiles/experimental.nix
+++ b/platforms/home-manager/modules/nmasur/profiles/experimental.nix
@@ -31,8 +31,9 @@ in
      pkgs.comma # Nix-index auto-launch
      pkgs.nix-inspect # TUI for browsing Nix configs

-      pkgs.crush # AI LLM Agent
+      # pkgs.crush # AI LLM Agent
      pkgs.gemini-cli # AI LLM Agent
+      pkgs.pi-coding-agent # AI LLM Agent

    ];

--- a/platforms/home-manager/modules/nmasur/profiles/work.nix
+++ b/platforms/home-manager/modules/nmasur/profiles/work.nix
@@ -21,6 +21,8 @@ in
    ];

    home.packages = [
+      pkgs.actionlint # Lint for GitHub Actions Workflows
+      pkgs.claude-code # AI LLM Agent
      pkgs.stable.visidata # CSV inspector
      pkgs.dos2unix # Convert Windows text files
      pkgs.inetutils # Includes telnet
Author	SHA1	Message	Date
Noah Masur	a2a429d286	update nixpkgs and add pi	2026-04-08 10:58:51 -04:00
Noah Masur	7f5b5eb809	fix session switching (using cli actions)	2026-04-04 10:50:07 -04:00
Noah Masur	f5f3a8336e	switch font to maple mono	2026-04-04 10:50:07 -04:00
Noah Masur	4444a479d4	add actionlint	2026-04-04 10:50:07 -04:00
github-actions[bot]	395c4b4348	flake.lock: Update Flake lock file updates: • Updated input 'darwin': 'github:lnl7/nix-darwin/da529ac9e46f25ed5616fd634079a5f3c579135f' (2026-03-08) → 'github:lnl7/nix-darwin/06648f4902343228ce2de79f291dd5a58ee12146' (2026-04-01) • Updated input 'home-manager': 'github:nix-community/home-manager/02371c05a04a2876cf92e2d67a259e8f87399068' (2026-03-27) → 'github:nix-community/home-manager/9dc93220c1c9a410ef6277d6dc55c571d9e592d0' (2026-04-04) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9' (2026-03-24) → 'github:nixos/nixpkgs/6201e203d09599479a3b3450ed24fa81537ebc4e' (2026-04-01) • Updated input 'nur': 'github:nix-community/nur/6298c3410e4000a9e91c344ac5f163b043534e03' (2026-03-28) → 'github:nix-community/nur/274b289253048dec21259c12a16508fb1e30e0f6' (2026-04-04) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/98caaa8cd1fbcc45913d1bb2b7fbabcf3e8d967a' (2026-03-28) → 'github:oxalica/rust-overlay/740fb0203b2852917b909a72b948d34d0b171ec0' (2026-04-04) • Updated input 'wsl': 'github:nix-community/NixOS-WSL/fd0eae98d1ecee31024271f8d64676250a386ee7' (2026-03-19) → 'github:nix-community/NixOS-WSL/d97e078f4788cddb8d11c3c99f72a4bb9ddec221' (2026-03-31)	2026-04-04 05:14:31 +00:00
github-actions[bot]	8dbec5f6ab	flake.lock: Update Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/9670de2921812bc4e0452f6e3efd8c859696c183' (2026-03-20) → 'github:nix-community/home-manager/02371c05a04a2876cf92e2d67a259e8f87399068' (2026-03-27) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/b40629efe5d6ec48dd1efba650c797ddbd39ace0' (2026-03-18) → 'github:nixos/nixpkgs/46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9' (2026-03-24) • Updated input 'nur': 'github:nix-community/nur/08e7d1fc8fc15731a4d6a664207e18828fe028cb' (2026-03-21) → 'github:nix-community/nur/6298c3410e4000a9e91c344ac5f163b043534e03' (2026-03-28) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/c807e83cc2e32adc35f51138b3bdef722c0812ab' (2026-03-21) → 'github:oxalica/rust-overlay/98caaa8cd1fbcc45913d1bb2b7fbabcf3e8d967a' (2026-03-28)	2026-03-28 05:14:58 +00:00
Noah Masur	f8d79cdf3a	add claude code	2026-03-23 10:16:19 -04:00
Noah Masur	280082acfe	zoom window hiding functionality fix hammerspoon	2026-03-23 10:16:19 -04:00