From 909eae86679a50cb95bf47476656435bb3b003d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20Andr=C3=A9?= Date: Sun, 28 Apr 2024 13:09:54 +0200 Subject: [PATCH] updates --- Brewfile | 1 + Brewfile.lock.json | 161 +++++++++++++++++++++------------ nvim/lazy-lock.json | 8 +- nvim/lua/plugins/colors.lua | 2 +- nvim/lua/plugins/gitsigns.lua | 2 +- nvim/lua/plugins/telescope.lua | 3 +- wezterm/wezterm.lua | 5 +- zed/keymap.json | 60 ------------ zed/settings.json | 51 ----------- 9 files changed, 117 insertions(+), 176 deletions(-) diff --git a/Brewfile b/Brewfile index 8f155295..4f1501bf 100644 --- a/Brewfile +++ b/Brewfile @@ -30,6 +30,7 @@ brew "glow" brew "gnu-sed" brew "go" brew "gopls" +brew "gron" brew "helix" brew "jj" brew "jq" diff --git a/Brewfile.lock.json b/Brewfile.lock.json index 7866e1ed..c0519944 100644 --- a/Brewfile.lock.json +++ b/Brewfile.lock.json @@ -236,43 +236,43 @@ "curl": { "version": "8.7.1", "bottle": { - "rebuild": 1, + "rebuild": 2, "root_url": "https://ghcr.io/v2/homebrew/core", "files": { "arm64_sonoma": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/curl/blobs/sha256:f109fe367f5761d5fd5b1800e538330e1e40627c2b1cfc8b684406853ed7f78d", - "sha256": "f109fe367f5761d5fd5b1800e538330e1e40627c2b1cfc8b684406853ed7f78d" + "url": "https://ghcr.io/v2/homebrew/core/curl/blobs/sha256:d26dcef01fd3158c59dec70673ebbdcecc44bdffc51b735a45d018f3046d0dfd", + "sha256": "d26dcef01fd3158c59dec70673ebbdcecc44bdffc51b735a45d018f3046d0dfd" }, "arm64_ventura": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/curl/blobs/sha256:34e96a963efa6b850d216b40c27c1cdd02ebe9a39a2d7c28fc180d004a68028b", - "sha256": "34e96a963efa6b850d216b40c27c1cdd02ebe9a39a2d7c28fc180d004a68028b" + "url": "https://ghcr.io/v2/homebrew/core/curl/blobs/sha256:abef4ff5922a5046cf31afc38dcdfec4cce7985a93d997276a8a9fe822782103", + "sha256": "abef4ff5922a5046cf31afc38dcdfec4cce7985a93d997276a8a9fe822782103" }, "arm64_monterey": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/curl/blobs/sha256:22d7372b0c62c46c13b346c5bafdd0d4fb9b48a4bec387d1573c3083e80e6a3f", - "sha256": "22d7372b0c62c46c13b346c5bafdd0d4fb9b48a4bec387d1573c3083e80e6a3f" + "url": "https://ghcr.io/v2/homebrew/core/curl/blobs/sha256:562cd9cf121cb54692bdaade8319bc070421c426779fdfd4e7d9ce59d81e304c", + "sha256": "562cd9cf121cb54692bdaade8319bc070421c426779fdfd4e7d9ce59d81e304c" }, "sonoma": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/curl/blobs/sha256:cabdbf0618f62f936c5480736adf309fe08746d644cfaab2fdad17b68ba5cf47", - "sha256": "cabdbf0618f62f936c5480736adf309fe08746d644cfaab2fdad17b68ba5cf47" + "url": "https://ghcr.io/v2/homebrew/core/curl/blobs/sha256:c98c05f1441d74c327717bddf1e4ea0d914a2f325550885c6b5084d6f03875ef", + "sha256": "c98c05f1441d74c327717bddf1e4ea0d914a2f325550885c6b5084d6f03875ef" }, "ventura": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/curl/blobs/sha256:7924233ec09083c8ea9cbcaae0058274cbd4bd384ac99f0bcaca7cf3d1cb1a24", - "sha256": "7924233ec09083c8ea9cbcaae0058274cbd4bd384ac99f0bcaca7cf3d1cb1a24" + "url": "https://ghcr.io/v2/homebrew/core/curl/blobs/sha256:30c589452ee996815867e03b5104b7464b2580a991cb686d69485ab7c2348984", + "sha256": "30c589452ee996815867e03b5104b7464b2580a991cb686d69485ab7c2348984" }, "monterey": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/curl/blobs/sha256:60707c9053cd1b81b59e179238cd3fdd1c7df0ba83876688e04f712ba1185543", - "sha256": "60707c9053cd1b81b59e179238cd3fdd1c7df0ba83876688e04f712ba1185543" + "url": "https://ghcr.io/v2/homebrew/core/curl/blobs/sha256:26ea8f03d564d0b7fb27dc9416bf989fb012185636e8cabf8bd6680b11b9dfdf", + "sha256": "26ea8f03d564d0b7fb27dc9416bf989fb012185636e8cabf8bd6680b11b9dfdf" }, "x86_64_linux": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/curl/blobs/sha256:ed5fe25460d3df70e6819aedba6870e44176a8cef633fc365ecf828bb3d5f71f", - "sha256": "ed5fe25460d3df70e6819aedba6870e44176a8cef633fc365ecf828bb3d5f71f" + "url": "https://ghcr.io/v2/homebrew/core/curl/blobs/sha256:5f439e638e5fb4c63c8aa359eb5effd351fb8f3a6e59736281544cd1d739dc4f", + "sha256": "5f439e638e5fb4c63c8aa359eb5effd351fb8f3a6e59736281544cd1d739dc4f" } } } @@ -417,38 +417,38 @@ "files": { "arm64_sonoma": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/eza/blobs/sha256:0d8dccb8950aaecd32935179f6b6294f0b1c0a9de5d0d54bc6e158d6ab69249d", - "sha256": "0d8dccb8950aaecd32935179f6b6294f0b1c0a9de5d0d54bc6e158d6ab69249d" + "url": "https://ghcr.io/v2/homebrew/core/eza/blobs/sha256:b858b99fcdcd9df4b39e2e5ce419e149325a981fc27556d29195d449f3b84543", + "sha256": "b858b99fcdcd9df4b39e2e5ce419e149325a981fc27556d29195d449f3b84543" }, "arm64_ventura": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/eza/blobs/sha256:fb3da62bf109f321f8f5076c78cc770feea428d468cef23024337d7ffb596bf3", - "sha256": "fb3da62bf109f321f8f5076c78cc770feea428d468cef23024337d7ffb596bf3" + "url": "https://ghcr.io/v2/homebrew/core/eza/blobs/sha256:d22223b7bf2d9a5dbaec3c3a773e7448667c2aa85f3749794ff179d2df3fb0e4", + "sha256": "d22223b7bf2d9a5dbaec3c3a773e7448667c2aa85f3749794ff179d2df3fb0e4" }, "arm64_monterey": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/eza/blobs/sha256:ba544525895e48ed0e823adf7211372ba9be8979defcda9b98e1fe8c066a3328", - "sha256": "ba544525895e48ed0e823adf7211372ba9be8979defcda9b98e1fe8c066a3328" + "url": "https://ghcr.io/v2/homebrew/core/eza/blobs/sha256:12a95474e90f025ff9e0b16a8dba1592b3aae34d0f27aa741874bd5de8787afe", + "sha256": "12a95474e90f025ff9e0b16a8dba1592b3aae34d0f27aa741874bd5de8787afe" }, "sonoma": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/eza/blobs/sha256:236c3772567a64a00801ded7ff0fc032606b1d57ec8b87339831e2db55e091ce", - "sha256": "236c3772567a64a00801ded7ff0fc032606b1d57ec8b87339831e2db55e091ce" + "url": "https://ghcr.io/v2/homebrew/core/eza/blobs/sha256:6faf904c890dfd3c9a1e1879309b328a0bee54f9f8ed3aa2cedb375d8609aaf8", + "sha256": "6faf904c890dfd3c9a1e1879309b328a0bee54f9f8ed3aa2cedb375d8609aaf8" }, "ventura": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/eza/blobs/sha256:ebe0d0bef0f94605b3cfcd90a6473eea9764c64a663538adc12b8d21e8caf44a", - "sha256": "ebe0d0bef0f94605b3cfcd90a6473eea9764c64a663538adc12b8d21e8caf44a" + "url": "https://ghcr.io/v2/homebrew/core/eza/blobs/sha256:7a65dd9953f5172ef6b6a938f4da13a848a26a96c5dda166d5003c6e424971c4", + "sha256": "7a65dd9953f5172ef6b6a938f4da13a848a26a96c5dda166d5003c6e424971c4" }, "monterey": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/eza/blobs/sha256:54903369a162c249bbc496e3cd4ca6af8812fe3f5cd09cb0d71d26c65cc15873", - "sha256": "54903369a162c249bbc496e3cd4ca6af8812fe3f5cd09cb0d71d26c65cc15873" + "url": "https://ghcr.io/v2/homebrew/core/eza/blobs/sha256:d2541131fdef6333357a65d55f460b01e5f11095ced7b9c563b105df72816513", + "sha256": "d2541131fdef6333357a65d55f460b01e5f11095ced7b9c563b105df72816513" }, "x86_64_linux": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/eza/blobs/sha256:c6af0883b1347735de92639d18332aa9d2edb580f59d7a50fb2a1a8e05195cec", - "sha256": "c6af0883b1347735de92639d18332aa9d2edb580f59d7a50fb2a1a8e05195cec" + "url": "https://ghcr.io/v2/homebrew/core/eza/blobs/sha256:6a577161eda4c7a1d870b21da914a29d7029991628428265d0cf1fbb556213b3", + "sha256": "6a577161eda4c7a1d870b21da914a29d7029991628428265d0cf1fbb556213b3" } } } @@ -2404,48 +2404,38 @@ "files": { "arm64_sonoma": { "cellar": "/opt/homebrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/zls/blobs/sha256:1866605a7d3b4dd42e66e2fcf78bd80541ef44334de24f23315b999065fe5bd2", - "sha256": "1866605a7d3b4dd42e66e2fcf78bd80541ef44334de24f23315b999065fe5bd2" + "url": "https://ghcr.io/v2/homebrew/core/zls/blobs/sha256:db9414901af8a8f0fecc8f160737bf2cbc54c2ddc064360045dda755f293c51b", + "sha256": "db9414901af8a8f0fecc8f160737bf2cbc54c2ddc064360045dda755f293c51b" }, "arm64_ventura": { "cellar": "/opt/homebrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/zls/blobs/sha256:ed5d2f6503f42691ac89599e5cafc87e220c0b72f90b59108a3212faccbf5990", - "sha256": "ed5d2f6503f42691ac89599e5cafc87e220c0b72f90b59108a3212faccbf5990" + "url": "https://ghcr.io/v2/homebrew/core/zls/blobs/sha256:05bfd37adb678e739719dc7c29d0f73295c7e5a70e3275f20f3ee541c10fac8d", + "sha256": "05bfd37adb678e739719dc7c29d0f73295c7e5a70e3275f20f3ee541c10fac8d" }, "arm64_monterey": { "cellar": "/opt/homebrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/zls/blobs/sha256:9119d879e10ebfe1de831340e2a4abb70d97c96e3af87f05b99e24b29db44bc4", - "sha256": "9119d879e10ebfe1de831340e2a4abb70d97c96e3af87f05b99e24b29db44bc4" - }, - "arm64_big_sur": { - "cellar": "/opt/homebrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/zls/blobs/sha256:706e23ca5c57b425e55109c98caababa09ac7ca8377554218a809f0d8fb122d2", - "sha256": "706e23ca5c57b425e55109c98caababa09ac7ca8377554218a809f0d8fb122d2" + "url": "https://ghcr.io/v2/homebrew/core/zls/blobs/sha256:71cf1b8c3a92e177a06011987f226fad98d52ddf29d0cc7ade038a3b3fc38edb", + "sha256": "71cf1b8c3a92e177a06011987f226fad98d52ddf29d0cc7ade038a3b3fc38edb" }, "sonoma": { "cellar": "/usr/local/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/zls/blobs/sha256:aad81bb0753a93beb5f5e59a01300a643b9a9c35a339fd9747eba30d16bed81f", - "sha256": "aad81bb0753a93beb5f5e59a01300a643b9a9c35a339fd9747eba30d16bed81f" + "url": "https://ghcr.io/v2/homebrew/core/zls/blobs/sha256:a389af165a8dee9b6de1ad1e4cd172767b05a8a4bbf749072215a2ff7fe87b48", + "sha256": "a389af165a8dee9b6de1ad1e4cd172767b05a8a4bbf749072215a2ff7fe87b48" }, "ventura": { "cellar": "/usr/local/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/zls/blobs/sha256:30505ce3201a97387aa696eaa2dcc6055a46ff8dd8ec96c26afc8723c932da76", - "sha256": "30505ce3201a97387aa696eaa2dcc6055a46ff8dd8ec96c26afc8723c932da76" + "url": "https://ghcr.io/v2/homebrew/core/zls/blobs/sha256:a1406ebea301bf4a79ce6073bf1ea58551a8cbcaa7fcdfca7690ddbcda4689b8", + "sha256": "a1406ebea301bf4a79ce6073bf1ea58551a8cbcaa7fcdfca7690ddbcda4689b8" }, "monterey": { "cellar": "/usr/local/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/zls/blobs/sha256:3f2555ad020179925949d6f972f0aed5f706f5eb8cfc4306a3b779e6b07eff03", - "sha256": "3f2555ad020179925949d6f972f0aed5f706f5eb8cfc4306a3b779e6b07eff03" - }, - "big_sur": { - "cellar": "/usr/local/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/zls/blobs/sha256:01e0af8de1a237b5a1cf702a3a011968e145193d17607ffbe656c28d956b2c8a", - "sha256": "01e0af8de1a237b5a1cf702a3a011968e145193d17607ffbe656c28d956b2c8a" + "url": "https://ghcr.io/v2/homebrew/core/zls/blobs/sha256:ca073e230f3a16311ce6328d375da154fb81569b5fe08727393ff482681e0aec", + "sha256": "ca073e230f3a16311ce6328d375da154fb81569b5fe08727393ff482681e0aec" }, "x86_64_linux": { "cellar": "/home/linuxbrew/.linuxbrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/zls/blobs/sha256:d09a679d60dd36ed4e02b56af14628af478678ccf049885d0c2922cccc85d443", - "sha256": "d09a679d60dd36ed4e02b56af14628af478678ccf049885d0c2922cccc85d443" + "url": "https://ghcr.io/v2/homebrew/core/zls/blobs/sha256:80a60f63a55b8472d728617aad4369858f2851728f1ac59470a383f529e12f8e", + "sha256": "80a60f63a55b8472d728617aad4369858f2851728f1ac59470a383f529e12f8e" } } } @@ -2947,6 +2937,65 @@ "freeze": { "version": "0.1.6", "bottle": false + }, + "gron": { + "version": "0.7.1", + "bottle": { + "rebuild": 0, + "root_url": "https://ghcr.io/v2/homebrew/core", + "files": { + "arm64_sonoma": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/gron/blobs/sha256:597c9c6fc6cdf0006dece77e1954e5112ebb2d61d996fc5d2273018a634a3ecd", + "sha256": "597c9c6fc6cdf0006dece77e1954e5112ebb2d61d996fc5d2273018a634a3ecd" + }, + "arm64_ventura": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/gron/blobs/sha256:3ab0e3eca90fad344508e30b818ad21ecb6bd4f0995bde86d0d8b86e47cbc3bf", + "sha256": "3ab0e3eca90fad344508e30b818ad21ecb6bd4f0995bde86d0d8b86e47cbc3bf" + }, + "arm64_monterey": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/gron/blobs/sha256:856236ceb1dbc90437bd4a214ac5cbf9618ae17bb170f5187fc0acbd8110b174", + "sha256": "856236ceb1dbc90437bd4a214ac5cbf9618ae17bb170f5187fc0acbd8110b174" + }, + "arm64_big_sur": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/gron/blobs/sha256:322c63263dead630c89ab151634b663ecf95d93a82034b3e5b75c42318912835", + "sha256": "322c63263dead630c89ab151634b663ecf95d93a82034b3e5b75c42318912835" + }, + "sonoma": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/gron/blobs/sha256:98148084bf065904b2a75f4dc7b94982f09a277c62cd5e0d843918e6fb022f4f", + "sha256": "98148084bf065904b2a75f4dc7b94982f09a277c62cd5e0d843918e6fb022f4f" + }, + "ventura": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/gron/blobs/sha256:f046a622113661374c20ca12ba8e725f80bdf9ac1be704e3e7b850a0219e9e84", + "sha256": "f046a622113661374c20ca12ba8e725f80bdf9ac1be704e3e7b850a0219e9e84" + }, + "monterey": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/gron/blobs/sha256:7b03cebd6d4120718aeb3de935087981d9e234c844df866076518417dfd6e9e0", + "sha256": "7b03cebd6d4120718aeb3de935087981d9e234c844df866076518417dfd6e9e0" + }, + "big_sur": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/gron/blobs/sha256:c28a8bf800179d49a5aeb52d57bac6100eee9a5755c0dc112dc7fd7e7413323f", + "sha256": "c28a8bf800179d49a5aeb52d57bac6100eee9a5755c0dc112dc7fd7e7413323f" + }, + "catalina": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/gron/blobs/sha256:d8422ab18406e6231c4731d0f124641508175c2ee142bd5bd0d99f1a97252c3b", + "sha256": "d8422ab18406e6231c4731d0f124641508175c2ee142bd5bd0d99f1a97252c3b" + }, + "x86_64_linux": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/gron/blobs/sha256:b10089d68a7958fb52643f3813b910fb5ab3a89ffb18d5161e5f717956b6bf2c", + "sha256": "b10089d68a7958fb52643f3813b910fb5ab3a89ffb18d5161e5f717956b6bf2c" + } + } + } } }, "cask": { @@ -3017,7 +3066,7 @@ } }, "raycast": { - "version": "1.72.0", + "version": "1.72.1", "options": { "full_name": "raycast" } @@ -3047,7 +3096,7 @@ } }, "zed": { - "version": "0.131.7", + "version": "0.132.3", "options": { "full_name": "zed" } @@ -3057,7 +3106,7 @@ "system": { "macos": { "sonoma": { - "HOMEBREW_VERSION": "4.2.19-85-g34ea988", + "HOMEBREW_VERSION": "4.2.19-131-g5e027bf", "HOMEBREW_PREFIX": "/opt/homebrew", "Homebrew/homebrew-core": "api", "CLT": "15.3.0.0.1.1708646388", diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 1937d722..3ff47bb0 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -14,7 +14,7 @@ "lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1a14770dc8c7cb29643870ac79788eec6f7ce1f8" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "273fdde8ac5e51f3a223ba70980e52bbc09d9f6f" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "b129892f783740e6cf741f2ea09fa5dd512aa584" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, "mini.nvim": { "branch": "main", "commit": "f24747266a047617d06605a2316aa6c071662fa2" }, @@ -25,16 +25,16 @@ "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, "nvim-coverage": { "branch": "main", "commit": "aa4b4400588e2259e87e372b1e4e90ae13cf5a39" }, "nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" }, - "nvim-lspconfig": { "branch": "master", "commit": "cfa386fc4027e847156ee16141ea1f4c0bc2f0a4" }, + "nvim-lspconfig": { "branch": "master", "commit": "7133e85c3df14a387da8942c094c7edddcdef309" }, "nvim-spectre": { "branch": "master", "commit": "026394a8458d62c6b7b305c076ce675420dbaa4c" }, - "nvim-treesitter": { "branch": "master", "commit": "876111c8df409a6ad17ba1ff6e1a90bac22b4a42" }, + "nvim-treesitter": { "branch": "master", "commit": "0883ff05655117a3fc79ab295a640c4984cfd415" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "23b820146956b3b681c19e10d3a8bc0cbd9a1d4c" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "a6382f744f584bbf71d0a563af789af7190aabda" }, "nvim-web-devicons": { "branch": "master", "commit": "beb6367ab8496c9e43f22e0252735fdadae1872d" }, "obsidian.nvim": { "branch": "main", "commit": "b1bfc2ad9172f0405bf6c21e1f63cfb73f79b480" }, "oil.nvim": { "branch": "master", "commit": "f3a31eba24587bc038592103d8f7e64648292115" }, "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, - "plenary.nvim": { "branch": "master", "commit": "5129a3693c482fcbc5ab99a7706ffc4360b995a0" }, + "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, "poimandres.nvim": { "branch": "main", "commit": "77635055e686ae3c8a519198006ff0b43b6b2eae" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, diff --git a/nvim/lua/plugins/colors.lua b/nvim/lua/plugins/colors.lua index ebf5185c..7f6096fe 100644 --- a/nvim/lua/plugins/colors.lua +++ b/nvim/lua/plugins/colors.lua @@ -9,7 +9,7 @@ return { 'folke/tokyonight.nvim', lazy = false, priority = 1000, - config = function() vim.cmd([[colorscheme tokyonight]]) end, + config = function() vim.cmd([[colorscheme tokyonight-moon]]) end, }, { 'olivercederborg/poimandres.nvim', diff --git a/nvim/lua/plugins/gitsigns.lua b/nvim/lua/plugins/gitsigns.lua index 4c12cf82..47bde050 100644 --- a/nvim/lua/plugins/gitsigns.lua +++ b/nvim/lua/plugins/gitsigns.lua @@ -18,7 +18,7 @@ return { -- stylua: ignore end }, opts = { - signcolumn = false, + signcolumn = true, numhl = true, signs = { add = { text = '▒' }, diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua index 2fc237d2..e9091175 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/nvim/lua/plugins/telescope.lua @@ -61,7 +61,8 @@ return { vim.keymap.set('n', 'fg', builtin.git_status, { desc = 'Files (changed)' }) vim.keymap.set('n', 'fh', builtin.help_tags, { desc = 'Help' }) vim.keymap.set('n', 'fk', builtin.keymaps, { desc = 'Keymaps' }) - vim.keymap.set('n', 'fo', builtin.oldfiles, { desc = 'Files (old)' }) + vim.keymap.set('n', 'fO', builtin.oldfiles, { desc = 'Files (old)' }) + vim.keymap.set('n', 'fo', function() builtin.oldfiles({ only_cwd = true }) end, { desc = 'Files (old)' }) vim.keymap.set('n', 'fr', builtin.resume, { desc = 'Resume' }) vim.keymap.set('n', 'ft', builtin.builtin, { desc = 'Builtins' }) vim.keymap.set('n', 'fz', builtin.spell_suggest, { desc = 'Spelling' }) diff --git a/wezterm/wezterm.lua b/wezterm/wezterm.lua index 58853347..aa5a322d 100644 --- a/wezterm/wezterm.lua +++ b/wezterm/wezterm.lua @@ -6,6 +6,7 @@ local config = wezterm.config_builder() config.term = 'wezterm' -- Text +-- config.font = wezterm.font('IBM Plex Mono') config.font = wezterm.font('JetBrains Mono') -- config.font = wezterm.font('Berkeley Mono') -- config.font = wezterm.font('Input Mono Narrow') @@ -19,7 +20,7 @@ config.set_environment_variables = { -- Colors -- config.color_scheme = 'nightfox' -config.color_scheme = 'tokyonight' +config.color_scheme = 'tokyonight_moon' -- config.color_scheme = 'Poimandres' -- config.color_scheme = 'Molokai (Gogh)' @@ -27,7 +28,7 @@ config.color_scheme = 'tokyonight' config.enable_scroll_bar = false config.tab_bar_at_bottom = true config.use_fancy_tab_bar = false --- config.force_reverse_video_cursor = true +config.force_reverse_video_cursor = true config.window_padding = { left = 0, diff --git a/zed/keymap.json b/zed/keymap.json index c1d4d3ca..e69de29b 100644 --- a/zed/keymap.json +++ b/zed/keymap.json @@ -1,60 +0,0 @@ -[ - { - "context": "Editor && VimControl && !VimWaiting && !menu", - "bindings": { - "ctrl-w z": "workspace::ToggleZoom", - "ctrl-w t": "terminal_panel::ToggleFocus", - "ctrl-h": ["workspace::ActivatePaneInDirection", "Left"], - "ctrl-l": ["workspace::ActivatePaneInDirection", "Right"], - "ctrl-k": ["workspace::ActivatePaneInDirection", "Up"], - "ctrl-j": ["workspace::ActivatePaneInDirection", "Down"], - "1 g shift-d": "editor::GoToImplementation", - "] d": "editor::GoToDiagnostic", - "[ d": "editor::GoToPrevDiagnostic", - "g shift-r": "editor::FindAllReferences", - "shift-k": "editor::Hover", - "g a": "editor::ToggleCodeActions", - "g r": "editor::Rename", - "j": ["vim::Down", { "displayLines": true }], - "k": ["vim::Up", { "displayLines": true }] - } - }, - { - "context": "Editor && vim_mode == normal && !VimWaiting && !VimCount", - "bindings": { - "0": [ - "vim::StartOfLine", - { - "displayLines": true - } - ], - "$": [ - "vim::EndOfLine", - { - "displayLines": true - } - ] - } - }, - { - "context": "Editor && vim_mode == normal", - "bindings": { - "g c c": "editor::ToggleComments" - } - }, - { - "context": "Terminal", - "bindings": { - "ctrl-u": "terminal::Clear" - } - }, - { - "context": "Dock", - "bindings": { - "ctrl-h": ["workspace::ActivatePaneInDirection", "Left"], - "ctrl-l": ["workspace::ActivatePaneInDirection", "Right"], - "ctrl-k": ["workspace::ActivatePaneInDirection", "Up"], - "ctrl-j": ["workspace::ActivatePaneInDirection", "Down"] - } - } -] diff --git a/zed/settings.json b/zed/settings.json index 6a6a8f4c..e69de29b 100644 --- a/zed/settings.json +++ b/zed/settings.json @@ -1,51 +0,0 @@ -// Zed settings -// -// For information on how to configure Zed, see the Zed -// documentation: https://zed.dev/docs/configuring-zed -// -// To see all of Zed's default settings without changing your -// custom settings, run the `open default settings` command -// from the command palette or from `Zed` application menu. -{ - "base_keymap": "VSCode", - "buffer_font_family": "JetBrains Mono", - "buffer_font_size": 13, - "cursor_blink": false, - "format_on_save": "on", - "inlay_hints": { "enabled": true }, - "project_panel": { "dock": "left" }, - "scrollbar": { "show": "always" }, - "show_whitespaces": "all", - "soft_wrap": "editor_width", - "terminal": { "dock": "bottom", "blinking": "on" }, - "theme": "Atelier Sulphurpool Light", - "vim_mode": true, - "formatter": "language_server", - "languages": { - "TypeScript": { - "formatter": "language_server", - "code_actions_on_format": { - "source.eslint.fixall": true - } - } - }, - "lsp": { - "rust_analyzer": { - "initialization_options": { - "checkOnSave": { - "command": "clippy" - }, - "inlayHints": { - "maxLength": null, - "lifetimeElisionHints": { - "useParameterNames": true, - "enable": "skip_trivial" - }, - "closureReturnTypeHints": { - "enable": "always" - } - } - } - } - } -}