From c36863d722e4f3de18918263534b596eb37f98aa Mon Sep 17 00:00:00 2001 From: Smirnov-O Date: Fri, 20 Aug 2021 19:23:02 +0300 Subject: [PATCH] Update lvim, zsh, vscode --- config/bspwm/polybar/polybar | 21 +- 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/lv-config.lua | 63 ---- 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 ++++++++++++++++++++ vscode/settings.json | 42 +-- zshrc | 12 +- 28 files changed, 613 insertions(+), 115 deletions(-) create mode 100644 config/lvim/.luacheckrc create mode 100644 config/lvim/.stylua.toml create mode 100644 config/lvim/config.lua create mode 100644 config/lvim/lsp-settings/jsonls.json create mode 100644 config/lvim/lsp-settings/yamlls.json create mode 100644 config/lvim/lua/user/conjure.lua create mode 100644 config/lvim/lua/user/hop.lua create mode 100644 config/lvim/lua/user/package-info.lua create mode 100644 config/lvim/lua/user/spectre.lua delete mode 100644 config/lvim/lv-config.lua create mode 120000 config/lvim/lvim/.luacheckrc create mode 120000 config/lvim/lvim/.stylua.toml create mode 120000 config/lvim/lvim/config.lua create mode 100644 config/lvim/lvim/ftplugin/go.lua create mode 100644 config/lvim/lvim/ftplugin/javascript.lua create mode 100644 config/lvim/lvim/ftplugin/lua.lua create mode 100644 config/lvim/lvim/ftplugin/python.lua create mode 100644 config/lvim/lvim/ftplugin/typescript.lua create mode 120000 config/lvim/lvim/lsp-settings/jsonls.json create mode 120000 config/lvim/lvim/lsp-settings/yamlls.json create mode 120000 config/lvim/lvim/lua/user/conjure.lua create mode 120000 config/lvim/lvim/lua/user/hop.lua create mode 120000 config/lvim/lvim/lua/user/package-info.lua create mode 120000 config/lvim/lvim/lua/user/spectre.lua create mode 100644 config/lvim/lvim/plugin/packer_compiled.lua diff --git a/config/bspwm/polybar/polybar b/config/bspwm/polybar/polybar index 3a0261a..787ee19 100644 --- a/config/bspwm/polybar/polybar +++ b/config/bspwm/polybar/polybar @@ -1,21 +1,14 @@ -# vim: ft=dosini +; # vim: ft=dosini [settings] enable-ipc = true format-padding = 1 [colors] -background = #262A2B -foreground = #cfd1dd -secondary = #008DCD -alert = #FF6C6B -empty = #383a42 - -;[colors] ; Light -;background = #f9f9f9 -;foreground = #5b5b5f -;secondary = #0098dd -;alert = #df631c -;empty = #a0a1a7 +background = #202020 +foreground = #ABB2BF +cyan = #5f8ccd +alert = #D16969 +empty = #262626 [bar/bar] width = 100% @@ -39,7 +32,7 @@ enable-click = true fuzzy-match = true enable-scroll = true label-focused =  -label-focused-foreground = ${colors.secondary} +label-focused-foreground = ${colors.cyan} label-focused-padding = 2 label-occupied =  label-occupied-foreground = ${colors.foreground} diff --git a/config/lvim/.luacheckrc b/config/lvim/.luacheckrc new file mode 100644 index 0000000..411145d --- /dev/null +++ b/config/lvim/.luacheckrc @@ -0,0 +1,17 @@ +-- 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 new file mode 100644 index 0000000..df96b7b --- /dev/null +++ b/config/lvim/.stylua.toml @@ -0,0 +1,6 @@ +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 new file mode 100644 index 0000000..0a482c7 --- /dev/null +++ b/config/lvim/config.lua @@ -0,0 +1,101 @@ +--- "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 new file mode 100644 index 0000000..096b11d --- /dev/null +++ b/config/lvim/lsp-settings/jsonls.json @@ -0,0 +1,15 @@ +{ + "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 new file mode 100644 index 0000000..97d5d0f --- /dev/null +++ b/config/lvim/lsp-settings/yamlls.json @@ -0,0 +1,36 @@ +{ + "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 new file mode 100644 index 0000000..ed16a0c --- /dev/null +++ b/config/lvim/lua/user/conjure.lua @@ -0,0 +1,11 @@ +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 new file mode 100644 index 0000000..f189886 --- /dev/null +++ b/config/lvim/lua/user/hop.lua @@ -0,0 +1,14 @@ +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 new file mode 100644 index 0000000..93f6f21 --- /dev/null +++ b/config/lvim/lua/user/package-info.lua @@ -0,0 +1,22 @@ +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 new file mode 100644 index 0000000..44bd6f3 --- /dev/null +++ b/config/lvim/lua/user/spectre.lua @@ -0,0 +1,20 @@ +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/lv-config.lua b/config/lvim/lv-config.lua deleted file mode 100644 index 58f06a7..0000000 --- a/config/lvim/lv-config.lua +++ /dev/null @@ -1,63 +0,0 @@ ---- "lvim" configuration -lvim.format_on_save = false -lvim.lint_on_save = true -lvim.colorscheme = "spacegray" - -lvim.builtin.dashboard.active = true -lvim.builtin.terminal.active = true -lvim.builtin.nvimtree.side = "right" -lvim.builtin.nvimtree.show_icons.git = 0 -lvim.builtin.nvimtree.auto_open = 0 -lvim.builtin.nvimtree.hide_dotfiles = 0 -lvim.builtin.telescope.defaults.layout_config.prompt_position = "top" -lvim.builtin.treesitter.ensure_installed = { "javascript", "jsdoc", "lua", "python" } -lvim.builtin.treesitter.highlight.enabled = true -lvim.builtin.treesitter.indent.disable = { "python" } - ---- keymappings -lvim.leader = "space" -lvim.keys.normal_mode = { - { "", "w" }, - { "", "BufferClose" }, - -- Navigate split - { "", "wincmd h" }, - { "", "wincmd j" }, - { "", "wincmd k" }, - { "", "wincmd l" }, - -- Resize split - { "", "vert res +2" }, - { "", "res -2" }, - { "", "res +2" }, - { "", "vert res -2" }, - -- Resize - { "", "BufferGoto 1" }, - { "", "BufferGoto 2" }, - { "", "BufferGoto 3" }, - { "", "BufferGoto 4" }, - { "", "BufferGoto 5" }, - { "", "BufferGoto 6" }, - { "", "BufferGoto 7" }, - { "", "BufferGoto 8" }, - { "", "BufferGoto 9" }, -} - ---- Plugins -lvim.plugins = { -} - ---- 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/lvim/.luacheckrc b/config/lvim/lvim/.luacheckrc new file mode 120000 index 0000000..fd0d32e --- /dev/null +++ b/config/lvim/lvim/.luacheckrc @@ -0,0 +1 @@ +/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 new file mode 120000 index 0000000..cf65f82 --- /dev/null +++ b/config/lvim/lvim/.stylua.toml @@ -0,0 +1 @@ +/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 new file mode 120000 index 0000000..f66e019 --- /dev/null +++ b/config/lvim/lvim/config.lua @@ -0,0 +1 @@ +/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 new file mode 100644 index 0000000..147fa07 --- /dev/null +++ b/config/lvim/lvim/ftplugin/go.lua @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000..b2b2f8d --- /dev/null +++ b/config/lvim/lvim/ftplugin/javascript.lua @@ -0,0 +1,9 @@ +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 new file mode 100644 index 0000000..8b9e353 --- /dev/null +++ b/config/lvim/lvim/ftplugin/lua.lua @@ -0,0 +1,2 @@ +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 new file mode 100644 index 0000000..0259775 --- /dev/null +++ b/config/lvim/lvim/ftplugin/python.lua @@ -0,0 +1,9 @@ +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 new file mode 100644 index 0000000..bb8ce86 --- /dev/null +++ b/config/lvim/lvim/ftplugin/typescript.lua @@ -0,0 +1,7 @@ +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 new file mode 120000 index 0000000..68d901e --- /dev/null +++ b/config/lvim/lvim/lsp-settings/jsonls.json @@ -0,0 +1 @@ +/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 new file mode 120000 index 0000000..d02099a --- /dev/null +++ b/config/lvim/lvim/lsp-settings/yamlls.json @@ -0,0 +1 @@ +/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 new file mode 120000 index 0000000..2feebcc --- /dev/null +++ b/config/lvim/lvim/lua/user/conjure.lua @@ -0,0 +1 @@ +/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 new file mode 120000 index 0000000..520a8be --- /dev/null +++ b/config/lvim/lvim/lua/user/hop.lua @@ -0,0 +1 @@ +/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 new file mode 120000 index 0000000..5ef8925 --- /dev/null +++ b/config/lvim/lvim/lua/user/package-info.lua @@ -0,0 +1 @@ +/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 new file mode 120000 index 0000000..26af4a1 --- /dev/null +++ b/config/lvim/lvim/lua/user/spectre.lua @@ -0,0 +1 @@ +/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 new file mode 100644 index 0000000..1d7697f --- /dev/null +++ b/config/lvim/lvim/plugin/packer_compiled.lua @@ -0,0 +1,307 @@ +-- 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/vscode/settings.json b/vscode/settings.json index 305b3bb..6c954b7 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -1,7 +1,6 @@ { - "window.menuBarVisibility": "toggle", "workbench.iconTheme": "material-icon-theme", - "workbench.colorTheme": "GitHub Dark", + "workbench.colorTheme": "GitHub Light", "workbench.sideBar.location": "right", "workbench.editor.untitled.hint": "hidden", "workbench.startupEditor": "none", @@ -47,36 +46,17 @@ "vim.incsearch": true, "vim.leader": ";", "vim.normalModeKeyBindings": [ - { - "before": [ - "" - ], - "commands": [ - ":nohl" - ] - }, + {"before": [""], "commands": [":nohl"]}, ], "vim.insertModeKeyBindings": [ - { - "before": [ - "j", - "k" - ], - "after": [ - "" - ] - } + {"before": ["j", "k"], "after": [""]} ], - "vim.handleKeys": { - "": false, - "": false, - "": false, - "": false - }, + "vim.handleKeys": { "": false, "": false, "": false, "": false}, // Expensions + "terminal.integrated.tabs.enabled": false, "extensions.ignoreRecommendations": true, "docker.showStartPage": false, - "prettier.semi": false, + // "prettier.semi": false, // Languages "javascript.suggestionActions.enabled": false, "typescript.suggestionActions.enabled": false, @@ -84,11 +64,9 @@ "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.tabSize": 2 }, - "workbench.editorAssociations": { - "*.ipynb": "jupyter-notebook" + "[typescript]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" }, - "notebook.cellToolbarLocation": { - "default": "right", - "jupyter-notebook": "left" - } + "window.menuBarVisibility": "toggle" + } \ No newline at end of file diff --git a/zshrc b/zshrc index 50e45f9..5f57c35 100644 --- a/zshrc +++ b/zshrc @@ -3,14 +3,14 @@ ## Variables export GOPATH="$HOME/go" -export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$HOME/.yarn/bin:$PATH" +export PATH="$HOME/bin:$HOME/.local/bin:$HOME/.golang/bin:$GOPATH/bin:$HOME/.yarn/bin:$HOME/.luarocks/bin:$PATH" export EDITOR="nvim" ## FzF -export FZF_DEFAULT_COMMAND="fd -t f -t l -E node_modules -E env -E __pycache__" +export FZF_DEFAULT_COMMAND="fd -t f -t l -E node_modules -E env -E __pycache__ -E target" ## Oh my zsh -plugins=(dotenv yarn pip) +plugins=(git dotenv npm yarn extract) ZSH_THEME="simple" source "$HOME/.oh-my-zsh/oh-my-zsh.sh" @@ -18,11 +18,11 @@ source "$HOME/.oh-my-zsh/oh-my-zsh.sh" eval $(fnm env) ## Aliases -alias cls="clear" cp="cp -r" mkdir="mkdir -p" -alias nvim="lvim" vim="nvim" vi="vim" e="$EDITOR" lv="lvim" +alias cls="clear" cp="cp -r" mkdir="mkdir -p" open="open_command" lg="lazygit" +alias nvim="lvim" vim="nvim" vi="vim" lv="lvim" alias ...="cd ../.." .3="cd ../../.." alias gor="go run" gob="go build" gog="go get" goi="go install" if [[ -f "/bin/exa" ]]; then - alias ls="exa -l" la="ls -a" + alias ls="exa -l" ll="ls" la="ls -a" fi