diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml index f9c41ff..1b514f3 100644 --- a/alacritty/.config/alacritty/alacritty.yml +++ b/alacritty/.config/alacritty/alacritty.yml @@ -1,3 +1,5 @@ +env: + TERM: xterm-256color colors: bright: black: "#928374" @@ -29,8 +31,8 @@ cursor: blinking: "Never" unfocused_hollow: true font: - #normal: { "family": "Fira Code" } - normal: { "family": "Menlo" } + normal: { "family": "FiraMono Nerd Font" } + #normal: { "family": "Menlo" } #normal: { "family": "APL 385 Unicode" } #normal: { "family": "Fira Code" } #normal: { "family": "Jetbrains Mono" } @@ -42,7 +44,7 @@ font: #normal: { "family": "cozette" } #normal: { "family": "Terminus" } offset: { "x": 0, "y": 0 } - size: 12 + size: 14 key_bindings: - { "action": "SpawnNewInstance", "key": "N", "mods": "Control|Shift" } diff --git a/nvim/.config/nvim/fnl/dots/plugins/bufferline.fnl b/nvim/.config/nvim/fnl/dots/plugins/bufferline.fnl index 2b8b92d..3310243 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/bufferline.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/bufferline.fnl @@ -61,7 +61,7 @@ :separator_visible {:bg colors.red} :separator_selected {:bg colors.red} :indicator_selected {:bg colors.neutral_aqua :fg colors.neutral_aqua :italic false :bold false} - :tab_separator {:bg colors.red} + ;:tab_separator {:bg colors.red} :tab_separator_selected {:bg colors.neutral_aqua :fg colors.neutral_aqua} ; stuff I've never seen before :thonk: @@ -70,4 +70,4 @@ :tab {:bg colors.bright_yellow :fg colors.bright_yellow}}}))) [(utils.plugin :akinsho/nvim-bufferline.lua - {:config setup :tag "v4.4.0"})] + {:config setup :tag "v4.5.2"})] diff --git a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl index acb22e1..d344b6f 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/lsp.fnl @@ -93,25 +93,27 @@ (set client.resolved_capabilities.document_formatting false) (on_attach client bufnr))}) - (let [rust-tools (require "rust-tools") - rust-tools-dap (require "rust-tools.dap") + + (let [ + rustaceanvim (require "rustaceanvim") + rustaceanvim-config (require "rustaceanvim.config") extension-path "/home/leon/.vscode/extensions/vadimcn.vscode-lldb-1.6.8/" codelldb-path (.. extension-path "adapter/codelldb") liblldb-path (.. extension-path "lldb/lib/liblldb.so") features nil] - (rust-tools.setup {:tools {:inlay_hints {:show_parameter_hints false} - ;:auto false} - :autoSetHints false} - :dap {:adapter (rust-tools-dap.get_codelldb_adapter codelldb-path liblldb-path)} - :server {:on_attach on_attach - :capabilities default-capabilities - :settings {:rust-analyzer {:cargo {:loadOutDirsFromCheck true - :features (or features "all") - :noDefaultFeatures (~= nil features)} - :procMacro {:enable true} - :diagnostics {:enable false ;; native rust analyzer diagnostics - :experimental {:enable false}} - :checkOnSave {:overrideCommand ["cargo" "clippy" "--workspace" "--message-format=json" "--all-targets" "--all-features"]}}}}})) + + (set vim.g.rustaceanvim {:tools {:inlay_hints {:show_parameter_hints false} + :autoSetHints false} + :dap {:adapter (rustaceanvim-config.get_codelldb_adapter codelldb-path liblldb-path)} + :server {:on_attach on_attach + :capabilities default-capabilities + :settings {:rust-analyzer {:cargo {:loadOutDirsFromCheck true + :features (or features "all") + :noDefaultFeatures (~= nil features)} + :procMacro {:enable true} + :diagnostics {:enable false ;; native rust analyzer diagnostics + :experimental {:enable false}} + :checkOnSave {:overrideCommand ["cargo" "clippy" "--workspace" "--message-format=json" "--all-targets" "--all-features"]}}}}})) ;:cmd ["/home/leon/coding/prs/rust-analyzer/target/release/rust-analyzer"]}})) diff --git a/nvim/.config/nvim/fnl/dots/plugins/plugins.fnl b/nvim/.config/nvim/fnl/dots/plugins/plugins.fnl index e0c87c2..c085928 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/plugins.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/plugins.fnl @@ -63,7 +63,9 @@ (plugin :rcarriga/nvim-dap-ui {:lazy true :config true - :dependencies [:mfussenegger/nvim-dap]}) + :dependencies [:mfussenegger/nvim-dap + :nvim-neotest/nvim-nio]}) + (plugin :mfussenegger/nvim-dap {:lazy true}) (plugin :nvim-telescope/telescope-dap.nvim @@ -154,9 +156,10 @@ :enable_update_available_warning false}}) ; temporarily using this fork that merges a few fixes, until simrat is back - (plugin :MunifTanjim/rust-tools.nvim - {:ft ["rust" "toml"] - :dependencies ["nvim-lua/popup.nvim" "nvim-lua/plenary.nvim"]}) + (plugin :mrcjkb/rustaceanvim {:version 4 :ft ["rust" "toml"]}) + ;(plugin :MunifTanjim/rust-tools.nvim + ;{:ft ["rust" "toml"] + ;:dependencies ["nvim-lua/popup.nvim" "nvim-lua/plenary.nvim"]}) ;(plugin :simrat39/rust-tools.nvim ;{:ft ["rust" "toml"] ;:dependencies ["nvim-lua/popup.nvim" "nvim-lua/plenary.nvim"]}) diff --git a/nvim/.config/nvim/fnl/dots/plugins/treesitter.fnl b/nvim/.config/nvim/fnl/dots/plugins/treesitter.fnl index 85d6c46..6436a9d 100644 --- a/nvim/.config/nvim/fnl/dots/plugins/treesitter.fnl +++ b/nvim/.config/nvim/fnl/dots/plugins/treesitter.fnl @@ -23,7 +23,7 @@ ; Might fuck with gitsigns ;:rainbow {:enable true} ;:extended_mode true} - :context_commentstring {:enable true :disable ["rust" "fennel"]} + ;:context_commentstring {:enable true :disable ["rust" "fennel"]} :playground {:enable false diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index b15e5ee..c2d7362 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -7,86 +7,87 @@ "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-calc": { "branch": "main", "commit": "ce91d14d2e7a8b3f6ad86d85e34d41c1ae6268d9" }, "cmp-conventionalcommits": { "branch": "master", "commit": "a4dfacf0601130b7f8afa7c948d735c27802fb7f" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-omni": { "branch": "main", "commit": "4ef610bbd85a5ee4e97e09450c0daecbdc60de86" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" }, "conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" }, - "conjure": { "branch": "master", "commit": "58c46d1f4999679659a5918284b574c266a7ac83" }, - "copilot.lua": { "branch": "master", "commit": "73047082d72fcfdde1f73b7f17ad495cffcbafaa" }, - "diffview.nvim": { "branch": "main", "commit": "d38c1b5266850f77f75e006bcc26213684e1e141" }, - "dressing.nvim": { "branch": "master", "commit": "fe3071330a0720ce3695ac915820c8134b22d1b0" }, - "editorconfig-vim": { "branch": "master", "commit": "0d54ea863089fb13be423b4aed6cca35f3a5d778" }, + "conjure": { "branch": "master", "commit": "dfb9f75010a181c090ab905b2a2b4180aea20f15" }, + "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, + "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" }, + "dressing.nvim": { "branch": "master", "commit": "18e5beb3845f085b6a33c24112b37988f3f93c06" }, + "editorconfig-vim": { "branch": "master", "commit": "0956bc257ca4eaa3e087e0ba2253a3e980805820" }, "emmet-vim": { "branch": "master", "commit": "def5d57a1ae5afb1b96ebe83c4652d1c03640f4d" }, "feline.nvim": { "branch": "master", "commit": "3587f57480b88e8009df7b36dc84e9c7ff8f2c49" }, "fennel.vim": { "branch": "master", "commit": "30b9beabad2c4f09b9b284caf5cd5666b6b4dc89" }, - "flutter-tools.nvim": { "branch": "main", "commit": "7350750d46fbeb4d2bb4878157b658d435935299" }, - "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, - "gh.nvim": { "branch": "main", "commit": "509e19660cbe5b06f0e43ca1ad5ed98f281c2c95" }, - "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" }, - "glance.nvim": { "branch": "master", "commit": "8ed5cf3b3b1231ea696d88c9efd977027429d869" }, + "flutter-tools.nvim": { "branch": "main", "commit": "4f18033c3b78aa5450e538d81dfbbb3e67aeadec" }, + "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, + "gh.nvim": { "branch": "main", "commit": "3181973d0c80fe0553e30e0aeeb860bedef9a33b" }, + "gitsigns.nvim": { "branch": "main", "commit": "c097cb255096f333e14d341082a84f572b394fa2" }, + "glance.nvim": { "branch": "master", "commit": "51059bcf21016387b6233c89eed220cf47fca752" }, "haskell-vim": { "branch": "master", "commit": "f35d02204b4813d1dbe8b0e98cc39701a4b8e15e" }, "hop.nvim": { "branch": "master", "commit": "1a1eceafe54b5081eae4cb91c723abd1d450f34b" }, "idris2-vim": { "branch": "master", "commit": "964cebee493c85f75796e4f4e6bbb4ac54e2da9e" }, - "inc-rename.nvim": { "branch": "main", "commit": "ed0f6f2b917cac4eb3259f907da0a481b27a3b7e" }, + "inc-rename.nvim": { "branch": "main", "commit": "5e03e986625961d1fac296d1bf332a6510c3add6" }, "kmonad-vim": { "branch": "master", "commit": "37978445197ab00edeb5b731e9ca90c2b141723f" }, "lalrpop.vim": { "branch": "master", "commit": "7073eec8efdeff37cacd4bca378c28dad02c3c14" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "litee.nvim": { "branch": "main", "commit": "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2" }, - "lsp_lines.nvim": { "branch": "main", "commit": "cf2306dd332e34a3e91075b40bdd4f6db824b2ee" }, - "lsp_signature.nvim": { "branch": "master", "commit": "9ed85616b772a07f8db56c26e8fff2d962f1f211" }, - "neoformat": { "branch": "master", "commit": "51f0eef4c47f4a677ce6272c103d4ac74acb3b8f" }, - "neogit": { "branch": "master", "commit": "d3c5687a78cffc25026ff31d2fcbd61a2a3e067f" }, - "nerdcommenter": { "branch": "master", "commit": "da948e160d9f54c2967c7927b9c74c5a68c8dc49" }, - "nfnl": { "branch": "main", "commit": "979dbfc48bcb601a9107764a99f9459cb5bd4051" }, - "nvim-bufferline.lua": { "branch": "main", "commit": "6ecd37e0fa8b156099daedd2191130e083fb1490" }, - "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, - "nvim-code-action-menu": { "branch": "main", "commit": "e4399dbaf6eabff998d3d5f1cbcd8d9933710027" }, + "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, + "litee.nvim": { "branch": "main", "commit": "3c51764a615566e4c0223362f4be00acc23c430e" }, + "lsp_lines.nvim": { "branch": "main", "commit": "6f3defec73f7c87939e800e9afa5d0571b19b401" }, + "lsp_signature.nvim": { "branch": "master", "commit": "c6aeb2f1d2538bbdfdaab1664d9d4c3c75aa9db8" }, + "neoformat": { "branch": "master", "commit": "4372abb846f43ec121df40e620682c985ebc8286" }, + "neogit": { "branch": "master", "commit": "c0b1d4dfc8ba6371857868ca7c4d33954cf002fd" }, + "nerdcommenter": { "branch": "master", "commit": "e361a44230860d616f799a337bc58f5218ab6e9c" }, + "nfnl": { "branch": "main", "commit": "d6b33ae7376dda6f26cca8365d9beaf66f43c410" }, + "nvim-bufferline.lua": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, + "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, + "nvim-code-action-menu": { "branch": "main", "commit": "8c7672a4b04d3cc4edd2c484d05b660a9cb34a1b" }, "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" }, - "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" }, - "nvim-jenkinsfile-linter": { "branch": "main", "commit": "6e740a9e42251452cbc79808ea894f5233a93e92" }, - "nvim-lspconfig": { "branch": "master", "commit": "36e4ffec0a9e373ac9dbf7949d3567c8f04ca3df" }, + "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" }, + "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, + "nvim-jenkinsfile-linter": { "branch": "main", "commit": "b6b48b0a7aed92ed46bb9e1ab208dce92941f50b" }, + "nvim-lspconfig": { "branch": "master", "commit": "b3014f2209503944f2714cf27c95591433a0c7d8" }, + "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" }, "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" }, - "nvim-treesitter": { "branch": "master", "commit": "8996612bfbebe1657e1bb55a95201c96cab945c6" }, - "nvim-treesitter-textsubjects": { "branch": "master", "commit": "011c09784f1a95cf469a48c1993b664190440391" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" }, - "nvim-web-devicons": { "branch": "master", "commit": "47103b80c38c59f7a1b5408c232b92bf5d018651" }, + "nvim-treesitter": { "branch": "master", "commit": "ef267f0c285928ea3a0d3362a260a0728fd4a146" }, + "nvim-treesitter-textsubjects": { "branch": "master", "commit": "9f9a6b307fb122f13708f78483222abd43b7bb3a" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "734ebad31c81c6198dfe102aa23280937c937c42" }, + "nvim-web-devicons": { "branch": "master", "commit": "6e355632387a085f15a66ad68cf681c1d7374a04" }, "nvim.lua": { "branch": "master", "commit": "5d57be0b6eea6c06977b1c5fe0752da909cf4154" }, - "nvlime": { "branch": "master", "commit": "83606f7e2d017ee7fcafe4ed4bf91ac776705633" }, - "obsidian.nvim": { "branch": "main", "commit": "387f5cf90718b729e1e855e66dd272039395a6dc" }, - "octo.nvim": { "branch": "master", "commit": "2e4cdb6faa3f05c85605c0074f471840747337da" }, + "nvlime": { "branch": "master", "commit": "936df437a74851e2696d802778f3217e2b296af9" }, + "obsidian.nvim": { "branch": "main", "commit": "9644aca08334bb3f6fbeeccacc9e4dbb5855577e" }, + "octo.nvim": { "branch": "master", "commit": "a511b52fbf040f928a24deb72e17ec465613b442" }, "parinfer-rust": { "branch": "master", "commit": "0e4d52e712641ad351a1bfe6cee3d34d63ed087b" }, - "parsley": { "branch": "main", "commit": "9a388fe9e8a443d9d892318b4cce6dd287c47e38" }, - "persistence.nvim": { "branch": "main", "commit": "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32" }, + "parsley": { "branch": "main", "commit": "c4100aa449bfa971dcfc56ffe4206ba034db08cc" }, + "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" }, "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "purescript-vim": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" }, - "rust-tools.nvim": { "branch": "patched", "commit": "4338a9b08faa8da8b5aad095a035ceff31301e3f" }, "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, + "rustaceanvim": { "branch": "master", "commit": "c1d79cdd069f4d4882eee453a69d55b8bd7c1ba9" }, "sad.vim": { "branch": "master", "commit": "2f5b33b239a566ffedaa81cee3051bb613482d1e" }, "stabilize.nvim": { "branch": "master", "commit": "eeb1873daffaba67246188a5668b366e45ed1de1" }, "startuptime.vim": { "branch": "master", "commit": "dfa57f522d6f61793fe5fea65bca7484751b8ca2" }, "tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" }, "targets.vim": { "branch": "master", "commit": "642d3a4ce306264b05ea3219920b13ea80931767" }, - "telescope-dap.nvim": { "branch": "master", "commit": "4e2d5efb92062f0b865fe59b200b5ed7793833bf" }, - "telescope.nvim": { "branch": "master", "commit": "20bf20500c95208c3ac0ef07245065bf94dcab15" }, - "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, - "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, - "typescript-vim": { "branch": "master", "commit": "eafdcf5e9ee73b43d92372d69dd84458bf98c5e3" }, + "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" }, + "telescope.nvim": { "branch": "master", "commit": "5a701e99906961218b55d7ad6c2a998f066c6fe0" }, + "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, + "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, + "typescript-vim": { "branch": "master", "commit": "e83ccab88c7a045ce795583adb66956afd464a31" }, "vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" }, - "vim-exchange": { "branch": "master", "commit": "784d63083ad7d613aa96f00021cd0dfb126a781a" }, - "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" }, - "vim-gh-line": { "branch": "master", "commit": "fbf368bdfad7e5478009a6dc62559e6b2c72d603" }, - "vim-gruvbox8": { "branch": "master", "commit": "8a634bd8d7539eb645e23147516d6c3054e71306" }, + "vim-exchange": { "branch": "master", "commit": "d6c1e9790bcb8df27c483a37167459bbebe0112e" }, + "vim-fugitive": { "branch": "master", "commit": "dac8e5c2d85926df92672bf2afb4fc48656d96c7" }, + "vim-gh-line": { "branch": "master", "commit": "731751fdfa4f64a061dbc7088cb7b2f12e0828ad" }, + "vim-gruvbox8": { "branch": "master", "commit": "d1cf31e5215ad6f5544d9e631383aef4b6c35cb7" }, "vim-indent-guides": { "branch": "master", "commit": "a1e1390c0136e63e813d051de2003bf0ee18ae30" }, "vim-javascript": { "branch": "master", "commit": "c470ce1399a544fe587eab950f571c83cccfbbdc" }, "vim-jsonc": { "branch": "master", "commit": "0b7ca17da85b5faa813be8ead3ad497e348b2763" }, "vim-jsx": { "branch": "master", "commit": "8879e0d9c5ba0e04ecbede1c89f63b7a0efa24af" }, - "vim-nix": { "branch": "master", "commit": "1e8d3cc4d74f40fb384cd1739739543fe117ff61" }, + "vim-nix": { "branch": "master", "commit": "e25cd0f2e5922f1f4d3cd969f92e35a9a327ffb0" }, "vim-raku": { "branch": "master", "commit": "f4496123353cce789fc6645ceb686f5cf51acca3" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, @@ -95,12 +96,12 @@ "vim-svelte": { "branch": "main", "commit": "0e93ec53c3667753237282926fec626785622c1c" }, "vim-toml": { "branch": "main", "commit": "d36caa6b1cf508a4df1c691f915572fc02143258" }, "vim-tsx": { "branch": "master", "commit": "77c89c42e189fefd3c9a632b37b7e3b3b9edf918" }, - "vim-visual-multi": { "branch": "master", "commit": "aec289a9fdabaa0ee6087d044d75b32e12084344" }, - "vim-vsnip": { "branch": "master", "commit": "be277461265f1e5c7db470aa479f30956597ea9e" }, + "vim-visual-multi": { "branch": "master", "commit": "e2ff111f123da6cf97f95b96b10eb95854f953c9" }, + "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" }, "vim-vsnip-integ": { "branch": "master", "commit": "1914e72cf3de70df7f5dde476cd299aba2440aef" }, - "vimtex": { "branch": "master", "commit": "7d1dbd0eebe041fbda4d1132622bf051b1546497" }, + "vimtex": { "branch": "master", "commit": "ac0a41b297a70c101df89bc9c8d43341ba00fd4f" }, "webapi-vim": { "branch": "master", "commit": "70c49ada7827d3545a65cbdab04c5c89a3a8464e" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, - "yats.vim": { "branch": "master", "commit": "2b6950c7143790e6930b8cf32d60c6858a50d47c" }, + "yats.vim": { "branch": "master", "commit": "6927af6e3e45d0ce585684be5681bada0ffcc3a7" }, "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" } } \ No newline at end of file diff --git a/tmux/.config/tmux/.gitignore b/tmux/.config/tmux/.gitignore new file mode 100644 index 0000000..5a02d10 --- /dev/null +++ b/tmux/.config/tmux/.gitignore @@ -0,0 +1 @@ +plugins diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf new file mode 100644 index 0000000..234540a --- /dev/null +++ b/tmux/.config/tmux/tmux.conf @@ -0,0 +1,72 @@ +set -g mouse on +unbind-key -a + +set -g @plugin 'tmux-plugins/tpm' +set -g @plugin 'tmux-plugins/tmux-sensible' + +set -g default-terminal "tmux-256color" +set -ag terminal-overrides ",xterm-256color:RGB" + + +bind-key -T root C-b send-prefix +bind-key -T prefix C-b send-prefix + +bind-key -T prefix t new-window +bind-key -T prefix n next-window +bind-key -T prefix p previous-window + +bind-key -T prefix \" split-window +bind-key -T prefix \% split-window -h + + +bind-key -r -T prefix Up select-pane -U +bind-key -r -T prefix Down select-pane -D +bind-key -r -T prefix Left select-pane -L +bind-key -r -T prefix Right select-pane -R + + +bind-key -T prefix C-o rotate-window +bind-key -T prefix C-z suspend-client +bind-key -T prefix Space next-layout +bind-key -T prefix \# list-buffers + + +bind-key -T prefix & confirm-before -p "kill-window #W? (y/n)" kill-window +bind-key -T prefix , command-prompt -I "#W" { rename-window "%%" } +bind-key -T prefix . command-prompt -T target { move-window -t "%%" } +bind-key -T prefix : command-prompt +bind-key -T prefix < display-menu -T "#[align=centre]#{window_index}:#{window_name}" -x W -y W "#{?#{>:#{session_windows},1},,-}Swap Left" l { swap-window -t :-1 } "#{?#{>:#{session_windows},1},,-}Swap Right" r { swap-window -t :+1 } "#{?pane_marked_set,,-}Swap Marked" s { swap-window } '' Kill X { kill-window } Respawn R { respawn-window -k } "#{?pane_marked,Unmark,Mark}" m { select-pane -m } Rename n { command-prompt -F -I "#W" { rename-window -t "#{window_id}" "%%" } } '' "New After" w { new-window -a } "New At End" W { new-window } +bind-key -T prefix = choose-buffer -Z +bind-key -T prefix > display-menu -T "#[align=centre]#{pane_index} (#{pane_id})" -x P -y P "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Top,}" < { send-keys -X history-top } "#{?#{m/r:(copy|view)-mode,#{pane_mode}},Go To Bottom,}" > { send-keys -X history-bottom } '' "#{?mouse_word,Search For #[underscore]#{=/9/...:mouse_word},}" C-r { if-shell -F "#{?#{m/r:(copy|view)-mode,#{pane_mode}},0,1}" "copy-mode -t=" ; send-keys -X -t = search-backward "#{q:mouse_word}" } "#{?mouse_word,Type #[underscore]#{=/9/...:mouse_word},}" C-y { copy-mode -q ; send-keys -l "#{q:mouse_word}" } "#{?mouse_word,Copy #[underscore]#{=/9/...:mouse_word},}" c { copy-mode -q ; set-buffer "#{q:mouse_word}" } "#{?mouse_line,Copy Line,}" l { copy-mode -q ; set-buffer "#{q:mouse_line}" } '' "#{?mouse_hyperlink,Type #[underscore]#{=/9/...:mouse_hyperlink},}" C-h { copy-mode -q ; send-keys -l "#{q:mouse_hyperlink}" } "#{?mouse_hyperlink,Copy #[underscore]#{=/9/...:mouse_hyperlink},}" h { copy-mode -q ; set-buffer "#{q:mouse_hyperlink}" } '' "Horizontal Split" h { split-window -h } "Vertical Split" v { split-window -v } '' "#{?#{>:#{window_panes},1},,-}Swap Up" u { swap-pane -U } "#{?#{>:#{window_panes},1},,-}Swap Down" d { swap-pane -D } "#{?pane_marked_set,,-}Swap Marked" s { swap-pane } '' Kill X { kill-pane } Respawn R { respawn-pane -k } "#{?pane_marked,Unmark,Mark}" m { select-pane -m } "#{?#{>:#{window_panes},1},,-}#{?window_zoomed_flag,Unzoom,Zoom}" z { resize-pane -Z } +bind-key -T prefix ? list-keys -N +bind-key -T prefix C customize-mode -Z +bind-key -T prefix M select-pane -M +bind-key -T prefix [ copy-mode +bind-key -T prefix ] paste-buffer -p +bind-key -T prefix f command-prompt { find-window -Z "%%" } +bind-key -T prefix i display-message +bind-key -T prefix r refresh-client +bind-key -T prefix x confirm-before -p "kill-pane #P? (y/n)" kill-pane +bind-key -T prefix z resize-pane -Z +bind-key -T prefix \~ show-messages +bind-key -r -T prefix DC refresh-client -c +bind-key -T prefix PPage copy-mode -u + +bind-key -T prefix M-n next-window -a +bind-key -T prefix M-o rotate-window -D +bind-key -T prefix M-p previous-window -a +bind-key -r -T prefix M-Up resize-pane -U 5 +bind-key -r -T prefix M-Down resize-pane -D 5 +bind-key -r -T prefix M-Left resize-pane -L 5 +bind-key -r -T prefix M-Right resize-pane -R 5 +bind-key -r -T prefix C-Up resize-pane -U +bind-key -r -T prefix C-Down resize-pane -D +bind-key -r -T prefix C-Left resize-pane -L +bind-key -r -T prefix C-Right resize-pane -R +bind-key -r -T prefix S-Up refresh-client -U 10 +bind-key -r -T prefix S-Down refresh-client -D 10 +bind-key -r -T prefix S-Left refresh-client -L 10 +bind-key -r -T prefix S-Right refresh-client -R 10 + +run '~/.tmux/plugins/tpm/tpm' + diff --git a/zed/.config/zed/keymap.json b/zed/.config/zed/keymap.json index b9be983..4304b85 100644 --- a/zed/.config/zed/keymap.json +++ b/zed/.config/zed/keymap.json @@ -1,7 +1,10 @@ [ { - "context": "Workspace && !VimWaiting && !menu", - "bindings": {} + "context": "EmptyPane", + "bindings": { + ":": "command_palette::Toggle", + "space p": "file_finder::Toggle" + } }, { "context": "Editor && VimControl && !VimWaiting && !menu", diff --git a/zellij/.config/zellij/config.kdl b/zellij/.config/zellij/config.kdl index 94a6a1c..6df061a 100644 --- a/zellij/.config/zellij/config.kdl +++ b/zellij/.config/zellij/config.kdl @@ -52,7 +52,7 @@ keybinds clear-defaults=true { plugins { tab-bar { path "tab-bar"; } - status-bar { path "status-bar"; } + // status-bar { path "status-bar"; } strider { path "strider"; } compact-bar { path "compact-bar"; } session-manager { path "session-manager"; }