From 57288d1d2386a14ff398e2e3bb2569ef4ba5e854 Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Sun, 29 Dec 2024 17:05:15 -0500 Subject: [PATCH] ghostty, among other things --- ghostty/config | 2 + hammerspoon/init.lua | 4 +- nix/home-manager/flake.lock | 314 +++++++++--------- nix/home-manager/flake.nix | 32 +- nix/home-manager/modules/files.nix | 1 + nix/home-manager/modules/packages/default.nix | 8 +- nix/home-manager/modules/packages/zellij.nix | 35 +- zellij/layouts/zjstatus.kdl | 28 -- zsh/zshrc | 2 +- 9 files changed, 182 insertions(+), 244 deletions(-) create mode 100644 ghostty/config delete mode 100644 zellij/layouts/zjstatus.kdl diff --git a/ghostty/config b/ghostty/config new file mode 100644 index 0000000..957b6f8 --- /dev/null +++ b/ghostty/config @@ -0,0 +1,2 @@ +font-family = "TX-02-BerkeleyAC" +font-style = "Medium" diff --git a/hammerspoon/init.lua b/hammerspoon/init.lua index df30a40..f0c57bf 100644 --- a/hammerspoon/init.lua +++ b/hammerspoon/init.lua @@ -6,7 +6,7 @@ spoon.SpoonInstall:andUse("Commander") spoon.SpoonInstall:andUse("ReloadConfiguration") -- Keep a running, and preferred terminal as the _last_ value here -TERMINAL_NAMES = { "wezterm-gui", "WezTerm" } +TERMINAL_NAMES = { "Ghostty", "wezterm-gui", "WezTerm" } spoon.WindowScreenLeftAndRight:bindHotkeys(spoon.WindowScreenLeftAndRight.defaultHotkeys) @@ -21,7 +21,7 @@ hs.hotkey.bind({ "cmd", "alt", "ctrl" }, "SPACE", function() end) hs.hotkey.bind({ "ctrl" }, "t", function() - terminal = nil + local terminal = nil for i = 1, #TERMINAL_NAMES do -- Can't use .get here, as there's an open bug where it just… returns a window instead sometimes if hs.application.find(TERMINAL_NAMES[i], true) then diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index cdfc686..146a51d 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -1,20 +1,5 @@ { "nodes": { - "crane": { - "locked": { - "lastModified": 1732906089, - "narHash": "sha256-NvYSSiKsC0rqn9yY0a9zglLXrFp92EwKhTFZC38voCQ=", - "owner": "ipetkov", - "repo": "crane", - "rev": "9ed3180f45c2d1499e5af98c4ab7ffee8e886f5f", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "devshell": { "inputs": { "nixpkgs": [ @@ -44,11 +29,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1734590149, - "narHash": "sha256-NcfLaETnNMPHTlu7/oTrihCjTL6G2DIe6lHZ68o2n8w=", + "lastModified": 1735453947, + "narHash": "sha256-/Fx2DHb11MA+nGwaoy3drrVTfALqvUm2pkHU8GNO+/Q=", "owner": "nix-community", "repo": "fenix", - "rev": "81afc33397436c678482a1560bbc810cc3504dbc", + "rev": "7f1477d3cabc49c7f39faa89683fadb5f31d5e9f", "type": "github" }, "original": { @@ -58,6 +43,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1733328505, @@ -73,7 +74,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -130,6 +131,24 @@ "inputs": { "systems": "systems_2" }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -161,6 +180,29 @@ "type": "github" } }, + "ghostty": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": [ + "nixpkgs" + ], + "zig": "zig" + }, + "locked": { + "lastModified": 1735508351, + "narHash": "sha256-hrmauluOxnJlvc49WeclJdoz24Nb7c/WHhyLGkmpde8=", + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "b3925b83ae4b24b02a9b268e88dffcf1af25734b", + "type": "github" + }, + "original": { + "owner": "ghostty-org", + "repo": "ghostty", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -178,11 +220,11 @@ ] }, "locked": { - "lastModified": 1734425854, - "narHash": "sha256-nzE5UbJ41aPEKf8R2ZFYtLkqPmF7EIUbNEdHMBLg0Ig=", + "lastModified": 1734797603, + "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0ddd26d0925f618c3a5d85a4fa5eb1e23a09491d", + "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", "type": "github" }, "original": { @@ -237,11 +279,11 @@ ] }, "locked": { - "lastModified": 1734344598, - "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", + "lastModified": 1735381016, + "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "owner": "nix-community", "repo": "home-manager", - "rev": "83ecd50915a09dca928971139d3a102377a8d242", + "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "type": "github" }, "original": { @@ -278,28 +320,6 @@ "type": "github" } }, - "jujutsu": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1734574142, - "narHash": "sha256-x7+mQxgTT33WDD3Mth9BTzYyc1vQyYgb/fpHAP1821w=", - "owner": "martinvonz", - "repo": "jj", - "rev": "f5d450d7c3a8f8a49e30aef0fd18d8295ffc8cb6", - "type": "github" - }, - "original": { - "owner": "martinvonz", - "repo": "jj", - "type": "github" - } - }, "libpng": { "flake": false, "locked": { @@ -345,11 +365,11 @@ ] }, "locked": { - "lastModified": 1734234111, - "narHash": "sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8=", + "lastModified": 1735443188, + "narHash": "sha256-AydPpRBh8+NOkrLylG7vTsHrGO2b5L7XkMEL5HlzcA8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "311d6cf3ad3f56cb051ffab1f480b2909b3f754d", + "rev": "55ab1e1df5daf2476e6b826b69a82862dcbd7544", "type": "github" }, "original": { @@ -360,20 +380,21 @@ }, "nixneovimplugins": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-utils": [ "flake-utils" ], "nixpkgs": [ "nixpkgs" - ] + ], + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1734542793, - "narHash": "sha256-u/fhMo2hjtlc8RmloyJk7kuux7B9uEp1GwB+/9Oa67E=", + "lastModified": 1735493015, + "narHash": "sha256-VGYjzENZNdRkitZkRGvd1N3J5CnSTTw2jUiPAqlo6Cs=", "owner": "m15a", "repo": "flake-awesome-neovim-plugins", - "rev": "7e8cf16300d28d0b6c451062bcfb09b25b36c9a4", + "rev": "5a8970572bb70ffe50ac69e2f7f163299f2ac886", "type": "github" }, "original": { @@ -384,36 +405,36 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", - "owner": "NixOS", + "lastModified": 1735509321, + "narHash": "sha256-cNhbNxCFvkNvpjaYF/3NiWvDlYJVQt3fAf4PB15doZI=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "5083ec887760adfe12af64830a66807423a859a7", + "rev": "81e6ea9259b28d7f0bbf3d5d9c8d5545d6d853fd", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1733423277, + "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e36963a147267afc055f7cf65225958633e536bf", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { - "locked": { - "lastModified": 1734613481, - "narHash": "sha256-/Do9R5efrUVw3UuLHk1AFcXMKdH0zyrMQr8Duh8D7jE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c00d15e9108bce36169787732ba7ba6df1192da7", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1729265718, "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", @@ -432,7 +453,7 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", "git-hooks": "git-hooks", "home-manager": [ @@ -443,14 +464,14 @@ "nixpkgs" ], "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1734567959, - "narHash": "sha256-ghNQlnI/r6cnknY58x60695sFrYnI6ZUMg65bmoNGqw=", + "lastModified": 1735378670, + "narHash": "sha256-A8aQA+YhJfA8mUpzXOZdlXNnKiZg2EcpCn1srgtBjTs=", "owner": "nix-community", "repo": "nixvim", - "rev": "37608b462772e35220e02bfbd9045d0946564436", + "rev": "f4b0b81ef9eb4e37e75f32caf1f02d5501594811", "type": "github" }, "original": { @@ -461,7 +482,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -486,24 +507,23 @@ "inputs": { "fenix": "fenix", "flake-utils": "flake-utils", + "ghostty": "ghostty", "home-manager": "home-manager", - "jujutsu": "jujutsu", "nix-index-database": "nix-index-database", "nixneovimplugins": "nixneovimplugins", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixvim": "nixvim", - "wezterm": "wezterm", - "zjstatus": "zjstatus" + "wezterm": "wezterm" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1734531725, - "narHash": "sha256-IGe/elaXn5XXA62RIL9OuLMq1vgrUCm+bYPqYCZJ7Ug=", + "lastModified": 1735407071, + "narHash": "sha256-t1ZcoajdRbFqcae8nFQtdz9FC9g84nIdS/YIA0tkIYI=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "27fac08c82210837a2ac84fa5e39eee6993f1605", + "rev": "dc6cea57a247bc5166b25609ec9d37c990f1417b", "type": "github" }, "original": { @@ -514,27 +534,6 @@ } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "jujutsu", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732242723, - "narHash": "sha256-NWI8csIK0ujFlFuEXKnoc+7hWoCiEtINK9r48LUUMeU=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "a229311fcb45b88a95fdfa5cecd8349c809a272a", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "nixpkgs": [ "wezterm", @@ -555,27 +554,6 @@ "type": "github" } }, - "rust-overlay_3": { - "inputs": { - "nixpkgs": [ - "zjstatus", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732933841, - "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -606,7 +584,43 @@ "type": "github" } }, + "systems_3": { + "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": [ + "nixneovimplugins", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1735135567, + "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "9e09d30a644c57257715902efbb3adc56c79cf28", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nixvim", @@ -614,11 +628,11 @@ ] }, "locked": { - "lastModified": 1733761991, - "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=", + "lastModified": 1734704479, + "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085", + "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", "type": "github" }, "original": { @@ -635,8 +649,8 @@ "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", - "nixpkgs": "nixpkgs_3", - "rust-overlay": "rust-overlay_2", + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay", "zlib": "zlib" }, "locked": { @@ -655,28 +669,28 @@ "type": "github" } }, - "zjstatus": { + "zig": { "inputs": { - "crane": "crane", - "flake-utils": [ - "flake-utils" + "flake-compat": [ + "ghostty" ], + "flake-utils": "flake-utils_2", "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay_3" + "ghostty", + "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1734196485, - "narHash": "sha256-xmFOUwpHBXBwA/XK8ahvkVUaenTu2iSbfoaqQ83yyOE=", - "owner": "dj95", - "repo": "zjstatus", - "rev": "df06244bd78bbf5b5da08a6ab353e367fa8d4782", + "lastModified": 1717848532, + "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", "type": "github" }, "original": { - "owner": "dj95", - "repo": "zjstatus", + "owner": "mitchellh", + "repo": "zig-overlay", "type": "github" } }, diff --git a/nix/home-manager/flake.nix b/nix/home-manager/flake.nix index 4f94a36..59901a3 100644 --- a/nix/home-manager/flake.nix +++ b/nix/home-manager/flake.nix @@ -17,7 +17,6 @@ inputs = { # Specify the source of Home Manager and Nixpkgs. nixpkgs = {url = "github:nixos/nixpkgs";}; - # neovidenixpkgs = {url = "github:nixos/nixpkgs/staging-next";}; flake-utils.url = "github:numtide/flake-utils"; # not directly used, but common source for the several flakes that do use it home-manager = { url = "github:nix-community/home-manager"; @@ -27,6 +26,10 @@ url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; + ghostty = { + url = "github:ghostty-org/ghostty"; + inputs.nixpkgs-unstable.follows = "nixpkgs"; + }; nixvim = { url = "github:nix-community/nixvim"; inputs = { @@ -41,13 +44,6 @@ flake-utils.follows = "flake-utils"; }; }; - zjstatus = { - url = "github:dj95/zjstatus"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; - }; - }; fenix = { url = "github:nix-community/fenix"; inputs = { @@ -61,12 +57,6 @@ flake-utils.follows = "flake-utils"; }; }; - jujutsu = { - url = "github:martinvonz/jj"; - inputs = { - flake-utils.follows = "flake-utils"; - }; - }; }; outputs = inputs @ { @@ -75,12 +65,10 @@ home-manager, nix-index-database, nixvim, - zjstatus, fenix, wezterm, - jujutsu, - # neovidenixpkgs, nixneovimplugins, + ghostty, ... }: let supportedSystems = ["aarch64-darwin" "x86_64-linux"]; @@ -92,9 +80,10 @@ inherit system; config = {allowUnfree = true;}; overlays = [ - (_final: prev: { - zjstatus = zjstatus.packages.${prev.system}.default; - }) + ghostty.overlays.default + # (_final: prev: { + # ghostty = ghostty.packages.${prev.system}.default; + # }) (_final: prev: { wezterm = if (builtins.hasAttr "wezterm" inputs) @@ -104,9 +93,6 @@ # (_final: prev: {inherit (neovidenixpkgs.legacyPackages.${prev.system}) neovide;}) nixneovimplugins.overlays.default fenix.overlays.default - (_final: prev: { - jujutsu = jujutsu.packages.${prev.system}.default; - }) ]; } ); diff --git a/nix/home-manager/modules/files.nix b/nix/home-manager/modules/files.nix index 15faadd..fc76ab0 100644 --- a/nix/home-manager/modules/files.nix +++ b/nix/home-manager/modules/files.nix @@ -71,6 +71,7 @@ in { onChange = "~/.emacs.d/bin/doom sync"; }; "erdtree/.erdtreerc".source = ./${repo_root}/erdtree/erdtreerc; + "ghostty/config".source = ./${repo_root}/ghostty/config; "kitty/kitty.conf".source = ./${repo_root}/kitty/kitty.conf; "lsd/config.yaml".source = ./${repo_root}/lsd/config.yaml; "neovide/config.toml".source = (pkgs.formats.toml {}).generate "neovide-config" { diff --git a/nix/home-manager/modules/packages/default.nix b/nix/home-manager/modules/packages/default.nix index e7ec7ff..e4b2d2d 100644 --- a/nix/home-manager/modules/packages/default.nix +++ b/nix/home-manager/modules/packages/default.nix @@ -3,7 +3,7 @@ systemSpecificPackages = with pkgs; if isLinux # ncdu (well, all zig packages) don't work on macOS nix right now - then [zsh racket mold ncdu] + then [zsh racket mold ncdu ghostty] else [keka colima neovide aerospace]; in { imports = [ @@ -19,7 +19,6 @@ in { [ _1password-cli nerd-fonts._0xproto - # bandwhich bat bottom cargo-workspaces @@ -43,7 +42,6 @@ in { gql httpstat imagemagick - inshellisense internetarchive jless jq @@ -56,11 +54,9 @@ in { page pandoc parallel - pdm picocrypt picocrypt-cli python312Packages.pipx - # poetry rage ripgrep rsync @@ -69,11 +65,9 @@ in { see-cat sqlite tmux - # vscode-fhs vale python312Packages.yt-dlp zenith - # zoom-us zstd ] ++ systemSpecificPackages; diff --git a/nix/home-manager/modules/packages/zellij.nix b/nix/home-manager/modules/packages/zellij.nix index 5fb47a4..6ca49ab 100644 --- a/nix/home-manager/modules/packages/zellij.nix +++ b/nix/home-manager/modules/packages/zellij.nix @@ -1,41 +1,10 @@ -{pkgs, ...}: let - zjstatus_config = '' - pane size=1 borderless=true { - plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" { - format_left "{mode}#[fg=black,bg=blue,bold,italic]{session} #[fg=blue,bg=#181825]{tabs}" - format_right "#[fg=#181825,bg=#b1bbfa]{datetime}" - format_space "#[bg=#181825]" - - mode_normal "#[bg=blue]Normal" - mode_tmux "#[bg=green]Tmux " - - tab_normal "#[fg=#181825,bg=#4C4C59] #[fg=#000000,bg=#4C4C59]{index}  {name} #[fg=#4C4C59,bg=#181825]" - tab_normal_fullscreen "#[fg=#6C7086,bg=#181825] {index} {name} [] " - tab_normal_sync "#[fg=#6C7086,bg=#181825] {index} {name} <> " - tab_active "#[fg=#181825,bg=#ffffff,bold,italic] {index}  {name} #[fg=#ffffff,bg=#181825]" - tab_active_fullscreen "#[fg=#9399B2,bg=#181825,bold,italic] {index} {name} [] " - tab_active_sync "#[fg=#9399B2,bg=#181825,bold,italic] {index} {name} <> " - - - datetime "#[fg=#6C7086,bg=#b1bbfa,bold] {format} " - datetime_format "%A, %d %b %Y %H:%M" - datetime_timezone "America/New_York" - } - }''; -in { +{...}: { programs.zellij = { enable = true; - # enableZshIntegration = true; # automatically sets up a session - I don't want this, I want manual control of my sessions + enableZshIntegration = false; # automatically sets up a session - I don't want this, I want manual control of my sessions }; xdg.configFile = { "zellij/config.kdl".source = ../../../../zellij/config.kdl; - "zellij/layouts/zjstatus.kdl".text = '' - layout { - default_tab_template { - children - ${zjstatus_config} - } - }''; }; } diff --git a/zellij/layouts/zjstatus.kdl b/zellij/layouts/zjstatus.kdl deleted file mode 100644 index 5f30d48..0000000 --- a/zellij/layouts/zjstatus.kdl +++ /dev/null @@ -1,28 +0,0 @@ -layout { - default_tab_template { - children - pane size=1 borderless=true { - plugin location="file:${pkgs.zjstatus}/bin/zjstatus.wasm" { - format_left "{mode}#[fg=black,bg=blue,bold]{session} #[fg=blue,bg=#181825]{tabs}" - format_right "#[fg=#181825,bg=#b1bbfa]{datetime}" - format_space "#[bg=#181825]" - - hide_frame_for_single_pane "true" - - mode_normal "#[bg=blue] " - - tab_normal "#[fg=#181825,bg=#4C4C59] #[fg=#000000,bg=#4C4C59]{index}  {name} #[fg=#4C4C59,bg=#181825]" - tab_normal_fullscreen "#[fg=#6C7086,bg=#181825] {index} {name} [] " - tab_normal_sync "#[fg=#6C7086,bg=#181825] {index} {name} <> " - tab_active "#[fg=#181825,bg=#ffffff,bold,italic] {index}  {name} #[fg=#ffffff,bg=#181825]" - tab_active_fullscreen "#[fg=#9399B2,bg=#181825,bold,italic] {index} {name} [] " - tab_active_sync "#[fg=#9399B2,bg=#181825,bold,italic] {index} {name} <> " - - - datetime "#[fg=#6C7086,bg=#b1bbfa,bold] {format} " - datetime_format "%A, %d %b %Y %H:%M" - datetime_timezone "Europe/Berlin" // plugin configuration... - } - } - } -} diff --git a/zsh/zshrc b/zsh/zshrc index 9145ad1..bd2782d 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -22,7 +22,7 @@ fi fpath=(~/bin ~/.zshcompletions $fpath) zstyle :compinstall filename '/home/anthonys/.zshrc' -export CARAPACE_BRIDGES='zsh,fish,bash,inshellisense' +export CARAPACE_BRIDGES='zsh,fish,bash zstyle ':completion:*' format $'\e[2;37mCompleting %d\e[m' # Both because it's nice and as an example zstyle ':completion:*:git:*' group-order 'main commands' 'alias commands' 'external commands'