From 759d1aa32217b44afcc8754ddb702e51444242fd Mon Sep 17 00:00:00 2001 From: Kacper Marzecki Date: Mon, 20 Oct 2025 16:52:17 +0200 Subject: [PATCH] asd --- nvim/.DS_Store | Bin 6148 -> 0 bytes nvim/.gitignore | 2 + nvim/LICENSE | 201 ----------------------------------- nvim/README.md | 4 - nvim/after/plugin/config.lua | 2 + nvim/init.lua | 4 +- nvim/lazy-lock.json | 1 + nvim/lazy-lock.json.bak | 73 ------------- nvim/lua/.DS_Store | Bin 6148 -> 0 bytes nvim/lua/config/autocmds.lua | 9 -- nvim/lua/config/keymaps.lua | 23 +--- nvim/lua/config/lazy.lua | 1 - nvim/lua/plugins/lsp.lua | 9 +- nvim/lua/plugins/plugins.lua | 48 ++------- nvim/lua/plugins/themes.lua | 13 --- readme.md | 72 ++++++++++++- 16 files changed, 95 insertions(+), 367 deletions(-) delete mode 100644 nvim/.DS_Store delete mode 100644 nvim/LICENSE delete mode 100644 nvim/README.md delete mode 100644 nvim/lazy-lock.json.bak delete mode 100644 nvim/lua/.DS_Store diff --git a/nvim/.DS_Store b/nvim/.DS_Store deleted file mode 100644 index 53c654d0dbd8dc84e31ef55a9a7a7ea852a4f4f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOKTf35SDBwmN5k%5(qg7dNtIKVlcUE9QPi&r9HI8-R&BC$$Dk{h!4iFkXu9k zPj9{T)N@b%5&a3Bk;bi!+a6m}WDF9#r)K;L4xdg^&LXR+W z2o@0OLIGW{ATB_!OT(u>yLH X4M2}Da|jv`{t>V=aK#M#RR+ETiSA|f diff --git a/nvim/.gitignore b/nvim/.gitignore index cc5457a..2db598d 100644 --- a/nvim/.gitignore +++ b/nvim/.gitignore @@ -6,3 +6,5 @@ debug foo.* *.log data +.DS_Store +*/*/.DS_Store diff --git a/nvim/LICENSE b/nvim/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/nvim/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/nvim/README.md b/nvim/README.md deleted file mode 100644 index 185280b..0000000 --- a/nvim/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# 💤 LazyVim - -A starter template for [LazyVim](https://github.com/LazyVim/LazyVim). -Refer to the [documentation](https://lazyvim.github.io/installation) to get started. diff --git a/nvim/after/plugin/config.lua b/nvim/after/plugin/config.lua index 843c6a1..a246423 100644 --- a/nvim/after/plugin/config.lua +++ b/nvim/after/plugin/config.lua @@ -1,3 +1,5 @@ +-- Whatever You want to run after the rest of the config has been executed + -- vim.cmd("colorscheme kanagawa-lotus") -- vim.cmd("colorscheme kanagawa-lotus") -- vim.cmd("colorscheme oxycarbon") diff --git a/nvim/init.lua b/nvim/init.lua index 2514f9e..de3c590 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -1,2 +1,4 @@ --- bootstrap lazy.nvim, LazyVim and your plugins require("config.lazy") + +-- Enable custom thingies Im working on +_G.kx_custom = false diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 2d44d5c..64373b1 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -21,6 +21,7 @@ "lazydev.nvim": { "branch": "main", "commit": "e28ce52fc7ff79fcb76f0e79ee6fb6182fca90b9" }, "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" }, + "markview.nvim": { "branch": "main", "commit": "c93ea99d96b4bfda5b7c7d0dfca9c26edf6e78f0" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "2304ff65ecc8cb2afc2484de3e2ed9a407edf0b9" }, "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, "mini.ai": { "branch": "main", "commit": "11c57180bc9084089206e211ac7aa598bedc9673" }, diff --git a/nvim/lazy-lock.json.bak b/nvim/lazy-lock.json.bak deleted file mode 100644 index 2c1ecee..0000000 --- a/nvim/lazy-lock.json.bak +++ /dev/null @@ -1,73 +0,0 @@ -{ - "LazyVim": { "branch": "main", "commit": "3f034d0a7f58031123300309f2efd3bb0356ee21" }, - "avante.nvim": { "branch": "main", "commit": "87ea15bb94f0707a5fd154f11f5ed419c17392d1" }, - "blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" }, - "blink-copilot": { "branch": "main", "commit": "71102fe2fa1616353f8cb315bb8b85db0812a218" }, - "blink.cmp": { "branch": "main", "commit": "cb5e346d9e0efa7a3eee7fd4da0b690c48d2a98e" }, - "bookmarks.nvim": { "branch": "main", "commit": "0540d52ba64d0ec7677ec1ef14b3624c95a2aaba" }, - "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" }, - "conform.nvim": { "branch": "master", "commit": "eebc724d12c5579d733d1f801386e0ceb909d001" }, - "copilot.lua": { "branch": "master", "commit": "1ff8ab7baae8dab4a9e078350624374cff0d5e71" }, - "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, - "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, - "fzf-lua": { "branch": "main", "commit": "13ec251a963ed5645dc8ad49e0fde13dac42ec0f" }, - "gp.nvim": { "branch": "main", "commit": "2372d5323c6feaa2e9c19f7ccb537c615d878e18" }, - "grug-far.nvim": { "branch": "main", "commit": "082f97122dd59d816a9a7b676d2b2f86a8ab6ed9" }, - "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, - "img-clip.nvim": { "branch": "main", "commit": "08a02e14c8c0d42fa7a92c30a98fd04d6993b35d" }, - "inc-rename.nvim": { "branch": "main", "commit": "87ebe7bee0b83d3b6e4f1494c74abed21b318175" }, - "kanagawa.nvim": { "branch": "master", "commit": "cc3b68b08e6a0cb6e6bf9944932940091e49bb83" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "lualine.nvim": { "branch": "master", "commit": "834a5817f7e2be22a7062620032d49c600c35fab" }, - "luarocks.nvim": { "branch": "main", "commit": "1db9093915eb16ba2473cfb8d343ace5ee04130a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, - "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "mini.ai": { "branch": "main", "commit": "e139eb1101beb0250fea322f8c07a42f0f175688" }, - "mini.comment": { "branch": "main", "commit": "fb867a9246f9b892cf51a8c84a3f8479cdf1558c" }, - "mini.diff": { "branch": "main", "commit": "7e268d0241255abaa07b8aa0ddff028f7315fe21" }, - "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, - "mini.indentscope": { "branch": "main", "commit": "8af2569a7d7fd37300dfa760e44e71efbbf322fd" }, - "mini.move": { "branch": "main", "commit": "4fe4a855fee53c66b0f3255a4b54ddc2ae6b308c" }, - "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, - "mini.pick": { "branch": "main", "commit": "f95dc0bb9db7124f55b225f544a8719476c64314" }, - "mini.surround": { "branch": "main", "commit": "5aab42fcdcf31fa010f012771eda5631c077840a" }, - "neo-tree.nvim": { "branch": "main", "commit": "73d63376352ac731379892e27ac7b3d9449148e3" }, - "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, - "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, - "note.nvim": { "branch": "main", "commit": "7b1089ef0b6f31daa6dc125e4f4d5b27d6e2b5b6" }, - "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" }, - "nvim-lint": { "branch": "master", "commit": "e7b4ffa6ab763af012e38b21af2c9159f10d2d33" }, - "nvim-lspconfig": { "branch": "master", "commit": "9ae789e7450995e4c06ed9f8f74629992d5d28a6" }, - "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, - "nvim-parinfer": { "branch": "master", "commit": "5ca09287ab3f4144f78ff7977fabc27466f71044" }, - "nvim-spider": { "branch": "main", "commit": "4bd3221d165da334e57c8e9f38978e0c6f3a1742" }, - "nvim-treesitter": { "branch": "master", "commit": "0e21ee8df6235511c02bab4a5b391d18e165a58d" }, - "nvim-treesitter-context": { "branch": "master", "commit": "93b29a32d5f4be10e39226c6b796f28d68a8b483" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "698b5f805722254bca3c509591c1806d268b6c2f" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, - "nvim-web-devicons": { "branch": "master", "commit": "57dfa947cc88cdf1baa2c7e13ed31edddd8fb1d1" }, - "outline.nvim": { "branch": "main", "commit": "ae473fb51b7b6086de0876328c81a63f9c3ecfef" }, - "overseer.nvim": { "branch": "master", "commit": "72c68aab0358c92f451168b704c411c4a3e3410e" }, - "oxocarbon.nvim": { "branch": "main", "commit": "004777819ba294423b638a35a75c9f0c7be758ed" }, - "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "render-markdown.nvim": { "branch": "main", "commit": "d7462eb34ff55106707ea6c4005256dcac57a556" }, - "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, - "sniprun": { "branch": "master", "commit": "151ada2c984aee1feb45c7e3c2abb19f597ecbd0" }, - "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" }, - "themery.nvim": { "branch": "main", "commit": "bfa58f4b279d21cb515b28023e1b68ec908584b2" }, - "themify.nvim": { "branch": "main", "commit": "092ba515e4d0d96a91494ef9cbed7d0517b2bd80" }, - "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, - "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, - "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, - "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, - "vscode.nvim": { "branch": "main", "commit": "49d6014ba151fc6cc585b8d5f057ca7839077bf8" }, - "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, - "yanky.nvim": { "branch": "main", "commit": "98b9c21d3c06d79f68fd9d471dcc28fc6d2d72ef" }, - "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" } -} diff --git a/nvim/lua/.DS_Store b/nvim/lua/.DS_Store deleted file mode 100644 index 5637061bedef38cc7892820f5f0bb546c0bccb20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKu};H447E!IK`b5FIPnJ+OUFQiKkqkBFR!<$&+J#9da-*>#+ZW6sHT$E zG{-tt^xQs4H*z}nJa*SI*t~yS=~@!6@6{akYOlwSuWX2mGvEvyEd$8eBH4wax6Xhw z;0$aTkozG(1#`njFLVhI53!W;#CsU;*P80LnJB1Ryrp+F5~D=}EZVGrh)8#am> zPHe>o+nd=c6pnAl{2{s%=ZfAs1I|F3ffIe~N&de(T>rO&{K*+`29AmW?iQnBh)=TI xntYt(+5jCxMZ~XB+=ieNQ!#uc6<T", "lua choose_timer()", { noremap = true, silent = true }) -- TODO APP MAPPINGS vim.api.nvim_create_autocmd("BufReadPost", { pattern = "/tmp/task_edit.txt", @@ -25,10 +23,3 @@ vim.api.nvim_create_autocmd("FileType", { end, }) -- END TODO APP MAPPINGS --- --- vim.api.nvim_create_autocmd("User", { --- pattern = "BlinkCmpMenuOpen", --- callback = function() --- vim.b.copilot_suggestion_hidden = false --- end, --- }) diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua index 2cf0636..238932c 100644 --- a/nvim/lua/config/keymaps.lua +++ b/nvim/lua/config/keymaps.lua @@ -1,18 +1,13 @@ -- Keymaps are automatically loaded on the VeryLazy event -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua -- Add any additional keymaps here --- --- + -- KEYMAPS SPIDER vim.keymap.set({ "n", "o", "x" }, "w", "lua require('spider').motion('w')", { desc = "Spider-w" }) vim.keymap.set({ "n", "o", "x" }, "e", "lua require('spider').motion('e')", { desc = "Spider-e" }) vim.keymap.set({ "n", "o", "x" }, "b", "lua require('spider').motion('b')", { desc = "Spider-b" }) vim.keymap.set({ "n", "o", "x" }, "C-D", "", { desc = "page down" }) -vim.api.nvim_set_keymap("v", "r", "SnipRun", { silent = true }) -vim.api.nvim_set_keymap("n", "r", "SnipRun", { silent = true }) -vim.api.nvim_set_keymap("n", "f", "SnipRunOperator", { silent = true }) - local bm = require("bookmarks") local map = vim.keymap.set map("n", "mm", bm.bookmark_toggle, { desc = "Toggle bookmark" }) @@ -73,7 +68,6 @@ local function command(cmd) end require("which-key").add({ - -- { "g", group = "Git" }, { "gvf", diffOpenFileHistory, desc = "Open DiffView on Files" }, { "gvt", command("DiffviewToggleFiles"), desc = "toggle diffviewfiles" }, { "gvc", command("DiffviewClose"), desc = "Open DiffView on Files" }, @@ -149,20 +143,10 @@ end -- Keybind for inserting TODO comment vim.api.nvim_set_keymap("n", "t", "lua insert_todo_comment()", { noremap = true, silent = true }) --- Function to open the notes file in a floating window +-- floating NOTES function open_notes() - local notes_file = "/Users/kacper.marzecki@m10s.io/git/notes/todo.md" -- Path to your notes file + local notes_file = vim.env.HOME .. "/git/notes/todo.md" -- Path to your notes file - -- -- Read the file content - -- local file_content = {} - -- for line in io.lines(vim.fn.expand(notes_file)) do - -- table.insert(file_content, line) - -- end - -- - -- -- Create a floating window - -- local buf = vim.api.nvim_create_buf(false, true) -- Create a buffer - -- vim.api.nvim_buf_set_lines(buf, 0, -1, false, file_content) -- Set buffer content - -- -- Check if the file exists, create it if not if vim.fn.filereadable(notes_file) == 0 then vim.fn.writefile({}, notes_file) -- Create an empty file @@ -242,6 +226,7 @@ function choose_timer() }, }) end +vim.api.nvim_set_keymap("n", "T", "lua choose_timer()", { noremap = true, silent = true }) -- Remap arrow keys to hjkl in Normal and Visual modes vim.keymap.set({ "n", "v" }, "", "k", { noremap = true, silent = true }) diff --git a/nvim/lua/config/lazy.lua b/nvim/lua/config/lazy.lua index 19be25d..c895c8a 100644 --- a/nvim/lua/config/lazy.lua +++ b/nvim/lua/config/lazy.lua @@ -36,7 +36,6 @@ local spec = { { import = "lazyvim.plugins.extras.coding.mini-surround" }, -- { import = "lazyvim.plugins.extras.ai.copilot" }, -- { import = "lazyvim.plugins.extras.test.core" }, - -- import/override with your plugins } table.insert(spec, { import = "plugins" }) require("lazy").setup({ diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index 7b1c646..e78e215 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -4,27 +4,28 @@ vim.lsp.config["elixir-ls"] = { root_markers = { "mix.exs", ".git" }, } vim.lsp.enable("elixir-ls") + vim.lsp.config["deno"] = { cmd = { "deno", "lsp" }, filetypes = { "javascript", "typescript" }, root_markers = { "deno.json" }, } - vim.lsp.enable("deno") -if vim.loop.os_uname().sysname == "Darwin" then +-- CUSTOM LSP's +if kx_custom and vim.loop.os_uname().sysname == "Darwin" then vim.api.nvim_create_autocmd("FileType", { pattern = { "elixir", "typescript", "json" }, callback = function() vim.lsp.start({ name = "hhn_lsp", - cmd = { "/Users/kacper.marzecki@m10s.io/git/hhn_lsp/bin/hhn_lsp" }, + cmd = { vim.env.HOME .. "/git/hhn_lsp/bin/hhn_lsp" }, root_dir = vim.fs.dirname(vim.fs.find({ ".git" }, { upward = true })[1]), }) end, }) end -if vim.loop.os_uname().sysname == "Linux" then +if kx_custom and vim.loop.os_uname().sysname == "Linux" then vim.lsp.config["alsp"] = { cmd = { "alsp" }, filetypes = { "elixir", "heex", "elixirscript" }, diff --git a/nvim/lua/plugins/plugins.lua b/nvim/lua/plugins/plugins.lua index 61668f5..2189718 100644 --- a/nvim/lua/plugins/plugins.lua +++ b/nvim/lua/plugins/plugins.lua @@ -1,27 +1,7 @@ -local function masterBranch(dep) - return { - dep, - branch = "master", - } -end - return { - -- { - -- "folke/flash.nvim", - -- event = "VeryLazy", - -- ---@type Flash.Config - -- opts = {}, - -- -- stylua: ignore - -- keys = { - -- { "s", mode = { "n", "x", "o" }, function() require("flash").jump() end, desc = "Flash" }, - -- { "S", mode = { "n", "x", "o" }, function() require("flash").treesitter() end, desc = "Flash Treesitter" }, - -- { "r", mode = "o", function() require("flash").remote() end, desc = "Remote Flash" }, - -- { "R", mode = { "o", "x" }, function() require("flash").treesitter_search() end, desc = "Treesitter Search" }, - -- { "", mode = { "c" }, function() require("flash").toggle() end, desc = "Toggle Flash Search" }, - -- }, - -- }, { "nvim-treesitter/nvim-treesitter", + lazy = false, opts = { ensure_installed = { "bash", @@ -46,6 +26,11 @@ return { incremental_selection = { enable = true, keymaps = { + -- does not work for some reason :( + -- use vib (visual in brackets) vic (visual in class) vif (visual in function) instead for now + -- also yib, yic, yif etc for copying + -- cib, cic, cif for changing etc. -- type `ya` and pause for a bit to look the options + -- or look at https://github.com/nvim-mini/mini.ai node_incremental = "v", node_decremental = "V", }, @@ -53,17 +38,6 @@ return { }, }, { "nvim-lualine/lualine.nvim" }, - -- { - -- "nvim-neotest/neotest", - -- dependencies = { - -- "jfpedroza/neotest-elixir", - -- }, - -- opts = { - -- adapters = { - -- ["neotest-elixir"] = {}, - -- }, - -- }, - -- }, { "neovim/nvim-lspconfig", opts = { @@ -106,12 +80,6 @@ return { }, }, }, - -- { - -- "garymjr/nvim-snippets", - -- opts = { - -- search_paths = { "/Users/kacper.marzecki@schibsted.com/.snippets" }, - -- }, - -- }, { "folke/snacks.nvim", opts = { @@ -339,4 +307,8 @@ return { map_combo("t", "kj", "") end, }, + { + "OXY2DEV/markview.nvim", + lazy = false, + }, } diff --git a/nvim/lua/plugins/themes.lua b/nvim/lua/plugins/themes.lua index b96576b..d90c81f 100644 --- a/nvim/lua/plugins/themes.lua +++ b/nvim/lua/plugins/themes.lua @@ -7,10 +7,6 @@ return { }, { "nyoom-engineering/oxocarbon.nvim", - -- Add in any other configuration; - -- event = foo, - -- config = bar - -- end, }, { "Mofiqul/vscode.nvim" }, { @@ -23,21 +19,12 @@ return { }, }, }, - -- -- Configure default theme - -- { - -- "LazyVim/LazyVim", - -- opts = { - -- colorscheme = "kanagawa-lotus", - -- }, - -- }, "Mofiqul/vscode.nvim", { "nvim-mini/mini.hues", version = "*", config = function() - -- the theme I like require("mini.hues").setup({ background = "#002923", foreground = "#c0c9c7", n_hues = 2 }) - -- ^ the above doesnt load on startup, lets make a toggle function and keymap local function toggle_hues() require("mini.hues").setup({ background = "#002923", foreground = "#c0c9c7", accent = "green", n_hues = 2 }) end diff --git a/readme.md b/readme.md index 22f782f..32ff348 100644 --- a/readme.md +++ b/readme.md @@ -1,5 +1,69 @@ - link folders/files locally +# get brew +https://docs.brew.sh/ + +# install nvim (HEAD to get access to goodies not in stable releases, lots happening rn) + +`brew install neovim --HEAD` + +# install tmux +`brew install tmux` + +# install tpm (tmux package manager) https://github.com/tmux-plugins/tpm +`git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm` + +# install fzf & lazygit +`brew install fzf lazygit` + +# Wire it up + +## put configs where they belong +nvim -> ~/.config/nvim +.tmux.conf -> ~/.tmux.conf + +## You can use many nvim configs at the same time +nvim -> ~/.configs/mycustomvim +and then run +`NVIM_APPNAME=mycustomvim nvim` +You can also make a script for this (as seen in ./scripts/n) + +## OR link folders/files locally - keep them in a repo, refer to them from directories that programs look at +e.g. + +``` +mv ~/.tmux.conf ~/git/configs/.tmux.conf +ln .tmux.conf ~/.tmux.conf +``` + +That way You can keep all Your configs in a repo :) + +# Run tmux & get packages +`tmux` +`C-x I` (Ctrl-x, shift-i) (can be with a pause between the 2 chords) + +# for better workspace switching +`brew install zoxide` +then add Your fav directories +`zoxide add somedir` +and then You can `C-x C-x` and run a separate tmux session in the selected dir + + + +# Useful nvim thingies +Imma refer to `Space` as `$` (Leader) + +- w e b -> better movement powered by `nvim-spider` +- $ g g -> lazygit +- C-/ -> open/close terminal +- C-hjlk -> move between windows +- $ e -> toggle file tree +- $ $ -> find file +- $ f f -> search searches :) e.g. colorscheme, keymaps + +# Useful tmux thingies +prefix is `C-x`, so tmux commands are prefixed with this. Imma refer to this prefix as `$` + +- $ C-x -> zoxide switcher +- $ c -> new window +- $-c (C-x-c, no prefix) -> enter scrollback, S-V to select line, Y to copy it, hjkl C-d C-u to move up, down +- Alt-hl move between windows -omnissiah@mars:~/git/configs$ mv ~/.tmux.conf ~/git/configs/.tmux.conf -omnissiah@mars:~/git/configs$ ln .tmux.conf ~/.tmux.conf -omnissiah@mars:~/installs/scripts$ ln ~/git/config/scripts/n n