From 0b1ace53f26d118f4cfcdff03776b87a5258833e Mon Sep 17 00:00:00 2001 From: Smirnov-O Date: Sat, 28 Aug 2021 22:24:00 +0300 Subject: [PATCH] Update bspwm --- config/bspwm/bspwmrc | 24 +- config/lvim/.luacheckrc | 17 -- config/lvim/.stylua.toml | 6 - config/lvim/config.lua | 101 ------- config/lvim/lsp-settings/jsonls.json | 15 - config/lvim/lsp-settings/yamlls.json | 36 --- config/lvim/lua/user/conjure.lua | 11 - config/lvim/lua/user/hop.lua | 14 - config/lvim/lua/user/package-info.lua | 22 -- config/lvim/lua/user/spectre.lua | 20 -- config/lvim/lvim/.luacheckrc | 1 - config/lvim/lvim/.stylua.toml | 1 - config/lvim/lvim/config.lua | 1 - config/lvim/lvim/ftplugin/go.lua | 5 - config/lvim/lvim/ftplugin/javascript.lua | 9 - config/lvim/lvim/ftplugin/lua.lua | 2 - config/lvim/lvim/ftplugin/python.lua | 9 - config/lvim/lvim/ftplugin/typescript.lua | 7 - config/lvim/lvim/lsp-settings/jsonls.json | 1 - config/lvim/lvim/lsp-settings/yamlls.json | 1 - config/lvim/lvim/lua/user/conjure.lua | 1 - config/lvim/lvim/lua/user/hop.lua | 1 - config/lvim/lvim/lua/user/package-info.lua | 1 - config/lvim/lvim/lua/user/spectre.lua | 1 - config/lvim/lvim/plugin/packer_compiled.lua | 307 -------------------- zshrc | 4 +- 26 files changed, 14 insertions(+), 604 deletions(-) delete mode 100644 config/lvim/.luacheckrc delete mode 100644 config/lvim/.stylua.toml delete mode 100644 config/lvim/config.lua delete mode 100644 config/lvim/lsp-settings/jsonls.json delete mode 100644 config/lvim/lsp-settings/yamlls.json delete mode 100644 config/lvim/lua/user/conjure.lua delete mode 100644 config/lvim/lua/user/hop.lua delete mode 100644 config/lvim/lua/user/package-info.lua delete mode 100644 config/lvim/lua/user/spectre.lua delete mode 120000 config/lvim/lvim/.luacheckrc delete mode 120000 config/lvim/lvim/.stylua.toml delete mode 120000 config/lvim/lvim/config.lua delete mode 100644 config/lvim/lvim/ftplugin/go.lua delete mode 100644 config/lvim/lvim/ftplugin/javascript.lua delete mode 100644 config/lvim/lvim/ftplugin/lua.lua delete mode 100644 config/lvim/lvim/ftplugin/python.lua delete mode 100644 config/lvim/lvim/ftplugin/typescript.lua delete mode 120000 config/lvim/lvim/lsp-settings/jsonls.json delete mode 120000 config/lvim/lvim/lsp-settings/yamlls.json delete mode 120000 config/lvim/lvim/lua/user/conjure.lua delete mode 120000 config/lvim/lvim/lua/user/hop.lua delete mode 120000 config/lvim/lvim/lua/user/package-info.lua delete mode 120000 config/lvim/lvim/lua/user/spectre.lua delete mode 100644 config/lvim/lvim/plugin/packer_compiled.lua diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index 74e197f..82e9cd5 100755 --- a/config/bspwm/bspwmrc +++ b/config/bspwm/bspwmrc @@ -13,7 +13,6 @@ C() { # Config R() { # Set rule bspc rule -a $@ } - #== Autostart A feh --randomize --bg-scale ~/Pictures/wallp & xautolock -time 5 -locker "slock" & @@ -42,14 +41,15 @@ C focused_border_color "#008DCD" C urgent_border_color "#FF6C6B" #== BSPWM Rules -R kitty desktop='^1' focus=on follow=on -R Google-chrome desktop='^2' focus=on follow=on -R Brave desktop='^2' focus=on follow=on -R Code desktop='^3' focus=on follow=on state=fullscreen -R Postman desktop='^4' focus=off follow=off -R Simplenote desktop='^4' focus=off follow=off -R Zathura desktop='^4' focus=on follow=on state=tiled -R discord desktop='^5' focus=on follow=off -R TelegramDesktop desktop='^5' focus=off follow=on -R Nemo desktop='^5' focus=on follow=on -R KeePassXC desktop='^6' focus=on follow=on +R kitty desktop='^1' focus=on follow=on +R Google-chrome desktop='^2' focus=on follow=on +R Brave desktop='^2' focus=on follow=on +R Code desktop='^3' focus=on follow=on state=fullscreen +R jetbrains-webstorm desktop='^3' focus=on follow=on +R Postman desktop='^4' focus=off follow=off +R Simplenote desktop='^4' focus=off follow=off +R Zathura desktop='^4' focus=on follow=on state=tiled +R discord desktop='^5' focus=on follow=off +R TelegramDesktop desktop='^5' focus=off follow=on +R Nemo desktop='^5' focus=on follow=on +R KeePassXC desktop='^6' focus=on follow=on diff --git a/config/lvim/.luacheckrc b/config/lvim/.luacheckrc deleted file mode 100644 index 411145d..0000000 --- a/config/lvim/.luacheckrc +++ /dev/null @@ -1,17 +0,0 @@ --- vim: ft=lua -stds.nvim = { - globals = { - vim = { fields = { "g" } }, - "lvim", - "O", - }, - read_globals = { - -- vim = { fields = { "cmd", "api", "fn", "o" }} - "jit", - "os", - "vim", - }, -} -std = "lua51+nvim" -self = false -cache = true diff --git a/config/lvim/.stylua.toml b/config/lvim/.stylua.toml deleted file mode 100644 index df96b7b..0000000 --- a/config/lvim/.stylua.toml +++ /dev/null @@ -1,6 +0,0 @@ -column_width = 120 -line_endings = "Unix" -indent_type = "Spaces" -indent_width = 2 -quote_style = "AutoPreferDouble" -no_call_parentheses = true diff --git a/config/lvim/config.lua b/config/lvim/config.lua deleted file mode 100644 index 0a482c7..0000000 --- a/config/lvim/config.lua +++ /dev/null @@ -1,101 +0,0 @@ ---- "lvim" configuration -lvim.format_on_save = false -lvim.lint_on_save = false -lvim.colorscheme = "spacegray" - -lvim.builtin.dap.active = true -lvim.builtin.dashboard.active = true -lvim.builtin.terminal.active = true -lvim.builtin.nvimtree.side = "right" -lvim.builtin.nvimtree.show_icons.git = 0 -lvim.builtin.telescope = { - defaults = { - layout_config = { prompt_position = "top" }, - file_ignore_patterns = { ".git", "node_modules", "env", "target" }, - }, -} -lvim.builtin.treesitter = { - ensure_installed = { "javascript", "typescript", "jsdoc", "python", "lua", "go" }, - highlight = { enable = true }, - intent = { disable = { "python" } }, -} - ---- Keymappings -lvim.leader = "space" -lvim.keys.normal_mode[""] = "write" -lvim.keys.normal_mode[""] = "BufferClose" -lvim.keys.normal_mode[""] = "vert res +2" -lvim.keys.normal_mode[""] = "res -2" -lvim.keys.normal_mode[""] = "res +2" -lvim.keys.normal_mode[""] = "vert res -2" - --- Beffer navigation -for i = 1, 9 do - lvim.keys.normal_mode[string.format("", i)] = string.format("BufferGoto %d", i) -end - -lvim.builtin.which_key.mappings["z"] = { "ZenMode", "Zen" } -lvim.builtin.which_key.mappings["t"] = { - name = "Test", - t = { "Ultest", "Run test" }, - s = { "UltestStop", "Stop test" }, - c = { "UltestClear", "Clear test result" }, - n = { "UltestNearest", "Run test order by cursor" }, - o = { "UltestOutput", "Show output order by cursor" }, - j = { "(ultest-next-fail)", "Next fail" }, - k = { "(ultest-prev-fail)", "Prev fail" }, -} -lvim.builtin.which_key.mappings["r"] = { - name = "Replace", - r = { "lua require('spectre').open()", "Replace" }, - w = { "lua require('spectre').open_visual({select_word=true})", "Replace Word" }, - f = { "lua require('spectre').open_file_search()", "Replace Buffer" }, -} - ---- Plugins -lvim.plugins = { - { "tpope/vim-surround", keys = { "c", "d", "y" } }, - { "folke/zen-mode.nvim", cmd = { "ZenMode" } }, - { - "rcarriga/vim-ultest", - requires = { "vim-test/vim-test" }, - cmd = { "Ultest", "UltestStop", "UltestClear", "UltestNearest", "UltestOutput" }, - run = "UpdateRemotePlugins", - }, - { - "vim-test/vim-test", - cmd = { "TestFile", "TestLast", "TestSuite", "TestVisit", "TestMearest" }, - }, - { - "windwp/nvim-spectre", - event = "BufRead", - config = function() - require("user.spectre").setup() - end, - }, - -- { "phaazon/hop.nvim", event = "BufRead", config = function() require("user.hop").setup() end }, - { - "vuki656/package-info.nvim", - ft = "json", - config = function() - require("user.package-info").setup() - end, - }, -} - ---- LSP -lvim.lang.javascript.lsp.setup.handlers = { - ["textDocument/publishDiagnostics"] = function(_, _, p, client_id, _, config) - if p.diagnostics ~= nil then - local i = 1 - while i <= #p.diagnostics do - if p.diagnostics[i].code == 80001 then - table.remove(p.diagnostics, i) - else - i = i + 1 - end - end - end - vim.lsp.diagnostic.on_publish_diagnostics(_, _, p, client_id, _, config) - end, -} diff --git a/config/lvim/lsp-settings/jsonls.json b/config/lvim/lsp-settings/jsonls.json deleted file mode 100644 index 096b11d..0000000 --- a/config/lvim/lsp-settings/jsonls.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "json.schemas": [ - {"fileMatch": ["package.json"], "url": "https://json.schemastore.org/package.json"}, - {"fileMatch": ["tsconfig.json","tsconfig.*.json"], "url": "http://json.schemastore.org/tsconfig"}, - {"fileMatch": ["lerna.json"], "url": "http://json.schemastore.org/lerna"}, - {"fileMatch": [".babelrc.json", ".babelrc", "babel.config.json"], "url": "http://json.schemastore.org/lerna"}, - {"fileMatch": [".eslintrc.json", ".eslintrc"], "url": "http://json.schemastore.org/eslintrc"}, - {"fileMatch": ["bsconfig.json"], "url": "https://bucklescript.github.io/bucklescript/docson/build-schema.json"}, - {"fileMatch": [".prettierrc", ".prettierrc.json", "prettier.config.json"], "url": "http://json.schemastore.org/prettierrc"}, - {"fileMatch": ["now.json"], "url": "http://json.schemastore.org/now"}, - {"fileMatch": ["openapi.json", "swagger.json"], "url": "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json"}, - {"fileMatch": ["nest-cli.json"], "url": "https://json.schemastore.org/nest-cli.json"}, - {"fileMatch": ["nodemon.json"], "url": "https://json.schemastore.org/nodemon.json"} - ] -} diff --git a/config/lvim/lsp-settings/yamlls.json b/config/lvim/lsp-settings/yamlls.json deleted file mode 100644 index 97d5d0f..0000000 --- a/config/lvim/lsp-settings/yamlls.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "yaml.schemas": { - "https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json": [ - "docker-compose.yml", - "docker-compose.yaml" - ], - "https://json.schemastore.org/ansible-playbook.json": [ - "*/playbook/**/*.yml", - "*/playbooks/**/*.yml", - "*/playbook/**/*.yaml", - "*/playbooks/**/*.yaml" - ], - "https://json.schemastore.org/yamllint.json": [ - ".yamllint", - ".yamllint.yml", - ".yamllint.yaml" - ], - "https://yarnpkg.com/configuration/yarnrc.json": [ - ".yarnrc", - ".yarnrc.yml" - ], - "https://json.schemastore.org/github-action.json": [ - "*/.github/workflows/**/*.yml", - "*/.github/workflows/**/*.yaml" - ], - "https://json.schemastore.org/gitlab-ci.json": [ - ".gitlab-ci.yml" - ], - "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.1/schema.json": [ - "openapi.yaml", - "openapi.yml", - "swagger.yml", - "swagger.yal" - ] - } -} diff --git a/config/lvim/lua/user/conjure.lua b/config/lvim/lua/user/conjure.lua deleted file mode 100644 index ed16a0c..0000000 --- a/config/lvim/lua/user/conjure.lua +++ /dev/null @@ -1,11 +0,0 @@ -local M = {} - -local g = vim.g - -M.setup = function() - vim.g.localleader = "," - - g["conjure#filetype#fennel"] = "conjure.client.fennel.stdio" -end - -return M diff --git a/config/lvim/lua/user/hop.lua b/config/lvim/lua/user/hop.lua deleted file mode 100644 index f189886..0000000 --- a/config/lvim/lua/user/hop.lua +++ /dev/null @@ -1,14 +0,0 @@ -local M = {} - -function M.map(mode, key, cmd) - vim.api.nvim_set_keymap(mode, key, cmd, { silent = true }) -end - -M.setup = function() - require("hop").setup() - - M.map("n", "f", "HopWord") - M.map("n", "F", "HopLine") -end - -return M diff --git a/config/lvim/lua/user/package-info.lua b/config/lvim/lua/user/package-info.lua deleted file mode 100644 index 93f6f21..0000000 --- a/config/lvim/lua/user/package-info.lua +++ /dev/null @@ -1,22 +0,0 @@ -local M = {} - -M.setup = function() - require("package-info").setup { - { - autostart = true, - colors = { - up_to_date = "#3C4048", - outdated = "#6ec0fa", - }, - icons = { - enable = true, - style = { - up_to_date = "|  ", - outdated = "|  ", - }, - }, - }, - } -end - -return M diff --git a/config/lvim/lua/user/spectre.lua b/config/lvim/lua/user/spectre.lua deleted file mode 100644 index 44bd6f3..0000000 --- a/config/lvim/lua/user/spectre.lua +++ /dev/null @@ -1,20 +0,0 @@ -local M = {} - -M.setup = function() - require("spectre").setup { - color_devicons = true, - highlights = { ui = "String", search = "DiffChange", replace = "DiffDelete" }, - find_engine = { - ["rg"] = { - cmd = "rg", - args = { "--color=never", "--no-heading", "--with-filename", "--line-number", "--column" }, - options = { - ["ignore-case"] = { value = "--ignore-case", icon = "[I]", desc = "ignore case" }, - ["hidden"] = { value = "--hidden", desc = "hidden file", icon = "[H]" }, - }, - }, - }, - } -end - -return M diff --git a/config/lvim/lvim/.luacheckrc b/config/lvim/lvim/.luacheckrc deleted file mode 120000 index fd0d32e..0000000 --- a/config/lvim/lvim/.luacheckrc +++ /dev/null @@ -1 +0,0 @@ -/home/sasha/.dotfiles/config/lvim/.luacheckrc \ No newline at end of file diff --git a/config/lvim/lvim/.stylua.toml b/config/lvim/lvim/.stylua.toml deleted file mode 120000 index cf65f82..0000000 --- a/config/lvim/lvim/.stylua.toml +++ /dev/null @@ -1 +0,0 @@ -/home/sasha/.dotfiles/config/lvim/.stylua.toml \ No newline at end of file diff --git a/config/lvim/lvim/config.lua b/config/lvim/lvim/config.lua deleted file mode 120000 index f66e019..0000000 --- a/config/lvim/lvim/config.lua +++ /dev/null @@ -1 +0,0 @@ -/home/sasha/.dotfiles/config/lvim/config.lua \ No newline at end of file diff --git a/config/lvim/lvim/ftplugin/go.lua b/config/lvim/lvim/ftplugin/go.lua deleted file mode 100644 index 147fa07..0000000 --- a/config/lvim/lvim/ftplugin/go.lua +++ /dev/null @@ -1,5 +0,0 @@ -require("dap-install").config("go_dbg", {}) - -lvim.lang.go.formatters = { - { exe = "gofmt" }, -} diff --git a/config/lvim/lvim/ftplugin/javascript.lua b/config/lvim/lvim/ftplugin/javascript.lua deleted file mode 100644 index b2b2f8d..0000000 --- a/config/lvim/lvim/ftplugin/javascript.lua +++ /dev/null @@ -1,9 +0,0 @@ -require("dap-install").config("jsnode_dbg", {}) - -lvim.lang.javascript.formatters = { - { exe = "prettier" }, - -- { exe = "eslint" } -} -lvim.lang.javascript.linters = { - { exe = "eslint" }, -} diff --git a/config/lvim/lvim/ftplugin/lua.lua b/config/lvim/lvim/ftplugin/lua.lua deleted file mode 100644 index 8b9e353..0000000 --- a/config/lvim/lvim/ftplugin/lua.lua +++ /dev/null @@ -1,2 +0,0 @@ -lvim.lang.lua.formatters = { { exe = "stylua" } } -lvim.lang.lua.linters = { { exe = "luacheck" } } diff --git a/config/lvim/lvim/ftplugin/python.lua b/config/lvim/lvim/ftplugin/python.lua deleted file mode 100644 index 0259775..0000000 --- a/config/lvim/lvim/ftplugin/python.lua +++ /dev/null @@ -1,9 +0,0 @@ -require("dap-install").config("python_dbg", {}) - -lvim.lang.python.formatters = { - { exe = "black" }, - { exe = "isort" }, -} -lvim.lang.python.linters = { - { exe = "flake8" }, -} diff --git a/config/lvim/lvim/ftplugin/typescript.lua b/config/lvim/lvim/ftplugin/typescript.lua deleted file mode 100644 index bb8ce86..0000000 --- a/config/lvim/lvim/ftplugin/typescript.lua +++ /dev/null @@ -1,7 +0,0 @@ -lvim.lang.javascript.formatters = { - { exe = "prettier" }, - -- { exe = "eslint" } -} -lvim.lang.javascript.linters = { - { exe = "eslint" }, -} diff --git a/config/lvim/lvim/lsp-settings/jsonls.json b/config/lvim/lvim/lsp-settings/jsonls.json deleted file mode 120000 index 68d901e..0000000 --- a/config/lvim/lvim/lsp-settings/jsonls.json +++ /dev/null @@ -1 +0,0 @@ -/home/sasha/.dotfiles/config/lvim/lsp-settings/jsonls.json \ No newline at end of file diff --git a/config/lvim/lvim/lsp-settings/yamlls.json b/config/lvim/lvim/lsp-settings/yamlls.json deleted file mode 120000 index d02099a..0000000 --- a/config/lvim/lvim/lsp-settings/yamlls.json +++ /dev/null @@ -1 +0,0 @@ -/home/sasha/.dotfiles/config/lvim/lsp-settings/yamlls.json \ No newline at end of file diff --git a/config/lvim/lvim/lua/user/conjure.lua b/config/lvim/lvim/lua/user/conjure.lua deleted file mode 120000 index 2feebcc..0000000 --- a/config/lvim/lvim/lua/user/conjure.lua +++ /dev/null @@ -1 +0,0 @@ -/home/sasha/.dotfiles/config/lvim/lua/user/conjure.lua \ No newline at end of file diff --git a/config/lvim/lvim/lua/user/hop.lua b/config/lvim/lvim/lua/user/hop.lua deleted file mode 120000 index 520a8be..0000000 --- a/config/lvim/lvim/lua/user/hop.lua +++ /dev/null @@ -1 +0,0 @@ -/home/sasha/.dotfiles/config/lvim/lua/user/hop.lua \ No newline at end of file diff --git a/config/lvim/lvim/lua/user/package-info.lua b/config/lvim/lvim/lua/user/package-info.lua deleted file mode 120000 index 5ef8925..0000000 --- a/config/lvim/lvim/lua/user/package-info.lua +++ /dev/null @@ -1 +0,0 @@ -/home/sasha/.dotfiles/config/lvim/lua/user/package-info.lua \ No newline at end of file diff --git a/config/lvim/lvim/lua/user/spectre.lua b/config/lvim/lvim/lua/user/spectre.lua deleted file mode 120000 index 26af4a1..0000000 --- a/config/lvim/lvim/lua/user/spectre.lua +++ /dev/null @@ -1 +0,0 @@ -/home/sasha/.dotfiles/config/lvim/lua/user/spectre.lua \ No newline at end of file diff --git a/config/lvim/lvim/plugin/packer_compiled.lua b/config/lvim/lvim/plugin/packer_compiled.lua deleted file mode 100644 index 1d7697f..0000000 --- a/config/lvim/lvim/plugin/packer_compiled.lua +++ /dev/null @@ -1,307 +0,0 @@ --- Automatically generated packer.nvim plugin loader code - -if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then - vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') - return -end - -vim.api.nvim_command('packadd packer.nvim') - -local no_errors, error_msg = pcall(function() - - local time - local profile_info - local should_profile = false - if should_profile then - local hrtime = vim.loop.hrtime - profile_info = {} - time = function(chunk, start) - if start then - profile_info[chunk] = hrtime() - else - profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 - end - end - else - time = function(chunk, start) end - end - -local function save_profiles(threshold) - local sorted_times = {} - for chunk_name, time_taken in pairs(profile_info) do - sorted_times[#sorted_times + 1] = {chunk_name, time_taken} - end - table.sort(sorted_times, function(a, b) return a[2] > b[2] end) - local results = {} - for i, elem in ipairs(sorted_times) do - if not threshold or threshold and elem[2] > threshold then - results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' - end - end - - _G._packer = _G._packer or {} - _G._packer.profile_output = results -end - -time([[Luarocks path setup]], true) -local package_path_str = "/home/sasha/.cache/nvim/packer_hererocks/2.0.5/share/lua/5.1/?.lua;/home/sasha/.cache/nvim/packer_hererocks/2.0.5/share/lua/5.1/?/init.lua;/home/sasha/.cache/nvim/packer_hererocks/2.0.5/lib/luarocks/rocks-5.1/?.lua;/home/sasha/.cache/nvim/packer_hererocks/2.0.5/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/sasha/.cache/nvim/packer_hererocks/2.0.5/lib/lua/5.1/?.so" -if not string.find(package.path, package_path_str, 1, true) then - package.path = package.path .. ';' .. package_path_str -end - -if not string.find(package.cpath, install_cpath_pattern, 1, true) then - package.cpath = package.cpath .. ';' .. install_cpath_pattern -end - -time([[Luarocks path setup]], false) -time([[try_loadstring definition]], true) -local function try_loadstring(s, component, name) - local success, result = pcall(loadstring(s)) - if not success then - vim.schedule(function() - vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) - end) - end - return result -end - -time([[try_loadstring definition]], false) -time([[Defining packer_plugins]], true) -_G.packer_plugins = { - ["DAPInstall.nvim"] = { - loaded = true, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/start/DAPInstall.nvim" - }, - ["barbar.nvim"] = { - config = { "\27LJ\1\2\1\0\0\2\0\a\0\0174\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\0014\0\3\0007\0\4\0007\0\5\0007\0\6\0\15\0\0\0T\1\54\0\3\0007\0\4\0007\0\5\0007\0\6\0>\0\1\1G\0\1\0\19on_config_done\15bufferline\fbuiltin\tlvim\nsetup\20core.bufferline\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/barbar.nvim" - }, - ["dashboard-nvim"] = { - config = { "\27LJ\1\2\1\0\0\3\0\a\0\0204\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\0014\0\3\0007\0\4\0007\0\5\0007\0\6\0\15\0\0\0T\1\b4\0\3\0007\0\4\0007\0\5\0007\0\6\0004\1\0\0%\2\5\0>\1\2\0=\0\0\1G\0\1\0\19on_config_done\14dashboard\fbuiltin\tlvim\nsetup\19core.dashboard\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/dashboard-nvim" - }, - ["friendly-snippets"] = { - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/friendly-snippets" - }, - ["galaxyline.nvim"] = { - config = { "\27LJ\1\2\1\0\0\3\0\6\0\0184\0\0\0%\1\1\0>\0\2\0014\0\2\0007\0\3\0007\0\4\0007\0\5\0\15\0\0\0T\1\b4\0\2\0007\0\3\0007\0\4\0007\0\5\0004\1\0\0%\2\4\0>\1\2\0=\0\0\1G\0\1\0\19on_config_done\15galaxyline\fbuiltin\tlvim\20core.galaxyline\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/galaxyline.nvim" - }, - ["gitsigns.nvim"] = { - config = { "\27LJ\1\2\1\0\0\3\0\a\0\0204\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\0014\0\3\0007\0\4\0007\0\5\0007\0\6\0\15\0\0\0T\1\b4\0\3\0007\0\4\0007\0\5\0007\0\6\0004\1\0\0%\2\5\0>\1\2\0=\0\0\1G\0\1\0\19on_config_done\rgitsigns\fbuiltin\tlvim\nsetup\18core.gitsigns\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/gitsigns.nvim" - }, - ["nlsp-settings.nvim"] = { - loaded = true, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/start/nlsp-settings.nvim" - }, - ["null-ls.nvim"] = { - loaded = true, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/start/null-ls.nvim" - }, - ["nvim-autopairs"] = { - config = { "\27LJ\1\2\1\0\0\3\0\a\0\0184\0\0\0%\1\1\0>\0\2\0014\0\2\0007\0\3\0007\0\4\0007\0\5\0\15\0\0\0T\1\b4\0\2\0007\0\3\0007\0\4\0007\0\5\0004\1\0\0%\2\6\0>\1\2\0=\0\0\1G\0\1\0\19nvim-autopairs\19on_config_done\14autopairs\fbuiltin\tlvim\19core.autopairs\frequire\0" }, - load_after = { - ["nvim-compe"] = true - }, - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/nvim-autopairs" - }, - ["nvim-comment"] = { - config = { "\27LJ\1\2\1\0\0\5\0\f\0\0314\0\0\0004\1\1\0%\2\2\0>\0\3\3\14\0\0\0T\2\n4\2\1\0%\3\3\0>\2\2\2\16\4\2\0007\3\4\2>\3\2\0027\3\5\3%\4\6\0>\3\2\1G\0\1\0007\2\a\1>\2\1\0014\2\b\0007\2\t\0027\2\n\0027\2\v\2\15\0\2\0T\3\64\2\b\0007\2\t\0027\2\n\0027\2\v\2\16\3\1\0>\2\2\1G\0\1\0\19on_config_done\fcomment\fbuiltin\tlvim\nsetup Failed to load nvim-comment\nerror\16get_default\rcore.log\17nvim_comment\frequire\npcall\0" }, - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/nvim-comment" - }, - ["nvim-compe"] = { - after = { "nvim-autopairs" }, - after_files = { "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/nvim-compe/after/plugin/compe.vim" }, - config = { "\27LJ\1\2\1\0\0\3\0\a\0\0204\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\0014\0\3\0007\0\4\0007\0\5\0007\0\6\0\15\0\0\0T\1\b4\0\3\0007\0\4\0007\0\5\0007\0\6\0004\1\0\0%\2\5\0>\1\2\0=\0\0\1G\0\1\0\19on_config_done\ncompe\fbuiltin\tlvim\nsetup\15core.compe\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/nvim-compe" - }, - ["nvim-dap"] = { - config = { "\27LJ\1\2\1\0\0\3\0\a\0\0204\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\0014\0\3\0007\0\4\0007\0\5\0007\0\6\0\15\0\0\0T\1\b4\0\3\0007\0\4\0007\0\5\0007\0\6\0004\1\0\0%\2\5\0>\1\2\0=\0\0\1G\0\1\0\19on_config_done\bdap\fbuiltin\tlvim\nsetup\rcore.dap\frequire\0" }, - loaded = true, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/start/nvim-dap" - }, - ["nvim-lspconfig"] = { - loaded = true, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/start/nvim-lspconfig" - }, - ["nvim-lspinstall"] = { - config = { "\27LJ\1\2\1\0\0\3\0\6\0\0184\0\0\0%\1\1\0>\0\2\0027\1\2\0>\1\1\0014\1\3\0007\1\4\0017\1\1\0017\1\5\1\15\0\1\0T\2\64\1\3\0007\1\4\0017\1\1\0017\1\5\1\16\2\0\0>\1\2\1G\0\1\0\19on_config_done\fbuiltin\tlvim\nsetup\15lspinstall\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/nvim-lspinstall" - }, - ["nvim-spectre"] = { - config = { "\27LJ\1\2:\0\0\2\0\3\0\0064\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\1G\0\1\0\nsetup\17user.spectre\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/nvim-spectre" - }, - ["nvim-toggleterm.lua"] = { - config = { "\27LJ\1\2\1\0\0\3\0\b\0\0204\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\0014\0\3\0007\0\4\0007\0\5\0007\0\6\0\15\0\0\0T\1\b4\0\3\0007\0\4\0007\0\5\0007\0\6\0004\1\0\0%\2\a\0>\1\2\0=\0\0\1G\0\1\0\15toggleterm\19on_config_done\rterminal\fbuiltin\tlvim\nsetup\18core.terminal\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/nvim-toggleterm.lua" - }, - ["nvim-tree.lua"] = { - config = { "\27LJ\1\2\1\0\0\3\0\b\0\0204\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\0014\0\3\0007\0\4\0007\0\5\0007\0\6\0\15\0\0\0T\1\b4\0\3\0007\0\4\0007\0\5\0007\0\6\0004\1\0\0%\2\a\0>\1\2\0=\0\0\1G\0\1\0\21nvim-tree.config\19on_config_done\rnvimtree\fbuiltin\tlvim\nsetup\18core.nvimtree\frequire\0" }, - loaded = true, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/start/nvim-tree.lua" - }, - ["nvim-treesitter"] = { - config = { "\27LJ\1\2\1\0\0\3\0\b\0\0204\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\0014\0\3\0007\0\4\0007\0\5\0007\0\6\0\15\0\0\0T\1\b4\0\3\0007\0\4\0007\0\5\0007\0\6\0004\1\0\0%\2\a\0>\1\2\0=\0\0\1G\0\1\0\28nvim-treesitter.configs\19on_config_done\15treesitter\fbuiltin\tlvim\nsetup\20core.treesitter\frequire\0" }, - loaded = true, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/start/nvim-treesitter" - }, - ["nvim-web-devicons"] = { - loaded = true, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/start/nvim-web-devicons" - }, - ["package-info.nvim"] = { - config = { "\27LJ\1\2?\0\0\2\0\3\0\0064\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\1G\0\1\0\nsetup\22user.package-info\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/package-info.nvim" - }, - ["packer.nvim"] = { - loaded = true, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/start/packer.nvim" - }, - ["plenary.nvim"] = { - loaded = true, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/start/plenary.nvim" - }, - ["popup.nvim"] = { - loaded = true, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/start/popup.nvim" - }, - ["telescope.nvim"] = { - config = { "\27LJ\1\2\1\0\0\3\0\a\0\0204\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\0014\0\3\0007\0\4\0007\0\5\0007\0\6\0\15\0\0\0T\1\b4\0\3\0007\0\4\0007\0\5\0007\0\6\0004\1\0\0%\2\5\0>\1\2\0=\0\0\1G\0\1\0\19on_config_done\14telescope\fbuiltin\tlvim\nsetup\19core.telescope\frequire\0" }, - loaded = true, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/start/telescope.nvim" - }, - ["vim-rooter"] = { - config = { "\27LJ\1\2\1\0\0\2\0\a\0\0174\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\0014\0\3\0007\0\4\0007\0\5\0007\0\6\0\15\0\0\0T\1\54\0\3\0007\0\4\0007\0\5\0007\0\6\0>\0\1\1G\0\1\0\19on_config_done\vrooter\fbuiltin\tlvim\nsetup\16core.rooter\frequire\0" }, - loaded = true, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/start/vim-rooter" - }, - ["vim-surround"] = { - keys = { { "", "c" }, { "", "d" }, { "", "y" } }, - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/vim-surround" - }, - ["vim-test"] = { - commands = { "TestFile", "TestLast", "TestSuite", "TestVisit", "TestMearest" }, - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/vim-test" - }, - ["vim-ultest"] = { - commands = { "Ultest", "UltestStop", "UltestClear", "UltestNearest", "UltestOutput" }, - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/vim-ultest" - }, - ["vim-vsnip"] = { - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/vim-vsnip" - }, - ["which-key.nvim"] = { - config = { "\27LJ\1\2\1\0\0\3\0\b\0\0204\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\0014\0\3\0007\0\4\0007\0\5\0007\0\6\0\15\0\0\0T\1\b4\0\3\0007\0\4\0007\0\5\0007\0\6\0004\1\0\0%\2\a\0>\1\2\0=\0\0\1G\0\1\0\14which-key\19on_config_done\14which_key\fbuiltin\tlvim\nsetup\19core.which-key\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/which-key.nvim" - }, - ["zen-mode.nvim"] = { - commands = { "ZenMode" }, - loaded = false, - needs_bufread = false, - path = "/home/sasha/.local/share/lunarvim/site/pack/packer/opt/zen-mode.nvim" - } -} - -time([[Defining packer_plugins]], false) --- Config for: nvim-treesitter -time([[Config for nvim-treesitter]], true) -try_loadstring("\27LJ\1\2\1\0\0\3\0\b\0\0204\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\0014\0\3\0007\0\4\0007\0\5\0007\0\6\0\15\0\0\0T\1\b4\0\3\0007\0\4\0007\0\5\0007\0\6\0004\1\0\0%\2\a\0>\1\2\0=\0\0\1G\0\1\0\28nvim-treesitter.configs\19on_config_done\15treesitter\fbuiltin\tlvim\nsetup\20core.treesitter\frequire\0", "config", "nvim-treesitter") -time([[Config for nvim-treesitter]], false) --- Config for: nvim-dap -time([[Config for nvim-dap]], true) -try_loadstring("\27LJ\1\2\1\0\0\3\0\a\0\0204\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\0014\0\3\0007\0\4\0007\0\5\0007\0\6\0\15\0\0\0T\1\b4\0\3\0007\0\4\0007\0\5\0007\0\6\0004\1\0\0%\2\5\0>\1\2\0=\0\0\1G\0\1\0\19on_config_done\bdap\fbuiltin\tlvim\nsetup\rcore.dap\frequire\0", "config", "nvim-dap") -time([[Config for nvim-dap]], false) --- Config for: nvim-tree.lua -time([[Config for nvim-tree.lua]], true) -try_loadstring("\27LJ\1\2\1\0\0\3\0\b\0\0204\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\0014\0\3\0007\0\4\0007\0\5\0007\0\6\0\15\0\0\0T\1\b4\0\3\0007\0\4\0007\0\5\0007\0\6\0004\1\0\0%\2\a\0>\1\2\0=\0\0\1G\0\1\0\21nvim-tree.config\19on_config_done\rnvimtree\fbuiltin\tlvim\nsetup\18core.nvimtree\frequire\0", "config", "nvim-tree.lua") -time([[Config for nvim-tree.lua]], false) --- Config for: vim-rooter -time([[Config for vim-rooter]], true) -try_loadstring("\27LJ\1\2\1\0\0\2\0\a\0\0174\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\0014\0\3\0007\0\4\0007\0\5\0007\0\6\0\15\0\0\0T\1\54\0\3\0007\0\4\0007\0\5\0007\0\6\0>\0\1\1G\0\1\0\19on_config_done\vrooter\fbuiltin\tlvim\nsetup\16core.rooter\frequire\0", "config", "vim-rooter") -time([[Config for vim-rooter]], false) --- Config for: telescope.nvim -time([[Config for telescope.nvim]], true) -try_loadstring("\27LJ\1\2\1\0\0\3\0\a\0\0204\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\0014\0\3\0007\0\4\0007\0\5\0007\0\6\0\15\0\0\0T\1\b4\0\3\0007\0\4\0007\0\5\0007\0\6\0004\1\0\0%\2\5\0>\1\2\0=\0\0\1G\0\1\0\19on_config_done\14telescope\fbuiltin\tlvim\nsetup\19core.telescope\frequire\0", "config", "telescope.nvim") -time([[Config for telescope.nvim]], false) - --- Command lazy-loads -time([[Defining lazy-load commands]], true) -pcall(vim.cmd, [[command! -nargs=* -range -bang -complete=file UltestStop lua require("packer.load")({'vim-ultest'}, { cmd = "UltestStop", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]]) -pcall(vim.cmd, [[command! -nargs=* -range -bang -complete=file TestFile lua require("packer.load")({'vim-test'}, { cmd = "TestFile", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]]) -pcall(vim.cmd, [[command! -nargs=* -range -bang -complete=file TestSuite lua require("packer.load")({'vim-test'}, { cmd = "TestSuite", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]]) -pcall(vim.cmd, [[command! -nargs=* -range -bang -complete=file ZenMode lua require("packer.load")({'zen-mode.nvim'}, { cmd = "ZenMode", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]]) -pcall(vim.cmd, [[command! -nargs=* -range -bang -complete=file UltestOutput lua require("packer.load")({'vim-ultest'}, { cmd = "UltestOutput", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]]) -pcall(vim.cmd, [[command! -nargs=* -range -bang -complete=file TestLast lua require("packer.load")({'vim-test'}, { cmd = "TestLast", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]]) -pcall(vim.cmd, [[command! -nargs=* -range -bang -complete=file TestMearest lua require("packer.load")({'vim-test'}, { cmd = "TestMearest", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]]) -pcall(vim.cmd, [[command! -nargs=* -range -bang -complete=file UltestNearest lua require("packer.load")({'vim-ultest'}, { cmd = "UltestNearest", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]]) -pcall(vim.cmd, [[command! -nargs=* -range -bang -complete=file TestVisit lua require("packer.load")({'vim-test'}, { cmd = "TestVisit", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]]) -pcall(vim.cmd, [[command! -nargs=* -range -bang -complete=file Ultest lua require("packer.load")({'vim-ultest'}, { cmd = "Ultest", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]]) -pcall(vim.cmd, [[command! -nargs=* -range -bang -complete=file UltestClear lua require("packer.load")({'vim-ultest'}, { cmd = "UltestClear", l1 = , l2 = , bang = , args = }, _G.packer_plugins)]]) -time([[Defining lazy-load commands]], false) - --- Keymap lazy-loads -time([[Defining lazy-load keymaps]], true) -vim.cmd [[noremap c lua require("packer.load")({'vim-surround'}, { keys = "c", prefix = "" }, _G.packer_plugins)]] -vim.cmd [[noremap y lua require("packer.load")({'vim-surround'}, { keys = "y", prefix = "" }, _G.packer_plugins)]] -vim.cmd [[noremap d lua require("packer.load")({'vim-surround'}, { keys = "d", prefix = "" }, _G.packer_plugins)]] -time([[Defining lazy-load keymaps]], false) - -vim.cmd [[augroup packer_load_aucmds]] -vim.cmd [[au!]] - -- Filetype lazy-loads -time([[Defining lazy-load filetype autocommands]], true) -vim.cmd [[au FileType json ++once lua require("packer.load")({'package-info.nvim'}, { ft = "json" }, _G.packer_plugins)]] -time([[Defining lazy-load filetype autocommands]], false) - -- Event lazy-loads -time([[Defining lazy-load event autocommands]], true) -vim.cmd [[au BufRead * ++once lua require("packer.load")({'nvim-comment', 'gitsigns.nvim', 'nvim-spectre'}, { event = "BufRead *" }, _G.packer_plugins)]] -vim.cmd [[au BufWinEnter * ++once lua require("packer.load")({'which-key.nvim', 'barbar.nvim', 'galaxyline.nvim', 'nvim-toggleterm.lua', 'dashboard-nvim'}, { event = "BufWinEnter *" }, _G.packer_plugins)]] -vim.cmd [[au InsertCharPre * ++once lua require("packer.load")({'friendly-snippets'}, { event = "InsertCharPre *" }, _G.packer_plugins)]] -vim.cmd [[au InsertEnter * ++once lua require("packer.load")({'nvim-compe', 'vim-vsnip'}, { event = "InsertEnter *" }, _G.packer_plugins)]] -vim.cmd [[au VimEnter * ++once lua require("packer.load")({'nvim-lspinstall'}, { event = "VimEnter *" }, _G.packer_plugins)]] -time([[Defining lazy-load event autocommands]], false) -vim.cmd("augroup END") -if should_profile then save_profiles() end - -end) - -if not no_errors then - vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') -end diff --git a/zshrc b/zshrc index 5f57c35..1e0d117 100644 --- a/zshrc +++ b/zshrc @@ -4,7 +4,7 @@ ## Variables export GOPATH="$HOME/go" export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$HOME/.yarn/bin:$HOME/.luarocks/bin:$PATH" -export EDITOR="nvim" +export EDITOR="lvim" ## FzF export FZF_DEFAULT_COMMAND="fd -t f -t l -E node_modules -E env -E __pycache__ -E target" @@ -19,7 +19,7 @@ eval $(fnm env) ## Aliases alias cls="clear" cp="cp -r" mkdir="mkdir -p" open="open_command" lg="lazygit" -alias nvim="lvim" vim="nvim" vi="vim" lv="lvim" +alias lv="lvim" vim="lvim" alias ...="cd ../.." .3="cd ../../.." alias gor="go run" gob="go build" gog="go get" goi="go install"