wezterm: autoconnect to unix domain

wezterm: refactor config and add session management
clean up jqr
2025-07-06 20:10:14 +00:00 · 2024-11-17 13:33:46 -07:00 · 2024-11-17 13:16:58 -07:00 · 2024-11-16 22:59:00 -07:00 · 2024-11-16 22:25:39 -07:00 · 2024-11-16 23:47:26 +00:00
9 changed files with 387 additions and 219 deletions
--- a/flake.lock
+++ b/flake.lock
@ -87,11 +87,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1731032247,
-        "narHash": "sha256-OjLft7fwkmiRLXQsGAudGFZxEYXOT0nHwrQ9GbsBqJ4=",
+        "lastModified": 1731642829,
+        "narHash": "sha256-vG+O2RZRzYZ8BUMNNJ+BLSj6PUoGW7taDQbp6QNJ3Xo=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "2fbf4a8417c28cf45bae6e6e97248cbbd9b78632",
+        "rev": "f86f158efd4bab8dce3e207e4621f1df3a760b7a",
        "type": "github"
      },
      "original": {
@ -108,11 +108,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1731060864,
-        "narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=",
+        "lastModified": 1731549112,
+        "narHash": "sha256-c9I3i1CwZ10SoM5npQQVnfwgvB86jAS3lT4ZqkRoSOI=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f",
+        "rev": "5fd852c4155a689098095406500d0ae3d04654a8",
        "type": "github"
      },
      "original": {
@ -145,11 +145,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1731113649,
-        "narHash": "sha256-U6FMghMpHTk2Pb5VsjNk8tBgCiiyB+bebmfOuNtMisA=",
+        "lastModified": 1731718692,
+        "narHash": "sha256-7CIkVwWznCUy3nQvcSHV1uZ6cvIWqIvckCT4ldzee6k=",
        "owner": "bandithedoge",
        "repo": "nixpkgs-firefox-darwin",
-        "rev": "22a53e2cae4d37fb24e9326c6f72a54cb4f269d5",
+        "rev": "16b0320abb172e6636b4e8dce059023197c7f186",
        "type": "github"
      },
      "original": {
@ -195,6 +195,24 @@
      "inputs": {
        "systems": "systems"
      },
+      "locked": {
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
      "locked": {
        "lastModified": 1710146030,
        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
@ -208,9 +226,9 @@
        "type": "indirect"
      }
    },
-    "flake-utils_2": {
+    "flake-utils_3": {
      "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
      },
      "locked": {
        "lastModified": 1705309234,
@ -226,9 +244,9 @@
        "type": "github"
      }
    },
-    "flake-utils_3": {
+    "flake-utils_4": {
      "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_4"
      },
      "locked": {
        "lastModified": 1726560853,
@ -283,11 +301,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1730837930,
-        "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
+        "lastModified": 1731604581,
+        "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
+        "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
        "type": "github"
      },
      "original": {
@ -297,21 +315,43 @@
        "type": "github"
      }
    },
+    "jujutsu": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1731797343,
+        "narHash": "sha256-y33gAd6RJo4O1/AS5yP9quxNkWJTAvOwap1hA9RIo2w=",
+        "owner": "martinvonz",
+        "repo": "jj",
+        "rev": "e8bbd89ec16b9c5f339bb31954eb57769a6e797f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "martinvonz",
+        "repo": "jj",
+        "type": "github"
+      }
+    },
    "mac-app-util": {
      "inputs": {
        "cl-nix-lite": "cl-nix-lite",
        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
+        "flake-utils": "flake-utils_2",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1727470707,
-        "narHash": "sha256-BqkwZ2mvzn+COdfIuzllSzWmiaBwQktt4sw9slfwM70=",
+        "lastModified": 1731385712,
+        "narHash": "sha256-hcPGb+Voh1N+SD3XuwgcwDMA6W/lGkXLCnd3mttoLoA=",
        "owner": "hraban",
        "repo": "mac-app-util",
-        "rev": "9c6bbe2a6a7ec647d03f64f0fadb874284f59eac",
+        "rev": "9ef4d1c14dab18a95691602bf541cd091fdcc2e3",
        "type": "github"
      },
      "original": {
@ -362,7 +402,7 @@
    "nextcloud-snappymail": {
      "flake": false,
      "locked": {
-        "lastModified": 1731123727,
+        "lastModified": 1731728847,
        "narHash": "sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E=",
        "type": "tarball",
        "url": "https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz"
@ -374,7 +414,7 @@
    },
    "nix2vim": {
      "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
        "nixpkgs": [
          "nixpkgs"
        ]
@ -395,11 +435,11 @@
    },
    "nixlib": {
      "locked": {
-        "lastModified": 1729386149,
-        "narHash": "sha256-hUP9oxmnOmNnKcDOf5Y55HQ+NnoT0+bLWHLQWLLw9Ks=",
+        "lastModified": 1731200463,
+        "narHash": "sha256-qDaAweJjdFbVExqs8aG27urUgcgKufkIngHW3Rzustg=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "cce4521b6df014e79a7b7afc58c703ed683c916e",
+        "rev": "e04234d263750db01c78a412690363dc2226e68a",
        "type": "github"
      },
      "original": {
@ -416,11 +456,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1729472750,
-        "narHash": "sha256-s93LPHi5BN7I2xSGNAFWiYb8WRsPvT1LE9ZjZBrpFlg=",
+        "lastModified": 1731546190,
+        "narHash": "sha256-kJix8nLyFIJ3EC7VtoXK/85C4ZN2dC5oWoS8+ErehqI=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565",
+        "rev": "06ffce1a8d95e95c06a4bcfa117dd960b14a7101",
        "type": "github"
      },
      "original": {
@ -431,11 +471,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1730785428,
-        "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
+        "lastModified": 1731319897,
+        "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
+        "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
        "type": "github"
      },
      "original": {
@ -463,11 +503,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1730883749,
-        "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=",
+        "lastModified": 1731652201,
+        "narHash": "sha256-XUO0JKP1hlww0d7mm3kpmIr4hhtR4zicg5Wwes9cPMg=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede",
+        "rev": "c21b77913ea840f8bcf9adf4c41cecc2abffd38d",
        "type": "github"
      },
      "original": {
@ -477,29 +517,13 @@
        "type": "github"
      }
    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1730531603,
-        "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nur": {
      "locked": {
-        "lastModified": 1731119600,
-        "narHash": "sha256-Asx9nXJBdRN4AvuA8+etlQWY8PrqrXXvPb1uNFveV8k=",
+        "lastModified": 1731726629,
+        "narHash": "sha256-eDq+jrosOOzb1OeaYKkDx0g1zgLMnIhmXBnG76953ZE=",
        "owner": "nix-community",
        "repo": "nur",
-        "rev": "b29499982ee565c8dab5ca5c7be8d2ebfc267d87",
+        "rev": "be2664b26e2c661b5053239f9f4d8a9b458e5dca",
        "type": "github"
      },
      "original": {
@ -544,11 +568,11 @@
    "nvim-tree-lua-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1731122044,
-        "narHash": "sha256-pf4S8iMtgCJU8jOMxqr0oItO0htBGafGglKnEU1neus=",
+        "lastModified": 1731275826,
+        "narHash": "sha256-YIClwxyw4fNos5OIBZOjM0dlCw+yOhDDnq5jONSu7rs=",
        "owner": "kyazdani42",
        "repo": "nvim-tree.lua",
-        "rev": "3fc8de198c15ec4e5395f57b70579b3959976960",
+        "rev": "28eac2801b201f301449e976d7a9e8cfde053ba3",
        "type": "github"
      },
      "original": {
@ -574,6 +598,22 @@
        "type": "github"
      }
    },
+    "osc": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1731356260,
+        "narHash": "sha256-SvuHH/HfvQfK1Ob+aTjyvKnd1N2jaszpeTQ5SVHz9Mw=",
+        "owner": "theimpostor",
+        "repo": "osc",
+        "rev": "8a313c60d67353669509e9461d22b403df72b5e7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "theimpostor",
+        "repo": "osc",
+        "type": "github"
+      }
+    },
    "ren": {
      "flake": false,
      "locked": {
@ -619,6 +659,7 @@
        "gh-collaborators": "gh-collaborators",
        "hmts-nvim-src": "hmts-nvim-src",
        "home-manager": "home-manager",
+        "jujutsu": "jujutsu",
        "mac-app-util": "mac-app-util",
        "nextcloud-cookbook": "nextcloud-cookbook",
        "nextcloud-external": "nextcloud-external",
@ -634,6 +675,7 @@
        "nvim-lspconfig-src": "nvim-lspconfig-src",
        "nvim-tree-lua-src": "nvim-tree-lua-src",
        "nvim-treesitter-src": "nvim-treesitter-src",
+        "osc": "osc",
        "ren": "ren",
        "rep": "rep",
        "snipe-nvim-src": "snipe-nvim-src",
@ -648,20 +690,40 @@
        "tree-sitter-python": "tree-sitter-python",
        "tree-sitter-rasi": "tree-sitter-rasi",
        "tree-sitter-vimdoc": "tree-sitter-vimdoc",
-        "ucodenix": "ucodenix",
        "wallpapers": "wallpapers",
        "wsl": "wsl",
        "zenyd-mpv-scripts": "zenyd-mpv-scripts"
      }
    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "jujutsu",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729304879,
+        "narHash": "sha256-H7KGGJUU9BcDNnfXiATBGgs6FJKWQdfftNJS+/v2aMU=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "b259ef799b5ac014604da71ecd92d4a52603ed2d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
    "snipe-nvim-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1730493972,
-        "narHash": "sha256-9Q/ZbhtteS9SemQJ/3Nov1rshQgm1Beiw88/zgmJbRg=",
+        "lastModified": 1731254481,
+        "narHash": "sha256-VZ7h/+7Obc+Q9ukftVezkLrMRAByN9RMWLMQw4oN6g8=",
        "owner": "leath-dub",
        "repo": "snipe.nvim",
-        "rev": "64b3763c1b388ac5a3d5a2da615a3d0824af4a45",
+        "rev": "e6787c30998b549e75b77b2432bcb7e7c595c30c",
        "type": "github"
      },
      "original": {
@ -715,6 +777,21 @@
        "type": "github"
      }
    },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "telescope-nvim-src": {
      "flake": false,
      "locked": {
@ -784,11 +861,11 @@
    "tree-sitter-bash": {
      "flake": false,
      "locked": {
-        "lastModified": 1728963142,
-        "narHash": "sha256-h6L5eIItu3IOJBKSZCajHMhhencN1Fk/4dXgBMuVxYc=",
+        "lastModified": 1731338420,
+        "narHash": "sha256-JW+30zIyq8Xc7NG9V+YoFqC+57BjZXIbAvWPD2lqvIE=",
        "owner": "tree-sitter",
        "repo": "tree-sitter-bash",
-        "rev": "597a5ed6ed4d932fd44697feec988f977081ae59",
+        "rev": "49c31006d8307dcb12bc5770f35b6d5b9e2be68e",
        "type": "github"
      },
      "original": {
@ -850,11 +927,11 @@
    "tree-sitter-python": {
      "flake": false,
      "locked": {
-        "lastModified": 1728966077,
-        "narHash": "sha256-pD4JedYrnz6d5pgzRPtKPY0XPRoot1FMI9XgTgONOyw=",
+        "lastModified": 1731308116,
+        "narHash": "sha256-/jYGi2yksifMGPitlS8oM/g3YrR7RJ57imBhEyow/jc=",
        "owner": "tree-sitter",
        "repo": "tree-sitter-python",
-        "rev": "7f4b9c2d8039701b0579b7c060a918f8548aa7cd",
+        "rev": "6d14e44ea217bc5bb1c1804180e9818d7d1b8d91",
        "type": "github"
      },
      "original": {
@ -896,24 +973,6 @@
        "type": "github"
      }
    },
-    "ucodenix": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1731337052,
-        "narHash": "sha256-/wKkjAHHmaov6VWW7POdL+dUWtAWA9Zs6Ys/r7ugy00=",
-        "owner": "e-tho",
-        "repo": "ucodenix",
-        "rev": "5d8df57d4258d225dc9f5c2c4bb96855842cbac2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "e-tho",
-        "repo": "ucodenix",
-        "type": "github"
-      }
-    },
    "wallpapers": {
      "flake": false,
      "locked": {
@ -933,17 +992,17 @@
    "wsl": {
      "inputs": {
        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_4",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1730453870,
-        "narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=",
+        "lastModified": 1731682434,
+        "narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "adb6bc4b661a43328752b4575be4968a4990c033",
+        "rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -31,9 +31,6 @@
      inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list for their inputs
    };

-    # Used for AMD CPU microcode
-    ucodenix.url = "github:e-tho/ucodenix";
-
    # Community packages; used for Firefox extensions
    nur.url = "github:nix-community/nur";

@ -178,6 +175,13 @@
      flake = false;
    };

+    # Git alternative
+    # Fixes: https://github.com/martinvonz/jj/issues/4784
+    jujutsu = {
+      url = "github:martinvonz/jj";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
    # Ren and rep - CLI find and replace
    rep = {
      url = "github:robenkleene/rep-grep";
@ -193,6 +197,12 @@
      flake = false;
    };

+    # Clipboard over SSH
+    osc = {
+      url = "github:theimpostor/osc";
+      flake = false;
+    };
+
    # Nextcloud Apps
    nextcloud-news = {
      # https://github.com/nextcloud/news/releases
@ -263,6 +273,7 @@
      overlays = [
        inputs.nur.overlay
        inputs.nix2vim.overlay
+        inputs.jujutsu.overlays.default # Fix: https://github.com/martinvonz/jj/issues/4784
        (import ./overlays/neovim-plugins.nix inputs)
        (import ./overlays/disko.nix inputs)
        (import ./overlays/tree-sitter.nix inputs)
@ -270,6 +281,7 @@
        (import ./overlays/nextcloud-apps.nix inputs)
        (import ./overlays/betterlockscreen.nix)
        (import ./overlays/gh-collaborators.nix inputs)
+        (import ./overlays/osc.nix inputs)
        (import ./overlays/ren-rep.nix inputs)
      ];

--- a/hosts/flame/default.nix
+++ b/hosts/flame/default.nix
@ -82,6 +82,7 @@ inputs.nixpkgs.lib.nixosSystem rec {
      services.minecraft-server.enable = true; # Setup Minecraft server
      services.n8n.enable = true;
      services.ntfy-sh.enable = true;
+      services.postgresql.enable = true;
      services.uptime-kuma.enable = true;
      system.autoUpgrade.enable = true;

--- a/hosts/tempest/default.nix
+++ b/hosts/tempest/default.nix
@ -17,7 +17,6 @@ inputs.nixpkgs.lib.nixosSystem rec {
  modules = [
    globals
    inputs.home-manager.nixosModules.home-manager
-    inputs.ucodenix.nixosModules.default
    ../../modules/common
    ../../modules/nixos
    {
@ -50,7 +49,6 @@ inputs.nixpkgs.lib.nixosSystem rec {

      # Allow firmware updates
      hardware.cpu.amd.updateMicrocode = true;
-      services.ucodenix.enable = true;

      # Helps reduce GPU fan noise under idle loads
      hardware.fancontrol.enable = true;
--- a/modules/common/applications/wezterm.nix
+++ b/modules/common/applications/wezterm.nix
@ -102,49 +102,82 @@
            };
          };
          extraConfig = ''
-            return {
-                color_scheme = "myTheme",
+            local wezterm = require("wezterm")
+            local config = wezterm.config_builder()
+            config.check_for_updates = false
+            config.color_scheme = "myTheme"

            -- Scrollback
-                scrollback_lines = 10000,
+            config.scrollback_lines = 10000

            -- Window
-                window_padding = {
+            config.window_padding = {
              left = 10,
              right = 10,
              top = 10,
              bottom = 10,
-                },
+            }

-                font = wezterm.font('${font}', { weight = 'Bold'}),
-                font_size = ${if pkgs.stdenv.isLinux then "14.0" else "18.0"},
+            config.font = wezterm.font('${font}', { weight = 'Bold'})
+            config.font_size = ${if pkgs.stdenv.isLinux then "14.0" else "18.0"}

            -- Fix color blocks instead of text
-                front_end = "WebGpu",
+            config.front_end = "WebGpu"

            -- Tab Bar
-                hide_tab_bar_if_only_one_tab = true,
-                window_frame = {
+            config.hide_tab_bar_if_only_one_tab = true
+            config.window_frame = {
              font = wezterm.font('${font}', { weight = 'Bold'}),
              font_size = ${if pkgs.stdenv.isLinux then "12.0" else "16.0"},
-                },
+            }

-                colors = {
+            config.colors = {
              tab_bar = {
                active_tab = {
                  bg_color = '${config.theme.colors.base00}',
                  fg_color = '${config.theme.colors.base04}',
                },
              },
-                },
+            }

            -- Disable audio
-                audible_bell = "Disabled",
+            config.audible_bell = "Disabled"

-                initial_rows = 80,
-                initial_cols = 200,
+            config.initial_rows = 80
+            config.initial_cols = 200

-                keys = {
+            config.unix_domains = {
+              {
+                name = 'unix',
+              },
+            }
+
+            -- This causes `wezterm` to act as though it was started as
+            -- `wezterm connect unix` by default, connecting to the unix
+            -- domain on startup.
+            -- If you prefer to connect manually, leave out this line.
+            config.default_gui_startup_args = { 'connect', 'unix' }
+
+            config.leader = {
+              key = 'a',
+              mods = 'CTRL',
+              timeout_milliseconds = 2000,
+            }
+
+            config.keys = {
+              -- Attach to muxer
+              {
+                key = 'a',
+                mods = 'LEADER',
+                action = wezterm.action.AttachDomain 'unix',
+              },
+
+              -- Detach from muxer
+              {
+                key = 'd',
+                mods = 'LEADER',
+                action = wezterm.action.DetachDomain { DomainName = 'unix' },
+              },
              -- sends completion string for fish autosuggestions
              {
                key = 'Enter',
@ -229,8 +262,23 @@
                   )
                 end),
              },
-                },
            }
+
+            -- print the workspace name at the upper right
+            wezterm.on("update-right-status", function(window, pane)
+              window:set_right_status(window:active_workspace())
+            end)
+            -- load plugin
+            local workspace_switcher = wezterm.plugin.require("https://github.com/MLFlexer/smart_workspace_switcher.wezterm")
+            -- set path to zoxide
+            workspace_switcher.zoxide_path = "${pkgs.zoxide}/bin/zoxide"
+            -- keymaps
+            table.insert(config.keys, { key = "s", mods = "CTRL|SHIFT", action = workspace_switcher.switch_workspace() })
+            -- table.insert(config.keys, { key = "t", mods = "CTRL|SHIFT", action = wezterm.action.ShowLauncherArgs({ flags = "FUZZY|WORKSPACES" }) })
+            table.insert(config.keys, { key = "[", mods = "CTRL|SHIFT", action = wezterm.action.SwitchWorkspaceRelative(1) })
+            table.insert(config.keys, { key = "]", mods = "CTRL|SHIFT", action = wezterm.action.SwitchWorkspaceRelative(-1) })
+
+            return config
          '';
        };
      };
--- a/modules/common/shell/bash/scripts/jqr.sh
+++ b/modules/common/shell/bash/scripts/jqr.sh
@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+# Adapted from: https://gist.github.com/reegnz/b9e40993d410b75c2d866441add2cb55
+
+if [[ -z $1 ]] || [[ $1 == "-" ]]; then
+    input=$(mktemp)
+    trap 'rm -f $input' EXIT
+    cat /dev/stdin >"$input"
+else
+    input=$1
+fi
+
+echo '' |
+    fzf --phony \
+        --height 100% \
+        --preview-window='up:80%' \
+        --query '.' \
+        --print-query \
+        --header $'CTRL-O: jq output\nCTRL-Y: copy output\nALT-Y: copy query' \
+        --preview "jq --color-output -r {q} $input" \
+        --bind "ctrl-o:execute(jq -r {q} $input)+clear-query+accept" \
+        --bind "alt-y:execute(echo {q} | pbcopy)" \
+        --bind "ctrl-y:execute(jq -r {q} $input | pbcopy)"
--- a/modules/common/shell/fzf.nix
+++ b/modules/common/shell/fzf.nix
@ -41,5 +41,16 @@
        FZF_CTRL_T_COMMAND = fzfCommand;
        FZF_DEFAULT_OPTS = "-m --height 50% --border";
      };
+
+    home.packages = [
+      (pkgs.writeShellApplication {
+        name = "jqr";
+        runtimeInputs = [
+          pkgs.jq
+          pkgs.fzf
+        ];
+        text = builtins.readFile ./bash/scripts/jqr.sh;
+      })
+    ];
  };
 }
--- a/modules/common/shell/utilities.nix
+++ b/modules/common/shell/utilities.nix
@ -31,6 +31,7 @@ in
        jo # JSON output
        jq # JSON manipulation
        lf # File viewer
+        osc # Clipboard over SSH
        qrencode # Generate qr codes
        rsync # Copy folders
        ren # Rename files
--- a/overlays/osc.nix
+++ b/overlays/osc.nix
@ -0,0 +1,15 @@
+inputs: _final: prev: {
+
+  osc = prev.buildGoModule {
+    pname = "osc";
+    version = "v0.4.4";
+    src = inputs.osc;
+
+    vendorHash = "sha256-VEzVd1LViMtqhQaltvGuupEemV/2ewMuVYjGbKOi0iw=";
+
+    ldflags = [
+      "-s"
+      "-w"
+    ];
+  };
+}
Author	SHA1	Message	Date
Noah Masur	100eedc8cd	wezterm: autoconnect to unix domain	2024-11-17 13:33:46 -07:00
Noah Masur	ce298b9600	wezterm: refactor config and add session management	2024-11-17 13:16:58 -07:00
Noah Masur	7128cd8d0d	clean up jqr	2024-11-16 22:59:00 -07:00
Noah Masur	7007577176	jqr for jq preview repl based on: https://gist.github.com/reegnz/b9e40993d410b75c2d866441add2cb55	2024-11-16 22:25:39 -07:00
Noah Masur	ca1c7cc23f	add osc for copy paste over ssh	2024-11-16 23:47:26 +00:00
Noah Masur	ae43d24f62	enable postgres for flame	2024-11-16 23:47:08 +00:00
Noah Masur	c6de176b0b	fix: jujutsu tests fail on new version	2024-11-16 23:46:43 +00:00
github-actions[bot]	a36df414c1	flake.lock: Update Flake lock file updates: • Updated input 'darwin': 'github:lnl7/nix-darwin/2fbf4a8417c28cf45bae6e6e97248cbbd9b78632' (2024-11-08) → 'github:lnl7/nix-darwin/f86f158efd4bab8dce3e207e4621f1df3a760b7a' (2024-11-15) • Updated input 'disko': 'github:nix-community/disko/5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f' (2024-11-08) → 'github:nix-community/disko/5fd852c4155a689098095406500d0ae3d04654a8' (2024-11-14) • Updated input 'firefox-darwin': 'github:bandithedoge/nixpkgs-firefox-darwin/22a53e2cae4d37fb24e9326c6f72a54cb4f269d5' (2024-11-09) → 'github:bandithedoge/nixpkgs-firefox-darwin/16b0320abb172e6636b4e8dce059023197c7f186' (2024-11-16) • Updated input 'home-manager': 'github:nix-community/home-manager/2f607e07f3ac7e53541120536708e824acccfaa8' (2024-11-05) → 'github:nix-community/home-manager/1d0862ee2d7c6f6cd720d6f32213fa425004be10' (2024-11-14) • Updated input 'mac-app-util': 'github:hraban/mac-app-util/9c6bbe2a6a7ec647d03f64f0fadb874284f59eac' (2024-09-27) → 'github:hraban/mac-app-util/9ef4d1c14dab18a95691602bf541cd091fdcc2e3' (2024-11-12) • Updated input 'nextcloud-snappymail': 'https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz?narHash=sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E%3D' (2024-11-09) → 'https://snappymail.eu/repository/nextcloud/snappymail-2.38.2-nextcloud.tar.gz?narHash=sha256-oCw6Brs85rINBHvz3UJXheyLVqvA3RgPXG03b30Fx7E%3D' (2024-11-16) • Updated input 'nixos-generators': 'github:nix-community/nixos-generators/7c60ba4bc8d6aa2ba3e5b0f6ceb9fc07bc261565' (2024-10-21) → 'github:nix-community/nixos-generators/06ffce1a8d95e95c06a4bcfa117dd960b14a7101' (2024-11-14) • Updated input 'nixos-generators/nixlib': 'github:nix-community/nixpkgs.lib/cce4521b6df014e79a7b7afc58c703ed683c916e' (2024-10-20) → 'github:nix-community/nixpkgs.lib/e04234d263750db01c78a412690363dc2226e68a' (2024-11-10) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/4aa36568d413aca0ea84a1684d2d46f55dbabad7' (2024-11-05) → 'github:nixos/nixpkgs/dc460ec76cbff0e66e269457d7b728432263166c' (2024-11-11) • Updated input 'nixpkgs-stable': 'github:nixos/nixpkgs/dba414932936fde69f0606b4f1d87c5bc0003ede' (2024-11-06) → 'github:nixos/nixpkgs/c21b77913ea840f8bcf9adf4c41cecc2abffd38d' (2024-11-15) • Updated input 'nur': 'github:nix-community/nur/b29499982ee565c8dab5ca5c7be8d2ebfc267d87' (2024-11-09) → 'github:nix-community/nur/be2664b26e2c661b5053239f9f4d8a9b458e5dca' (2024-11-16) • Updated input 'nvim-tree-lua-src': 'github:kyazdani42/nvim-tree.lua/3fc8de198c15ec4e5395f57b70579b3959976960' (2024-11-09) → 'github:kyazdani42/nvim-tree.lua/28eac2801b201f301449e976d7a9e8cfde053ba3' (2024-11-10) • Updated input 'snipe-nvim-src': 'github:leath-dub/snipe.nvim/64b3763c1b388ac5a3d5a2da615a3d0824af4a45' (2024-11-01) → 'github:leath-dub/snipe.nvim/e6787c30998b549e75b77b2432bcb7e7c595c30c' (2024-11-10) • Updated input 'tree-sitter-bash': 'github:tree-sitter/tree-sitter-bash/597a5ed6ed4d932fd44697feec988f977081ae59' (2024-10-15) → 'github:tree-sitter/tree-sitter-bash/49c31006d8307dcb12bc5770f35b6d5b9e2be68e' (2024-11-11) • Updated input 'tree-sitter-python': 'github:tree-sitter/tree-sitter-python/7f4b9c2d8039701b0579b7c060a918f8548aa7cd' (2024-10-15) → 'github:tree-sitter/tree-sitter-python/6d14e44ea217bc5bb1c1804180e9818d7d1b8d91' (2024-11-11) • Updated input 'wsl': 'github:nix-community/NixOS-WSL/adb6bc4b661a43328752b4575be4968a4990c033' (2024-11-01) → 'github:nix-community/NixOS-WSL/a6b9cf0b7805e2c50829020a73e7bde683fd36dd' (2024-11-15)	2024-11-16 03:52:17 +00:00