7 files changed,
88 insertions(+),
13 deletions(-)
M
config/bspwm/bspwmrc
··· 41 41 C urgent_border_color "#5c6370" 42 42 43 43 #== BSPWM Rules 44 -R kitty desktop='^1' focus=on follow=on 45 44 R Google-chrome desktop='^2' focus=on follow=on 46 45 R Code desktop='^3' focus=on follow=on state=fullscreen 47 46 R jetbrains-webstorm desktop='^3' focus=on follow=on
M
config/lvim/config.lua
··· 1 1 lvim.format_on_save = false 2 -lvim.lint_on_save = false 2 +lvim.lint_on_save = true 3 3 lvim.colorscheme = "onedarker" 4 4 5 5 -- Default fatures ··· 14 14 -- TreeSitter 15 15 lvim.builtin.treesitter.ensure_installed = { "javascript", "typescript", "jsdoc", "lua", "go" } 16 16 lvim.builtin.treesitter.indent.disable = { "clojure", "java", "python" } 17 -require("user.treesitter") 18 17 19 18 -- Telescope 20 19 lvim.builtin.telescope.defaults.layout_config.prompt_position = "top" 21 -lvim.builtin.telescope.defaults.file_ignore_patterns = { ".git", "node_modules", "env" } 20 +lvim.builtin.telescope.defaults.file_ignore_patterns = { ".git", "node_modules", "env", ".bin" } 21 + 22 +-- NvimTree 23 +lvim.builtin.nvimtree.ignore = { ".git", "node_modules", ".bin", "env" } 22 24 23 25 -- Mappings 24 26 lvim.keys.normal_mode["<C-w>"] = "<cmd>BufferClose<cr>" 25 27 lvim.keys.normal_mode["<C-s>"] = "<cmd>w<cr>" 28 +lvim.keys.visual_mode["jk"] = "<esc>" 26 29 lvim.builtin.which_key.mappings.l.a = { "<cmd>Telescope lsp_code_actions<cr>", "Code Actions" } 27 30 lvim.builtin.which_key.mappings.l.d = { "<cmd>TroubleToggle<cr>", "Diagnostics" } 28 31 lvim.builtin.which_key.mappings.l.R = { "<cmd>TroubleToggle lsp_references<cr>", "References" } ··· 43 46 44 47 -- Pluginos 45 48 lvim.plugins = { 46 - { "tpope/vim-surround", keys = { "c", "y", "d" } }, 47 - { "andymass/vim-matchup", keys = { "%" } }, 49 + { "tpope/vim-surround", keys = { "c", "y", "d" }, event = "BufRead" }, 48 50 { "tzachar/cmp-tabnine", run = "./install.sh", event = "InsertEnter" }, 49 51 { "folke/trouble.nvim", cmd = { "TroubleToggle" } }, 50 52 { "folke/todo-comments.nvim", event = "BufRead" }, 51 - { "theHamsta/nvim-dap-virtual-text", config = "require[[user.dap-virtual-text]].setup()" }, 52 - { "vim-test/vim-test", cmd = { "TestNearest", "TestFile", "TestSuite", "TestLast", "TestVisit" } }, 53 + { "editorconfig/editorconfig-vim" }, 54 + { "theHamsta/nvim-dap-virtual-text", config = "vim.g.dap_virtual_text = true" }, 55 + { 56 + "Smirnov-O/ts-unit.nvim", 57 + keys = { "vip", "cip", "yip", "dip" }, 58 + config = function() 59 + require("ts-unit").setup({ keymaps = true }) 60 + end, 61 + }, 62 + { 63 + "Olical/conjure", 64 + ft = { "clojure", "fennel", "scheme" }, 65 + requires = { { "PaterJason/cmp-conjure", after = "conjure" } }, 66 + config = function() 67 + require("user.conjure").setup() 68 + end, 69 + }, 53 70 { 54 71 "rcarriga/vim-ultest", 55 - requires = { "vim-test/vim-test" }, 72 + requires = { { "vim-test/vim-test", after = "vim-ultest" } }, 56 73 cmd = { "Ultest", "UltestStop", "UltestClear", "UltestNearest", "UltestOutput" }, 57 74 run = ":UpdateRemotePlugins", 58 75 },
A
config/lvim/lua/user/conjure.lua
··· 1 +local M = {} 2 + 3 +M.setup = function() 4 + vim.g.maplocalleader = "," 5 + vim.g["conjure#mapping#doc_word"] = "K" 6 + 7 + -- Clojure 8 + vim.g["conjure#client#clojure#nrepl#eval#auto_require"] = false 9 + vim.g["conjure#client#clojure#nrepl#connection#auto_repl#enabled"] = false 10 + 11 + -- Scheme 12 + vim.g["conjure#client#scheme#stdio#command"] = "chicken-csi -quiet -:c" 13 + vim.g["conjure#client#scheme#stdio#prompt_pattern"] = "\n-#;%d-> " 14 + 15 + lvim.builtin.cmp.sources = { 16 + { name = "nvim_lsp", max_item_count = 7 }, 17 + { name = "cmp_tabnine", max_item_count = 3 }, 18 + { name = "buffer", max_item_count = 3 }, 19 + { name = "path", max_item_count = 5 }, 20 + { name = "luasnip", max_item_count = 3 }, 21 + { name = "nvim_lua" }, 22 + { name = "conjure" }, 23 + } 24 + 25 + lvim.builtin.cmp.formatting = { 26 + format = function(entry, vim_item) 27 + local cmp_kind = require("user.lsp_kind").cmp_kind 28 + vim_item.kind = cmp_kind(vim_item.kind) 29 + vim_item.menu = ({ 30 + buffer = "(Buffer)", 31 + nvim_lsp = "(LSP)", 32 + luasnip = "(Snip)", 33 + spell = "(Spell)", 34 + path = "(Path)", 35 + conjure = "(Conjure)", 36 + cmp_tabnine = "(Tabnine)", 37 + })[entry.source.name] 38 + vim_item.dup = ({ 39 + buffer = 1, 40 + path = 1, 41 + nvim_lsp = 0, 42 + })[entry.source.name] or 0 43 + return vim_item 44 + end, 45 + } 46 +end 47 + 48 +return M
M
vscode/settings.json
··· 1 1 { 2 2 "workbench.iconTheme": "material-icon-theme", 3 3 "workbench.colorTheme": "GitHub Dark Default", 4 - "workbench.sideBar.location": "right", 4 + "workbench.sideBar.location": "left", 5 5 "workbench.editor.untitled.hint": "hidden", 6 6 "workbench.startupEditor": "none", 7 7 "workbench.panel.defaultLocation": "bottom", ··· 62 62 }, 63 63 "[typescript]": { 64 64 "editor.defaultFormatter": "esbenp.prettier-vscode" 65 - } 66 -} 65 + }, 66 + "go.toolsManagement.autoUpdate": true 67 +}
M
zshrc
··· 12 12 ## Oh my zsh 13 13 plugins=(git dotenv npm yarn extract) 14 14 ZSH_THEME="simple" 15 +DISABLE_AUTO_TITLE="true" 15 16 source "$HOME/.oh-my-zsh/oh-my-zsh.sh" 16 17 17 18 ## FNM 18 19 eval $(fnm env) 20 + 21 +## Zoxide 22 +eval "$(zoxide init zsh)" 19 23 20 24 ## Functions 21 25 dotnet() { 22 26 $HOME/dotnet/dotnet "$@" 27 +} 28 +asdf() { 29 + . /opt/asdf-vm/asdf.sh 30 + asdf $@ 23 31 } 24 32 25 33 ## Aliases