From aa265b2156119aef81ae3a34de4a0676b689ba2b Mon Sep 17 00:00:00 2001 From: Ted Kulp Date: Mon, 20 Sep 2021 07:51:24 -0400 Subject: [PATCH] Add most of the linux stuff in --- .config/lvim/config.lua | 145 ++--------- .config/lvim/plugin/packer_compiled.lua | 318 ------------------------ .config/yadm/bootstrap | 93 ++++++- .config/zsh/autojump.zsh | 2 + .config/zsh/fzf.zsh | 13 + .config/zsh/go.zsh | 2 + .config/zsh/nvm.zsh | 2 + .config/zsh/rust.zsh | 1 + .config/zsh/vim.zsh | 4 +- .zshrc | 8 +- 10 files changed, 135 insertions(+), 453 deletions(-) delete mode 100644 .config/lvim/plugin/packer_compiled.lua create mode 100644 .config/zsh/autojump.zsh create mode 100644 .config/zsh/fzf.zsh create mode 100644 .config/zsh/go.zsh create mode 100644 .config/zsh/nvm.zsh create mode 100644 .config/zsh/rust.zsh diff --git a/.config/lvim/config.lua b/.config/lvim/config.lua index 9b9dbec..f064f30 100644 --- a/.config/lvim/config.lua +++ b/.config/lvim/config.lua @@ -1,23 +1,14 @@ ---[[ -lvim is the global options object - -Linters should be -filled in as strings with either -a global executable or a path to -an executable -]] -- THESE ARE EXAMPLE CONFIGS FEEL FREE TO CHANGE TO WHATEVER YOU WANT -- general -lvim.log.level = "warn" lvim.format_on_save = true +lvim.lint_on_save = true lvim.colorscheme = "onedarker" -- keymappings [view all the defaults by pressing Lk] lvim.leader = "space" -- add your own keymapping lvim.keys.normal_mode[""] = ":w" - -- unmap a default keymapping -- lvim.keys.normal_mode[""] = "" -- edit a default keymapping @@ -28,8 +19,8 @@ lvim.keys.normal_mode[""] = ":w" -- local actions = require "telescope.actions" -- -- for input mode -- lvim.builtin.telescope.defaults.mappings.i[""] = actions.move_selection_next --- lvim.builtin.telescope.defaults.mappings.i[""] = actions.cycle_history_next -- lvim.builtin.telescope.defaults.mappings.i[""] = actions.move_selection_previous +-- lvim.builtin.telescope.defaults.mappings.i[""] = actions.cycle_history_next -- lvim.builtin.telescope.defaults.mappings.i[""] = actions.cycle_history_prev -- -- for normal mode -- lvim.builtin.telescope.defaults.mappings.n[""] = actions.move_selection_next @@ -42,24 +33,21 @@ lvim.keys.normal_mode[""] = ":w" -- name = "+Trouble", -- r = { "Trouble lsp_references", "References" }, -- f = { "Trouble lsp_definitions", "Definitions" }, --- d = { "Trouble lsp_document_diagnostics", "Diagnostics" }, +-- d = { "Trouble lsp_document_diagnostics", "Diagnosticss" }, -- q = { "Trouble quickfix", "QuickFix" }, -- l = { "Trouble loclist", "LocationList" }, --- w = { "Trouble lsp_workspace_diagnostics", "Diagnostics" }, +-- w = { "Trouble lsp_workspace_diagnostics", "Diagnosticss" }, -- } -- TODO: User Config for predefined plugins -- After changing plugin config exit and reopen LunarVim, Run :PackerInstall :PackerCompile lvim.builtin.dashboard.active = true lvim.builtin.terminal.active = true -lvim.builtin.lualine.active = true -lvim.builtin.dap.active = true --- lvim.builtin.bufferline = true lvim.builtin.nvimtree.side = "left" -lvim.builtin.nvimtree.show_icons.git = 1 +lvim.builtin.nvimtree.show_icons.git = 0 -- if you don't want all the parsers change this to a table of the ones you want -lvim.builtin.treesitter.ensure_installed = "maintained" +lvim.builtin.treesitter.ensure_installed = {} lvim.builtin.treesitter.ignore_install = { "haskell" } lvim.builtin.treesitter.highlight.enabled = true @@ -93,130 +81,27 @@ lvim.builtin.treesitter.highlight.enabled = true -- lvim.lang.python.formatters = { -- { -- exe = "black", +-- args = {} -- } -- } -- set an additional linter -- lvim.lang.python.linters = { -- { -- exe = "flake8", +-- args = {} -- } -- } -vim.cmd("set timeoutlen=500") - -- Additional Plugins -lvim.plugins = { - { - "tpope/vim-surround", - keys = { "c", "d", "y" }, - }, - { - "ethanholz/nvim-lastplace", - event = "BufRead", - config = function() - require("nvim-lastplace").setup({ - lastplace_ignore_buftype = { "quickfix", "nofile", "help" }, - lastplace_ignore_filetype = { - "gitcommit", - "gitrebase", - "svn", - "hgcommit", - }, - lastplace_open_folds = true, - }) - end, - }, - { - "lukas-reineke/indent-blankline.nvim", - event = "BufRead", - setup = function() - vim.g.indentLine_enabled = 1 - vim.g.indent_blankline_char = "▏" - vim.g.indent_blankline_filetype_exclude = { "help", "terminal", "dashboard" } - vim.g.indent_blankline_buftype_exclude = { "terminal" } - vim.g.indent_blankline_show_trailing_blankline_indent = false - vim.g.indent_blankline_show_first_indent_level = false - end, - }, - { - "ggandor/lightspeed.nvim", - event = "BufRead", - }, - { - "nacro90/numb.nvim", - event = "BufRead", - config = function() - require("numb").setup({ - show_numbers = true, -- Enable 'number' for the window while peeking - show_cursorline = true, -- Enable 'cursorline' for the window while peeking - }) - end, - }, - { - "windwp/nvim-spectre", - event = "BufRead", - config = function() - require("spectre").setup() - end, - }, - { - "andymass/vim-matchup", - event = "CursorMoved", - config = function() - vim.g.matchup_matchparen_offscreen = { method = "popup" } - end, - }, - { - "p00f/nvim-ts-rainbow", - }, - { "tpope/vim-repeat" }, - { - "monaqa/dial.nvim", - event = "BufRead", - config = function() - local dial = require("dial") - vim.cmd([[ - nmap (dial-increment) - nmap (dial-decrement) - vmap (dial-increment) - vmap (dial-decrement) - vmap g (dial-increment-additional) - vmap g (dial-decrement-additional) - ]]) - - dial.augends["custom#boolean"] = dial.common.enum_cyclic({ - name = "boolean", - strlist = { "true", "false" }, - }) - table.insert(dial.config.searchlist.normal, "custom#boolean") - - -- For Languages which prefer True/False, e.g. python. - dial.augends["custom#Boolean"] = dial.common.enum_cyclic({ - name = "Boolean", - strlist = { "True", "False" }, - }) - table.insert(dial.config.searchlist.normal, "custom#Boolean") - end, - }, -} +-- lvim.plugins = { +-- {"folke/tokyonight.nvim"}, { +-- "ray-x/lsp_signature.nvim", +-- config = function() require"lsp_signature".on_attach() end, +-- event = "InsertEnter" +-- } +-- } -- Autocommands (https://neovim.io/doc/user/autocmd.html) -- lvim.autocommands.custom_groups = { -- { "BufWinEnter", "*.lua", "setlocal ts=8 sw=8" }, -- } - --- Typescript/javascript -lvim.lang.typescript.formatters = { { exe = "eslint" }, { exe = "prettier" } } -lvim.lang.typescriptreact.formatters = lvim.lang.typescript.formatters -lvim.lang.typescript.linters = { { exe = "eslint" } } -lvim.lang.typescriptreact.linters = lvim.lang.typescript.linters -lvim.lang.javascript.formatters = { { exe = "eslint" }, { exe = "prettier" } } -lvim.lang.javascriptreact.formatters = lvim.lang.javascript.formatters -lvim.lang.javascript.linters = { { exe = "eslint" } } -lvim.lang.javascriptreact.linters = lvim.lang.javascript.linters - --- JSON -lvim.lang.json.formatters = { { exe = "prettier" } } - --- Lua -lvim.lang.lua.formatters = { { exe = "stylua" } } diff --git a/.config/lvim/plugin/packer_compiled.lua b/.config/lvim/plugin/packer_compiled.lua deleted file mode 100644 index e8edeaf..0000000 --- a/.config/lvim/plugin/packer_compiled.lua +++ /dev/null @@ -1,318 +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 = "/Users/wizehive/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/wizehive/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/wizehive/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/wizehive/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/Users/wizehive/.cache/nvim/packer_hererocks/2.1.0-beta3/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 = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/DAPInstall.nvim" - }, - ["FixCursorHold.nvim"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/FixCursorHold.nvim" - }, - ["barbar.nvim"] = { - config = { "\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20core.bufferline\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/barbar.nvim" - }, - ["dashboard-nvim"] = { - config = { "\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.dashboard\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/dashboard-nvim" - }, - ["dial.nvim"] = { - config = { "\27LJ\2\n\4\0\0\6\0\20\0&6\0\0\0'\2\1\0B\0\2\0026\1\2\0009\1\3\1'\3\4\0B\1\2\0019\1\5\0009\2\a\0009\2\b\0025\4\t\0005\5\n\0=\5\v\4B\2\2\2=\2\6\0016\1\f\0009\1\r\0019\3\14\0009\3\15\0039\3\16\3'\4\6\0B\1\3\0019\1\5\0009\2\a\0009\2\b\0025\4\18\0005\5\19\0=\5\v\4B\2\2\2=\2\17\0016\1\f\0009\1\r\0019\3\14\0009\3\15\0039\3\16\3'\4\17\0B\1\3\1K\0\1\0\1\3\0\0\tTrue\nFalse\1\0\1\tname\fBoolean\19custom#Boolean\vnormal\15searchlist\vconfig\vinsert\ntable\fstrlist\1\3\0\0\ttrue\nfalse\1\0\1\tname\fboolean\16enum_cyclic\vcommon\19custom#boolean\faugends\2 nmap (dial-increment)\n nmap (dial-decrement)\n vmap (dial-increment)\n vmap (dial-decrement)\n vmap g (dial-increment-additional)\n vmap g (dial-decrement-additional)\n \bcmd\bvim\tdial\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/dial.nvim" - }, - ["friendly-snippets"] = { - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/friendly-snippets" - }, - ["gitsigns.nvim"] = { - config = { "\27LJ\2\n;\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\18core.gitsigns\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/gitsigns.nvim" - }, - ["indent-blankline.nvim"] = { - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/indent-blankline.nvim" - }, - ["lightspeed.nvim"] = { - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/lightspeed.nvim" - }, - ["lualine.nvim"] = { - config = { "\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.lualine\frequire\0" }, - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/lualine.nvim" - }, - ["nlsp-settings.nvim"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nlsp-settings.nvim" - }, - ["null-ls.nvim"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/null-ls.nvim" - }, - ["numb.nvim"] = { - config = { "\27LJ\2\nX\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0B\0\2\1K\0\1\0\1\0\2\20show_cursorline\2\17show_numbers\2\nsetup\tnumb\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/numb.nvim" - }, - ["nvim-autopairs"] = { - config = { "\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.autopairs\frequire\0" }, - load_after = { - ["nvim-compe"] = true - }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-autopairs" - }, - ["nvim-comment"] = { - config = { "\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.comment\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-comment" - }, - ["nvim-compe"] = { - after = { "nvim-autopairs" }, - after_files = { "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-compe/after/plugin/compe.vim" }, - config = { "\27LJ\2\n8\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\15core.compe\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-compe" - }, - ["nvim-dap"] = { - config = { "\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rcore.dap\frequire\0" }, - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-dap" - }, - ["nvim-lastplace"] = { - config = { "\27LJ\2\n\1\0\0\4\0\b\0\v6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\0025\3\6\0=\3\a\2B\0\2\1K\0\1\0\30lastplace_ignore_filetype\1\5\0\0\14gitcommit\14gitrebase\bsvn\rhgcommit\29lastplace_ignore_buftype\1\0\1\25lastplace_open_folds\2\1\4\0\0\rquickfix\vnofile\thelp\nsetup\19nvim-lastplace\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-lastplace" - }, - ["nvim-lspconfig"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-lspconfig" - }, - ["nvim-lspinstall"] = { - config = { "\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\1\2\0B\1\1\1K\0\1\0\nsetup\20core.lspinstall\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-lspinstall" - }, - ["nvim-spectre"] = { - config = { "\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fspectre\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-spectre" - }, - ["nvim-toggleterm.lua"] = { - config = { "\27LJ\2\n;\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\18core.terminal\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/nvim-toggleterm.lua" - }, - ["nvim-tree.lua"] = { - config = { "\27LJ\2\n;\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\18core.nvimtree\frequire\0" }, - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-tree.lua" - }, - ["nvim-treesitter"] = { - config = { "\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20core.treesitter\frequire\0" }, - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-treesitter" - }, - ["nvim-ts-rainbow"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-ts-rainbow" - }, - ["nvim-web-devicons"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/nvim-web-devicons" - }, - ["packer.nvim"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/packer.nvim" - }, - ["plenary.nvim"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/plenary.nvim" - }, - ["popup.nvim"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/popup.nvim" - }, - ["project.nvim"] = { - config = { "\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.project\frequire\0" }, - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/project.nvim" - }, - ["telescope.nvim"] = { - config = { "\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.telescope\frequire\0" }, - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/telescope.nvim" - }, - ["vim-matchup"] = { - after_files = { "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/vim-matchup/after/plugin/matchit.vim" }, - config = { "\27LJ\2\nN\0\0\2\0\4\0\0056\0\0\0009\0\1\0005\1\3\0=\1\2\0K\0\1\0\1\0\1\vmethod\npopup!matchup_matchparen_offscreen\6g\bvim\0" }, - loaded = false, - needs_bufread = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/vim-matchup" - }, - ["vim-repeat"] = { - loaded = true, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/start/vim-repeat" - }, - ["vim-surround"] = { - keys = { { "", "c" }, { "", "d" }, { "", "y" } }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/vim-surround" - }, - ["vim-vsnip"] = { - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/vim-vsnip" - }, - ["which-key.nvim"] = { - config = { "\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.which-key\frequire\0" }, - loaded = false, - needs_bufread = false, - path = "/Users/wizehive/.local/share/lunarvim/site/pack/packer/opt/which-key.nvim" - } -} - -time([[Defining packer_plugins]], false) --- Setup for: indent-blankline.nvim -time([[Setup for indent-blankline.nvim]], true) -try_loadstring("\27LJ\2\n\2\0\0\2\0\v\0\0256\0\0\0009\0\1\0)\1\1\0=\1\2\0006\0\0\0009\0\1\0'\1\4\0=\1\3\0006\0\0\0009\0\1\0005\1\6\0=\1\5\0006\0\0\0009\0\1\0005\1\b\0=\1\a\0006\0\0\0009\0\1\0+\1\1\0=\1\t\0006\0\0\0009\0\1\0+\1\1\0=\1\n\0K\0\1\0-indent_blankline_show_first_indent_level4indent_blankline_show_trailing_blankline_indent\1\2\0\0\rterminal%indent_blankline_buftype_exclude\1\4\0\0\thelp\rterminal\14dashboard&indent_blankline_filetype_exclude\b▏\26indent_blankline_char\23indentLine_enabled\6g\bvim\0", "setup", "indent-blankline.nvim") -time([[Setup for indent-blankline.nvim]], false) --- Config for: telescope.nvim -time([[Config for telescope.nvim]], true) -try_loadstring("\27LJ\2\n<\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\19core.telescope\frequire\0", "config", "telescope.nvim") -time([[Config for telescope.nvim]], false) --- Config for: nvim-tree.lua -time([[Config for nvim-tree.lua]], true) -try_loadstring("\27LJ\2\n;\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\18core.nvimtree\frequire\0", "config", "nvim-tree.lua") -time([[Config for nvim-tree.lua]], false) --- Config for: lualine.nvim -time([[Config for lualine.nvim]], true) -try_loadstring("\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.lualine\frequire\0", "config", "lualine.nvim") -time([[Config for lualine.nvim]], false) --- Config for: project.nvim -time([[Config for project.nvim]], true) -try_loadstring("\27LJ\2\n:\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\17core.project\frequire\0", "config", "project.nvim") -time([[Config for project.nvim]], false) --- Config for: nvim-dap -time([[Config for nvim-dap]], true) -try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rcore.dap\frequire\0", "config", "nvim-dap") -time([[Config for nvim-dap]], false) --- Config for: nvim-treesitter -time([[Config for nvim-treesitter]], true) -try_loadstring("\27LJ\2\n=\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\20core.treesitter\frequire\0", "config", "nvim-treesitter") -time([[Config for nvim-treesitter]], false) --- Keymap lazy-loads -time([[Defining lazy-load keymaps]], true) -vim.cmd [[noremap d lua require("packer.load")({'vim-surround'}, { keys = "d", prefix = "" }, _G.packer_plugins)]] -vim.cmd [[noremap y lua require("packer.load")({'vim-surround'}, { keys = "y", prefix = "" }, _G.packer_plugins)]] -vim.cmd [[noremap c lua require("packer.load")({'vim-surround'}, { keys = "c", prefix = "" }, _G.packer_plugins)]] -time([[Defining lazy-load keymaps]], false) - -vim.cmd [[augroup packer_load_aucmds]] -vim.cmd [[au!]] - -- Event lazy-loads -time([[Defining lazy-load event autocommands]], true) -vim.cmd [[au BufWinEnter * ++once lua require("packer.load")({'which-key.nvim', 'nvim-toggleterm.lua', 'dashboard-nvim', 'barbar.nvim'}, { event = "BufWinEnter *" }, _G.packer_plugins)]] -vim.cmd [[au CursorMoved * ++once lua require("packer.load")({'vim-matchup'}, { event = "CursorMoved *" }, _G.packer_plugins)]] -vim.cmd [[au InsertEnter * ++once lua require("packer.load")({'vim-vsnip', 'nvim-compe'}, { event = "InsertEnter *" }, _G.packer_plugins)]] -vim.cmd [[au BufRead * ++once lua require("packer.load")({'gitsigns.nvim', 'indent-blankline.nvim', 'lightspeed.nvim', 'numb.nvim', 'nvim-spectre', 'nvim-comment', 'nvim-lastplace', 'dial.nvim'}, { event = "BufRead *" }, _G.packer_plugins)]] -vim.cmd [[au InsertCharPre * ++once lua require("packer.load")({'friendly-snippets'}, { event = "InsertCharPre *" }, _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/.config/yadm/bootstrap b/.config/yadm/bootstrap index ca2fee7..7df3037 100755 --- a/.config/yadm/bootstrap +++ b/.config/yadm/bootstrap @@ -2,24 +2,115 @@ cd $HOME +# What are we packing? +system_type=$(uname -s) + +# Install submodules echo "Init submodules" yadm submodule update --recursive --init +# Link in our tmux config if [ ! -f "$HOME/.tmux.conf" ]; then ln -s -f .tmux/.tmux.conf fi +# Create $GOHOME if necessary +if [ ! -d "$HOME/go" ]; then + mkdir $HOME/go +fi + +# Update our origin URL to the git version now that we have +# our ssh config stuff downloaded +echo "Updating the yadm repo origin URL" +yadm remote set-url origin "git@github.com:tedkulp/dotfiles.git" + +# Mac Specifics if [ "$system_type" = "Darwin" ]; then - # install homebrew if it's missing + # Install Homebrew if it's missing if ! command -v brew >/dev/null 2>&1; then echo "Installing homebrew" /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" fi + # Install all the stuff in Brewfile (get comfortable... have some coffee or adult beverage) if [ -f "$HOME/.Brewfile" ]; then echo "Updating homebrew bundle" brew bundle --global fi fi +# Linux Specifics +if [ "$system_type" = "Linux" ]; then + + # Install apt stuff + sudo apt update -y + sudo apt upgrade -y + sudo apt install -y zsh software-properties-common python-dev python3-dev python3-pip + + # Install node if necessary + if ! command -v node >/dev/null 2>&1; then + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash + export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm + nvm install node + fi + + # Install rust and cargo in necessary + if ! command -v cargo >/dev/null 2>&1; then + curl https://sh.rustup.rs -sSf > rustup-init.sh + chmod 755 rustup-init.sh + ./rustup-init.sh -y + rm rustup-init.sh + fi + + # Install neovim if necessary + if ! command -v nvim >/dev/null 2>&1; then + sudo add-apt-repository ppa:neovim-ppa/unstable -y + sudo apt-get update -y + sudo apt-get install neovim -y + fi + + # Install lunarvim + if ! command -v lvim >/dev/null 2>&1; then + bash <(curl -s https://raw.githubusercontent.com/lunarvim/lunarvim/master/utils/installer/install.sh) + lvim +PackerSync + fi + + # Install fzf if necessary + if ! command -v fzf >/dev/null 2>&1; then + git clone --depth 1 https://github.com/junegunn/fzf.git $HOME/.fzf + $HOME/.fzf/install --bin --no-key-bindings --no-completion --no-update-rc + fi + + # Install go if necessary + if ! command -v go >/dev/null 2>&1; then + curl -sLk https://git.io/gobrew | sh - + export PATH="$HOME/.gobrew/current/bin:$HOME/.gobrew/bin:$PATH" + export GOPATH="$HOME/.gobrew/current/go" + gobrew use 1.17 + fi + + # Install powerline-go if necessary + if ! command -v powerline-go >/dev/null 2>&1; then + go install github.com/justjanne/powerline-go@latest + fi + + # Install autojump if necessary + if ! command -v autojump >/dev/null 2>&1; then + git clone git://github.com/wting/autojump.git + cd $HOME/autojump + ./install.py + cd $HOME + fi +fi + +# Oh My ZSH +if [ ! -d "$HOME/.oh-my-zsh" ]; then + echo "Installing oh-my-zsh. Install zsh as default, but then exit out to continue." + sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" +fi + +# Wrapping up +echo "Don't forget to run yadm decrypt!" +exit 0 diff --git a/.config/zsh/autojump.zsh b/.config/zsh/autojump.zsh new file mode 100644 index 0000000..174656f --- /dev/null +++ b/.config/zsh/autojump.zsh @@ -0,0 +1,2 @@ +[[ -s /home/ted/.autojump/etc/profile.d/autojump.sh ]] && source /home/ted/.autojump/etc/profile.d/autojump.sh +autoload -U compinit && compinit -u diff --git a/.config/zsh/fzf.zsh b/.config/zsh/fzf.zsh new file mode 100644 index 0000000..4a4328f --- /dev/null +++ b/.config/zsh/fzf.zsh @@ -0,0 +1,13 @@ +# Setup fzf +# --------- +if [[ ! "$PATH" == *$HOME/.fzf/bin* ]]; then + export PATH="${PATH:+${PATH}:}$HOME/.fzf/bin" +fi + +# Auto-completion +# --------------- +[[ $- == *i* ]] && source "$HOME/.fzf/shell/completion.zsh" 2> /dev/null + +# Key bindings +# ------------ +source "$HOME/.fzf/shell/key-bindings.zsh" diff --git a/.config/zsh/go.zsh b/.config/zsh/go.zsh new file mode 100644 index 0000000..8343c4d --- /dev/null +++ b/.config/zsh/go.zsh @@ -0,0 +1,2 @@ +export PATH="$HOME/.gobrew/current/bin:$HOME/.gobrew/bin:$PATH" +export GOPATH="$HOME/.gobrew/current/go" diff --git a/.config/zsh/nvm.zsh b/.config/zsh/nvm.zsh new file mode 100644 index 0000000..a7042dd --- /dev/null +++ b/.config/zsh/nvm.zsh @@ -0,0 +1,2 @@ +export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm diff --git a/.config/zsh/rust.zsh b/.config/zsh/rust.zsh new file mode 100644 index 0000000..486777e --- /dev/null +++ b/.config/zsh/rust.zsh @@ -0,0 +1 @@ +. $HOME/.cargo/env diff --git a/.config/zsh/vim.zsh b/.config/zsh/vim.zsh index 9461841..bf23f72 100644 --- a/.config/zsh/vim.zsh +++ b/.config/zsh/vim.zsh @@ -5,6 +5,6 @@ alias vim="nvim" alias vi="nvim" ## Lunarvim -alias vim="lvim" -alias vi="lvim" +# alias vim="lvim" +# alias vi="lvim" export PATH=~/.local/bin:$PATH diff --git a/.zshrc b/.zshrc index 4629b5a..905374f 100644 --- a/.zshrc +++ b/.zshrc @@ -10,8 +10,8 @@ export ZSH="$HOME/.oh-my-zsh" # load a random theme each time oh-my-zsh is loaded, in which case, # to know which specific one was loaded, run: echo $RANDOM_THEME # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes -# ZSH_THEME="robbyrussell" -ZSH_THEME="cobalt2" +ZSH_THEME="robbyrussell" +# ZSH_THEME="cobalt2" # Set list of themes to pick from when loading at random # Setting this variable when ZSH_THEME=random will cause zsh to load @@ -108,3 +108,7 @@ source $ZSH/oh-my-zsh.sh # [ -f ~/.config/tabtab/__tabtab.fish ]; and . ~/.config/tabtab/__tabtab.fish; or true # source <("/usr/local/bin/starship" init zsh --print-full-init) + +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion