From d6ab90e4a60f7cd0d578fa15ac7418cdede0f433 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Fri, 27 Mar 2026 14:14:31 -0400 Subject: [PATCH 01/14] Removed neovim among others --- .gitignore | 1 + Dockerfile | 42 +--- home/.config/.gitkeep | 0 home/.config/mynvim/init.lua | 43 ---- home/.config/mynvim/lua/config/lazy.lua | 34 --- home/.config/mynvim/lua/config/maps.lua | 34 --- home/.config/mynvim/lua/config/settings.lua | 25 --- home/.config/mynvim/lua/plugins/aider.lua | 1 - home/.config/mynvim/lua/plugins/autopairs.lua | 15 -- home/.config/mynvim/lua/plugins/colorizer.lua | 4 - home/.config/mynvim/lua/plugins/comment.lua | 6 - home/.config/mynvim/lua/plugins/conform.lua | 33 --- home/.config/mynvim/lua/plugins/copilot.lua | 1 - home/.config/mynvim/lua/plugins/fzf.lua | 9 - .../mynvim/lua/plugins/indent_line.lua | 9 - home/.config/mynvim/lua/plugins/init.lua | 1 - home/.config/mynvim/lua/plugins/lazydev.lua | 23 -- home/.config/mynvim/lua/plugins/lsp-zero.lua | 79 ------- home/.config/mynvim/lua/plugins/lualine.lua | 5 - home/.config/mynvim/lua/plugins/monokai.lua | 6 - home/.config/mynvim/lua/plugins/neogit.lua | 10 - home/.config/mynvim/lua/plugins/neorg.lua | 22 -- home/.config/mynvim/lua/plugins/neotree.lua | 9 - home/.config/mynvim/lua/plugins/neovim.lua | 9 - .../mynvim/lua/plugins/rustaceanvim.lua | 5 - .../.config/mynvim/lua/plugins/toggleterm.lua | 17 -- .../.config/mynvim/lua/plugins/treesitter.lua | 40 ---- home/.config/mynvim/lua/plugins/trouble.lua | 32 --- .../.config/mynvim/lua/plugins/vim_sleuth.lua | 1 - home/.config/mynvim/lua/plugins/whichkey.lua | 16 -- home/.config/mynvim/lua/plugins/zoxide.lua | 1 - home/.config/nvim/.gitignore | 8 - home/.config/nvim/.neoconf.json | 15 -- home/.config/nvim/LICENSE | 201 ------------------ home/.config/nvim/README.md | 4 - home/.config/nvim/init.lua | 2 - home/.config/nvim/lua/config/autocmds.lua | 3 - home/.config/nvim/lua/config/keymaps.lua | 10 - home/.config/nvim/lua/config/lazy.lua | 76 ------- home/.config/nvim/lua/config/options.lua | 10 - home/.config/nvim/lua/plugins/disabled.lua | 1 - home/.config/nvim/lua/plugins/example.lua | 156 -------------- home/.config/nvim/lua/plugins/monokai.lua | 6 - home/.config/nvim/stylua.toml | 3 - home/.gitconfig | 3 + 45 files changed, 5 insertions(+), 1026 deletions(-) create mode 100644 home/.config/.gitkeep delete mode 100644 home/.config/mynvim/init.lua delete mode 100644 home/.config/mynvim/lua/config/lazy.lua delete mode 100644 home/.config/mynvim/lua/config/maps.lua delete mode 100644 home/.config/mynvim/lua/config/settings.lua delete mode 100644 home/.config/mynvim/lua/plugins/aider.lua delete mode 100644 home/.config/mynvim/lua/plugins/autopairs.lua delete mode 100644 home/.config/mynvim/lua/plugins/colorizer.lua delete mode 100644 home/.config/mynvim/lua/plugins/comment.lua delete mode 100644 home/.config/mynvim/lua/plugins/conform.lua delete mode 100644 home/.config/mynvim/lua/plugins/copilot.lua delete mode 100644 home/.config/mynvim/lua/plugins/fzf.lua delete mode 100644 home/.config/mynvim/lua/plugins/indent_line.lua delete mode 100644 home/.config/mynvim/lua/plugins/init.lua delete mode 100644 home/.config/mynvim/lua/plugins/lazydev.lua delete mode 100644 home/.config/mynvim/lua/plugins/lsp-zero.lua delete mode 100644 home/.config/mynvim/lua/plugins/lualine.lua delete mode 100644 home/.config/mynvim/lua/plugins/monokai.lua delete mode 100644 home/.config/mynvim/lua/plugins/neogit.lua delete mode 100644 home/.config/mynvim/lua/plugins/neorg.lua delete mode 100644 home/.config/mynvim/lua/plugins/neotree.lua delete mode 100644 home/.config/mynvim/lua/plugins/neovim.lua delete mode 100644 home/.config/mynvim/lua/plugins/rustaceanvim.lua delete mode 100644 home/.config/mynvim/lua/plugins/toggleterm.lua delete mode 100644 home/.config/mynvim/lua/plugins/treesitter.lua delete mode 100644 home/.config/mynvim/lua/plugins/trouble.lua delete mode 100644 home/.config/mynvim/lua/plugins/vim_sleuth.lua delete mode 100644 home/.config/mynvim/lua/plugins/whichkey.lua delete mode 100644 home/.config/mynvim/lua/plugins/zoxide.lua delete mode 100644 home/.config/nvim/.gitignore delete mode 100644 home/.config/nvim/.neoconf.json delete mode 100644 home/.config/nvim/LICENSE delete mode 100644 home/.config/nvim/README.md delete mode 100644 home/.config/nvim/init.lua delete mode 100644 home/.config/nvim/lua/config/autocmds.lua delete mode 100644 home/.config/nvim/lua/config/keymaps.lua delete mode 100644 home/.config/nvim/lua/config/lazy.lua delete mode 100644 home/.config/nvim/lua/config/options.lua delete mode 100644 home/.config/nvim/lua/plugins/disabled.lua delete mode 100644 home/.config/nvim/lua/plugins/example.lua delete mode 100644 home/.config/nvim/lua/plugins/monokai.lua delete mode 100644 home/.config/nvim/stylua.toml diff --git a/.gitignore b/.gitignore index 58f491e..d54fa14 100644 --- a/.gitignore +++ b/.gitignore @@ -232,3 +232,4 @@ venv.bak/ # mypy .mypy_cache/ .aider* +home/.password-store/@ansys-internal.gpg diff --git a/Dockerfile b/Dockerfile index f36d6f1..4bd6dbe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,6 @@ RUN apk add --no-cache \ git \ lazygit \ make \ - shfmt \ # Uncategorized dependencies \ iputils \ bind-tools \ @@ -57,17 +56,11 @@ RUN apk add --no-cache \ rust \ rust-analyzer \ cargo \ - lua \ - lua-dev \ - luarocks \ python3 \ python3-dev \ nodejs \ npm \ - perl \ - texlive \ # Miscellaneous tools \ - neovim \ jq \ neofetch \ tmux \ @@ -119,7 +112,6 @@ RUN apk --no-cache --virtual .build-deps add \ gcc-doc && \ # uv tool install aider-chat && \ TODO: Fix this, something to do with scipy uv tool install --verbose pre-commit && \ - uv tool install --verbose cookiecutter && \ uv tool install --verbose ruff && \ uv tool install --verbose ipython && \ uv tool install --verbose ipdb && \ @@ -127,23 +119,12 @@ RUN apk --no-cache --virtual .build-deps add \ uv tool install --verbose pyright && \ uv tool install --verbose ruff-lsp && \ uv tool install --verbose just && \ - uv tool install --verbose aws-parallelcluster && \ uv tool install --verbose ansible -# luarocks installs -ENV PATH="/usr/local/lib/luarocks/bin/:$HOME/.luarocks/bin/:$PATH" -RUN luarocks-5.1 config local_by_default true -RUN apk --no-cache --virtual .build-deps add \ - g++ \ - cmake \ - && luarocks-5.1 install --server=https://luarocks.org/dev luaformatter \ - && apk del .build-deps - # npm installs RUN npm install -g \ prettier \ - pyright \ - twilio-cli + pyright # Install tfenv RUN git clone --depth=1 https://github.com/tfutils/tfenv.git $HOME/.tfenv @@ -174,24 +155,6 @@ RUN git clone https://github.com/eth-p/bat-extras.git \ && cd bat-extras \ && ./build.sh --install --no-verify -# Install ngrok cli -RUN ARCH=$(echo "$TARGETPLATFORM" | sed 's/linux\///') \ - && wget https://bin.equinox.io/c/bNyj1mQVY4c/ngrok-v3-stable-linux-${ARCH}.tgz \ - && tar -xvf ngrok-v3-stable-linux-${ARCH}.tgz -C /usr/local/bin - -# Slurm -# WORKDIR /tmp -# RUN wget https://download.schedmd.com/slurm/slurm-.tar.bz2 && \ -# tar -xaf slurm-24.05.2.tar.bz2 && \ -# cd slurm-24.05.2.tar.bz2 && \ -# ./configure --prefix=/usr --sysconfdir=/etc/slurm --with-munge && \ -# make && \ -# make install && \ -# ldconfig -n /usr/lib && \ -# ldconfig -n /usr/lib64 && \ -# rm -rf /var/cache/apk/* /tmp/slurm-* -# WORKDIR /home/root - # Stow RUN apk --no-cache --virtual .build-deps add \ build-base \ @@ -223,9 +186,6 @@ RUN cd $SHELL_DIR \ # Chmod so that these files are runnable RUN find $SHELL_DIR/home/bin -type f -exec chmod +x {} \; -# Get neovim to download all its stuff -RUN nvim --headless '+Lazy install' +qall - # terminal colors with xterm ENV TERM=xterm-256color diff --git a/home/.config/.gitkeep b/home/.config/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/home/.config/mynvim/init.lua b/home/.config/mynvim/init.lua deleted file mode 100644 index 5bd23be..0000000 --- a/home/.config/mynvim/init.lua +++ /dev/null @@ -1,43 +0,0 @@ -require("config.lazy") -require("config.maps") -require("config.settings") -local wk = require("which-key") - --- Custom -vim.g.mapleader = " " - --- Autosave -vim.opt.autowriteall = true -vim.opt.undofile = true -- Persist history between sessions -vim.opt.undolevels = 1000 -- or any desired value -vim.opt.undoreload = 10000 -- or any desired value -vim.opt.hidden = false -- equivalent to nohidden, prevents unsaved hidden buffers - --- Make editing lua better -local shell_dir = os.getenv("SHELL_DIR") or os.getenv("HOME") -wk.add({ - l = { - name = "lua", - i = {":e ~/.config/nvim/init.lua", "Edit init.lua"}, - s = {":source ~/.config/nvim/init.lua", "Reload init.lua"}, - l = { - ':lua os.execute("git clone https://github.com/ryanpeach/shell " .. "' .. - shell_dir .. '")', "Clone shell repo" - }, - p = { - ':lua os.execute("cp -r ~/.config/nvim/ ' .. shell_dir .. - '/home/.config/nvim/")', "Copy nvim config" - }, - e = {':e ' .. shell_dir .. '', "Goto SHELL_DIR"} - } -}, {prefix = ""}) - -vim.cmd([[ - augroup ReloadInitOnSave - autocmd! - autocmd BufWritePost BufWritePost ~/.config/nvim/**/*.lua source ~/.config/nvim/init.lua - augroup END -]]) --- Show tabs as characters -vim.o.list = true -vim.o.listchars = 'tab:→ ' diff --git a/home/.config/mynvim/lua/config/lazy.lua b/home/.config/mynvim/lua/config/lazy.lua deleted file mode 100644 index 4fa806a..0000000 --- a/home/.config/mynvim/lua/config/lazy.lua +++ /dev/null @@ -1,34 +0,0 @@ --- Bootstrap lazy.nvim -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not (vim.uv or vim.loop).fs_stat(lazypath) then - local lazyrepo = "https://github.com/folke/lazy.nvim.git" - local out = vim.fn.system({ - "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, - lazypath - }) - if vim.v.shell_error ~= 0 then - vim.api.nvim_echo({ - {"Failed to clone lazy.nvim:\n", "ErrorMsg"}, {out, "WarningMsg"}, - {"\nPress any key to exit..."} - }, true, {}) - vim.fn.getchar() - os.exit(1) - end -end -vim.opt.rtp:prepend(lazypath) - --- Make sure to setup `mapleader` and `maplocalleader` before --- loading lazy.nvim so that mappings are correct. --- This is also a good place to setup other settings (vim.opt) -vim.g.mapleader = " " -vim.g.maplocalleader = "\\" - --- Setup lazy.nvim -require("lazy").setup({ - spec = { - -- import your plugins - {import = "plugins"} - }, - -- automatically check for plugin updates - checker = {enabled = false} -}) diff --git a/home/.config/mynvim/lua/config/maps.lua b/home/.config/mynvim/lua/config/maps.lua deleted file mode 100644 index f4499dc..0000000 --- a/home/.config/mynvim/lua/config/maps.lua +++ /dev/null @@ -1,34 +0,0 @@ -vim.g.mapleader = " " - -local function map(mode, lhs, rhs) - vim.keymap.set(mode, lhs, rhs, {silent = true}) -end - --- Save -map("n", "w", "update") - --- Quit -map("n", "q", "q") - --- Exit insert mode -map("i", "jk", "") - --- NeoTree -map("n", "e", "Neotree toggle") -map("n", "r", "Neotree focus") - --- New Windows -map("n", "o", "vsplit") -map("n", "p", "split") - --- Window Navigation -map("n", "", "h") -map("n", "", "l") -map("n", "", "k") -map("n", "", "j") - --- Resize Windows -map("n", "", "<") -map("n", "", ">") -map("n", "", "+") -map("n", "", "-") diff --git a/home/.config/mynvim/lua/config/settings.lua b/home/.config/mynvim/lua/config/settings.lua deleted file mode 100644 index d220e80..0000000 --- a/home/.config/mynvim/lua/config/settings.lua +++ /dev/null @@ -1,25 +0,0 @@ -local global = vim.g -local o = vim.opt - -o.number = true -o.relativenumber = true -o.clipboard = "unnamedplus" -o.syntax = "on" -o.autoindent = true -o.cursorline = true -o.expandtab = true -o.shiftwidth = 2 -o.tabstop = 2 -o.encoding = "UTF-8" -o.ruler = true -o.mouse = "a" -o.title = true -o.hidden = true -o.ttimeoutlen = 0 -o.wildmenu = true -o.showcmd = true -o.showmatch = true -o.inccommand = "split" -o.splitright = true -o.splitbelow = true -o.termguicolors = true diff --git a/home/.config/mynvim/lua/plugins/aider.lua b/home/.config/mynvim/lua/plugins/aider.lua deleted file mode 100644 index 49831e6..0000000 --- a/home/.config/mynvim/lua/plugins/aider.lua +++ /dev/null @@ -1 +0,0 @@ -return {'joshuavial/aider.nvim'} diff --git a/home/.config/mynvim/lua/plugins/autopairs.lua b/home/.config/mynvim/lua/plugins/autopairs.lua deleted file mode 100644 index 1f04894..0000000 --- a/home/.config/mynvim/lua/plugins/autopairs.lua +++ /dev/null @@ -1,15 +0,0 @@ --- autopairs --- https://github.com/windwp/nvim-autopairs -return { - 'windwp/nvim-autopairs', - event = 'InsertEnter', - -- Optional dependency - dependencies = {'hrsh7th/nvim-cmp'}, - config = function() - require('nvim-autopairs').setup {} - -- If you want to automatically add `(` after selecting a function or method - local cmp_autopairs = require 'nvim-autopairs.completion.cmp' - local cmp = require 'cmp' - cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) - end -} diff --git a/home/.config/mynvim/lua/plugins/colorizer.lua b/home/.config/mynvim/lua/plugins/colorizer.lua deleted file mode 100644 index 82031ca..0000000 --- a/home/.config/mynvim/lua/plugins/colorizer.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - "norcalli/nvim-colorizer.lua", - config = function() require("colorizer").setup({"*"}) end -} diff --git a/home/.config/mynvim/lua/plugins/comment.lua b/home/.config/mynvim/lua/plugins/comment.lua deleted file mode 100644 index 1871cef..0000000 --- a/home/.config/mynvim/lua/plugins/comment.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - 'numToStr/Comment.nvim', - opts = { - -- add any options here - } -} diff --git a/home/.config/mynvim/lua/plugins/conform.lua b/home/.config/mynvim/lua/plugins/conform.lua deleted file mode 100644 index 22557bf..0000000 --- a/home/.config/mynvim/lua/plugins/conform.lua +++ /dev/null @@ -1,33 +0,0 @@ -return { - "stevearc/conform.nvim", - event = {"BufReadPre", "BufNewFile"}, - config = function() - local conform = require("conform") - - conform.setup({ - formatters_by_ft = { - javascript = {"prettier"}, - typescript = {"prettier"}, - javascriptreact = {"prettier"}, - typescriptreact = {"prettier"}, - css = {"prettier"}, - html = {"prettier"}, - json = {"prettier"}, - yaml = {"prettier"}, - markdown = {"prettier"}, - lua = {"lua-format"}, - python = {"ruff"} - }, - format_on_save = { - lsp_fallback = true, - async = false, - timeout_ms = 1000 - } - }) - - vim.keymap.set({"n", "v"}, "f", function() - conform.format( - {lsp_fallback = true, async = false, timeout_ms = 1000}) - end, {desc = "Format file or range (in visual mode)"}) - end -} diff --git a/home/.config/mynvim/lua/plugins/copilot.lua b/home/.config/mynvim/lua/plugins/copilot.lua deleted file mode 100644 index 49b8fa0..0000000 --- a/home/.config/mynvim/lua/plugins/copilot.lua +++ /dev/null @@ -1 +0,0 @@ -return {{"github/copilot.vim"}} diff --git a/home/.config/mynvim/lua/plugins/fzf.lua b/home/.config/mynvim/lua/plugins/fzf.lua deleted file mode 100644 index ca63036..0000000 --- a/home/.config/mynvim/lua/plugins/fzf.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "ibhagwan/fzf-lua", - -- optional for icon support - dependencies = {"nvim-tree/nvim-web-devicons"}, - config = function() - -- calling `setup` is optional for customization - require("fzf-lua").setup({}) - end -} diff --git a/home/.config/mynvim/lua/plugins/indent_line.lua b/home/.config/mynvim/lua/plugins/indent_line.lua deleted file mode 100644 index a39af22..0000000 --- a/home/.config/mynvim/lua/plugins/indent_line.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - { -- Add indentation guides even on blank lines - 'lukas-reineke/indent-blankline.nvim', - -- Enable `lukas-reineke/indent-blankline.nvim` - -- See `:help ibl` - main = 'ibl', - opts = {} - } -} diff --git a/home/.config/mynvim/lua/plugins/init.lua b/home/.config/mynvim/lua/plugins/init.lua deleted file mode 100644 index d4b6a55..0000000 --- a/home/.config/mynvim/lua/plugins/init.lua +++ /dev/null @@ -1 +0,0 @@ -return {"folke/which-key.nvim", {"folke/neoconf.nvim", cmd = "Neoconf"}} diff --git a/home/.config/mynvim/lua/plugins/lazydev.lua b/home/.config/mynvim/lua/plugins/lazydev.lua deleted file mode 100644 index e95cec9..0000000 --- a/home/.config/mynvim/lua/plugins/lazydev.lua +++ /dev/null @@ -1,23 +0,0 @@ -return { - { - "folke/lazydev.nvim", - ft = "lua", -- only load on lua files - opts = { - library = { - -- See the configuration section for more details - -- Load luvit types when the `vim.uv` word is found - {path = "luvit-meta/library", words = {"vim%.uv"}} - } - } - }, {"Bilal2453/luvit-meta", lazy = true}, -- optional `vim.uv` typings - { -- optional completion source for require statements and module annotations - "hrsh7th/nvim-cmp", - opts = function(_, opts) - opts.sources = opts.sources or {} - table.insert(opts.sources, { - name = "lazydev", - group_index = 0 -- set group index to 0 to skip loading LuaLS completions - }) - end - } -} diff --git a/home/.config/mynvim/lua/plugins/lsp-zero.lua b/home/.config/mynvim/lua/plugins/lsp-zero.lua deleted file mode 100644 index 702616e..0000000 --- a/home/.config/mynvim/lua/plugins/lsp-zero.lua +++ /dev/null @@ -1,79 +0,0 @@ -return { - 'VonHeikemen/lsp-zero.nvim', - branch = 'v4.x', - dependencies = { - {'neovim/nvim-lspconfig'}, {'hrsh7th/cmp-nvim-lsp'}, - {'hrsh7th/nvim-cmp'} - }, - opts = function() - local lsp_zero = require('lsp-zero') - - -- lsp_attach is where you enable features that only work - -- if there is a language server active in the file - local lsp_attach = function(client, bufnr) - local opts = {buffer = bufnr} - - vim.keymap.set('n', 'K', 'lua vim.lsp.buf.hover()', opts) - vim.keymap.set('n', 'gd', 'lua vim.lsp.buf.definition()', - opts) - vim.keymap.set('n', 'gD', 'lua vim.lsp.buf.declaration()', - opts) - vim.keymap.set('n', 'gi', - 'lua vim.lsp.buf.implementation()', opts) - vim.keymap.set('n', 'go', - 'lua vim.lsp.buf.type_definition()', opts) - vim.keymap.set('n', 'gr', 'lua vim.lsp.buf.references()', - opts) - vim.keymap.set('n', 'gs', - 'lua vim.lsp.buf.signature_help()', opts) - vim.keymap.set('n', '', 'lua vim.lsp.buf.rename()', - opts) - vim.keymap.set({'n', 'x'}, '', - 'lua vim.lsp.buf.format({async = true})', - opts) - vim.keymap.set('n', '', - 'lua vim.lsp.buf.code_action()', opts) - end - - lsp_zero.extend_lspconfig({ - sign_text = true, - lsp_attach = lsp_attach, - capabilities = require('cmp_nvim_lsp').default_capabilities() - }) - - lsp_zero.setup_servers({'pyright'}) - - local cmp = require('cmp') - local cmp_action = require('lsp-zero').cmp_action() - - cmp.setup({ - sources = {{name = 'nvim_lsp'}}, - mapping = cmp.mapping.preset.insert({ - -- Navigate between completion items - [''] = cmp.mapping.select_prev_item({behavior = 'select'}), - [''] = cmp.mapping.select_next_item({behavior = 'select'}), - - -- `Enter` key to confirm completion - [''] = cmp.mapping.confirm({select = false}), - - -- Ctrl+Space to trigger completion menu - [''] = cmp.mapping.complete(), - - -- Navigate between snippet placeholder - [''] = cmp_action.vim_snippet_jump_forward(), - [''] = cmp_action.vim_snippet_jump_backward(), - - -- Scroll up and down in the completion documentation - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4) - }), - snippet = { - expand = function(args) - vim.snippet.expand(args.body) - end - } - }) - - end - -} diff --git a/home/.config/mynvim/lua/plugins/lualine.lua b/home/.config/mynvim/lua/plugins/lualine.lua deleted file mode 100644 index 476faf2..0000000 --- a/home/.config/mynvim/lua/plugins/lualine.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "nvim-lualine/lualine.nvim", - dependencies = {"nvim-tree/nvim-web-devicons"}, - config = function() require("lualine").setup() end -} diff --git a/home/.config/mynvim/lua/plugins/monokai.lua b/home/.config/mynvim/lua/plugins/monokai.lua deleted file mode 100644 index 4aba8a1..0000000 --- a/home/.config/mynvim/lua/plugins/monokai.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "tanvirtin/monokai.nvim", - lazy = false, - priority = 1000, - config = function() vim.cmd("colorscheme monokai") end -} diff --git a/home/.config/mynvim/lua/plugins/neogit.lua b/home/.config/mynvim/lua/plugins/neogit.lua deleted file mode 100644 index e20ead8..0000000 --- a/home/.config/mynvim/lua/plugins/neogit.lua +++ /dev/null @@ -1,10 +0,0 @@ -return { - "NeogitOrg/neogit", - dependencies = { - "nvim-lua/plenary.nvim", -- required - "sindrets/diffview.nvim", -- optional - Diff integration - -- Only one of these is needed, not both. - "ibhagwan/fzf-lua" -- optional - }, - config = true -} diff --git a/home/.config/mynvim/lua/plugins/neorg.lua b/home/.config/mynvim/lua/plugins/neorg.lua deleted file mode 100644 index f737f2b..0000000 --- a/home/.config/mynvim/lua/plugins/neorg.lua +++ /dev/null @@ -1,22 +0,0 @@ -return { - "nvim-neorg/neorg", - lazy = false, - version = "*", - config = function() - require("neorg").setup { - load = { - ["core.defaults"] = {}, - ["core.concealer"] = {}, - ["core.dirman"] = { - config = { - workspaces = {notes = "~/notes"}, - default_workspace = "notes" - } - } - } - } - - vim.wo.foldlevel = 99 - vim.wo.conceallevel = 2 - end -} diff --git a/home/.config/mynvim/lua/plugins/neotree.lua b/home/.config/mynvim/lua/plugins/neotree.lua deleted file mode 100644 index 19472f1..0000000 --- a/home/.config/mynvim/lua/plugins/neotree.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "nvim-neo-tree/neo-tree.nvim", - branch = "v3.x", - dependencies = { - "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons", - "MunifTanjim/nui.nvim" - -- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information - } -} diff --git a/home/.config/mynvim/lua/plugins/neovim.lua b/home/.config/mynvim/lua/plugins/neovim.lua deleted file mode 100644 index f18754c..0000000 --- a/home/.config/mynvim/lua/plugins/neovim.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - "NeogitOrg/neogit", - dependencies = { - "nvim-lua/plenary.nvim", -- required - "sindrets/diffview.nvim", -- optional - Diff integration - "ibhagwan/fzf-lua" - }, - config = true -} diff --git a/home/.config/mynvim/lua/plugins/rustaceanvim.lua b/home/.config/mynvim/lua/plugins/rustaceanvim.lua deleted file mode 100644 index dfef21f..0000000 --- a/home/.config/mynvim/lua/plugins/rustaceanvim.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - 'mrcjkb/rustaceanvim', - version = '^5', -- Recommended - lazy = false -- This plugin is already lazy -} diff --git a/home/.config/mynvim/lua/plugins/toggleterm.lua b/home/.config/mynvim/lua/plugins/toggleterm.lua deleted file mode 100644 index e1bad2e..0000000 --- a/home/.config/mynvim/lua/plugins/toggleterm.lua +++ /dev/null @@ -1,17 +0,0 @@ -return { - 'akinsho/toggleterm.nvim', - version = "*", - config = function() - require("toggleterm").setup({ - size = 10, - open_mapping = [[]], - shading_factor = 2, - direction = "float", - float_opts = { - border = "curved", - highlights = {border = "Normal", background = "Normal"} - } - }) - - end -} diff --git a/home/.config/mynvim/lua/plugins/treesitter.lua b/home/.config/mynvim/lua/plugins/treesitter.lua deleted file mode 100644 index d7c6e0e..0000000 --- a/home/.config/mynvim/lua/plugins/treesitter.lua +++ /dev/null @@ -1,40 +0,0 @@ -return { - "nvim-treesitter/nvim-treesitter", - event = {"BufReadPre", "BufNewFile"}, - build = ":TSUpdate", - dependencies = {"windwp/nvim-ts-autotag"}, - config = function() - local treesitter = require("nvim-treesitter.configs") - - treesitter.setup({ - highlight = { - enable = true, - additional_vim_regex_highlighting = false - }, - indent = {enable = true}, - autotag = {enable = true}, - ensure_installed = { - "json", "javascript", "typescript", "tsx", "yaml", "html", - "toml", "css", "markdown", "markdown_inline", "bash", "lua", - "vim", "dockerfile", "gitignore", "c", "python", "rust", "go", - "hcl" - }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = "", - node_incremental = "", - scope_incremental = false, - node_decremental = "" - } - }, - rainbow = { - enable = true, - disable = {"html"}, - extended_mode = false, - max_file_lines = nil - }, - context_commentstring = {enable = true, enable_autocmd = false} - }) - end -} diff --git a/home/.config/mynvim/lua/plugins/trouble.lua b/home/.config/mynvim/lua/plugins/trouble.lua deleted file mode 100644 index 8bb2451..0000000 --- a/home/.config/mynvim/lua/plugins/trouble.lua +++ /dev/null @@ -1,32 +0,0 @@ -return { - "folke/trouble.nvim", - opts = {auto_open = true, auto_close = true}, -- for default options, refer to the configuration section for custom setup. - cmd = "Trouble", - keys = { - { - "xx", - "Trouble diagnostics toggle", - desc = "Diagnostics (Trouble)" - }, { - "xX", - "Trouble diagnostics toggle filter.buf=0", - desc = "Buffer Diagnostics (Trouble)" - }, { - "cs", - "Trouble symbols toggle focus=false", - desc = "Symbols (Trouble)" - }, { - "cl", - "Trouble lsp toggle focus=false win.position=right", - desc = "LSP Definitions / references / ... (Trouble)" - }, { - "xL", - "Trouble loclist toggle", - desc = "Location List (Trouble)" - }, { - "xQ", - "Trouble qflist toggle", - desc = "Quickfix List (Trouble)" - } - } -} diff --git a/home/.config/mynvim/lua/plugins/vim_sleuth.lua b/home/.config/mynvim/lua/plugins/vim_sleuth.lua deleted file mode 100644 index 608476f..0000000 --- a/home/.config/mynvim/lua/plugins/vim_sleuth.lua +++ /dev/null @@ -1 +0,0 @@ -return {"tpope/vim-sleuth"} diff --git a/home/.config/mynvim/lua/plugins/whichkey.lua b/home/.config/mynvim/lua/plugins/whichkey.lua deleted file mode 100644 index 6017254..0000000 --- a/home/.config/mynvim/lua/plugins/whichkey.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - "folke/which-key.nvim", - event = "VeryLazy", - opts = { - -- your configuration comes here - -- or leave it empty to use the default settings - -- refer to the configuration section below - }, - keys = { - { - "?", - function() require("which-key").show({global = false}) end, - desc = "Buffer Local Keymaps (which-key)" - } - } -} diff --git a/home/.config/mynvim/lua/plugins/zoxide.lua b/home/.config/mynvim/lua/plugins/zoxide.lua deleted file mode 100644 index 80214ac..0000000 --- a/home/.config/mynvim/lua/plugins/zoxide.lua +++ /dev/null @@ -1 +0,0 @@ -return {"nanotee/zoxide.vim"} diff --git a/home/.config/nvim/.gitignore b/home/.config/nvim/.gitignore deleted file mode 100644 index cc5457a..0000000 --- a/home/.config/nvim/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -tt.* -.tests -doc/tags -debug -.repro -foo.* -*.log -data diff --git a/home/.config/nvim/.neoconf.json b/home/.config/nvim/.neoconf.json deleted file mode 100644 index 7c48087..0000000 --- a/home/.config/nvim/.neoconf.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "neodev": { - "library": { - "enabled": true, - "plugins": true - } - }, - "neoconf": { - "plugins": { - "lua_ls": { - "enabled": true - } - } - } -} diff --git a/home/.config/nvim/LICENSE b/home/.config/nvim/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/home/.config/nvim/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/home/.config/nvim/README.md b/home/.config/nvim/README.md deleted file mode 100644 index 185280b..0000000 --- a/home/.config/nvim/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# 💤 LazyVim - -A starter template for [LazyVim](https://github.com/LazyVim/LazyVim). -Refer to the [documentation](https://lazyvim.github.io/installation) to get started. diff --git a/home/.config/nvim/init.lua b/home/.config/nvim/init.lua deleted file mode 100644 index 2514f9e..0000000 --- a/home/.config/nvim/init.lua +++ /dev/null @@ -1,2 +0,0 @@ --- bootstrap lazy.nvim, LazyVim and your plugins -require("config.lazy") diff --git a/home/.config/nvim/lua/config/autocmds.lua b/home/.config/nvim/lua/config/autocmds.lua deleted file mode 100644 index 27e9e06..0000000 --- a/home/.config/nvim/lua/config/autocmds.lua +++ /dev/null @@ -1,3 +0,0 @@ --- Autocmds are automatically loaded on the VeryLazy event --- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua --- Add any additional autocmds here diff --git a/home/.config/nvim/lua/config/keymaps.lua b/home/.config/nvim/lua/config/keymaps.lua deleted file mode 100644 index e6280b0..0000000 --- a/home/.config/nvim/lua/config/keymaps.lua +++ /dev/null @@ -1,10 +0,0 @@ --- Keymaps are automatically loaded on the VeryLazy event --- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua --- Add any additional keymaps here -local wk = require("which-key") - --- Override only h and l for tab navigation -wk.add({ - {"h", "tabprevious", desc = "Previous Tab"}, - {"l", "tabnext", desc = "Next Tab"} -}) diff --git a/home/.config/nvim/lua/config/lazy.lua b/home/.config/nvim/lua/config/lazy.lua deleted file mode 100644 index a2cd29a..0000000 --- a/home/.config/nvim/lua/config/lazy.lua +++ /dev/null @@ -1,76 +0,0 @@ -local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" -if not (vim.uv or vim.loop).fs_stat(lazypath) then - local lazyrepo = "https://github.com/folke/lazy.nvim.git" - local out = vim.fn.system({ - "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, - lazypath - }) - if vim.v.shell_error ~= 0 then - vim.api.nvim_echo({ - {"Failed to clone lazy.nvim:\n", "ErrorMsg"}, {out, "WarningMsg"}, - {"\nPress any key to exit..."} - }, true, {}) - vim.fn.getchar() - os.exit(1) - end -end -vim.opt.rtp:prepend(lazypath) - -require("lazy").setup({ - spec = { - -- add LazyVim and import its plugins - {"LazyVim/LazyVim", import = "lazyvim.plugins"}, -- coding - {import = "lazyvim.plugins.extras.coding.copilot-chat"}, - {import = "lazyvim.plugins.extras.coding.copilot"}, - {import = "lazyvim.plugins.extras.coding.mini-comment"}, -- editor - {import = "lazyvim.plugins.extras.editor.telescope"}, - {import = "lazyvim.plugins.extras.editor.refactoring"}, - {import = "lazyvim.plugins.extras.editor.inc-rename"}, - {import = "lazyvim.plugins.extras.editor.overseer"}, - {import = "lazyvim.plugins.extras.editor.illuminate"}, -- formatting - {import = "lazyvim.plugins.extras.formatting.prettier"}, -- Languages - {import = "lazyvim.plugins.extras.lang.ansible"}, - {import = "lazyvim.plugins.extras.lang.docker"}, - {import = "lazyvim.plugins.extras.lang.git"}, - {import = "lazyvim.plugins.extras.lang.go"}, - {import = "lazyvim.plugins.extras.lang.helm"}, - {import = "lazyvim.plugins.extras.lang.json"}, - -- { import = "lazyvim.plugins.extras.lang.markdown" }, - {import = "lazyvim.plugins.extras.lang.python"}, - {import = "lazyvim.plugins.extras.lang.rust"}, - {import = "lazyvim.plugins.extras.lang.terraform"}, - {import = "lazyvim.plugins.extras.lang.tex"}, - {import = "lazyvim.plugins.extras.lang.toml"}, - {import = "lazyvim.plugins.extras.lang.tailwind"}, - {import = "lazyvim.plugins.extras.lang.typescript"}, - {import = "lazyvim.plugins.extras.lang.yaml"}, - - -- import/override with your plugins - {import = "plugins"} - }, - defaults = { - -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. - -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. - lazy = false, - -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, - -- have outdated releases, which may break your Neovim install. - version = false -- always use the latest git commit - -- version = "*", -- try installing the latest stable version for plugins that support semver - }, - install = {}, - checker = { - enabled = true, -- check for plugin updates periodically - notify = false -- notify on update - }, -- automatically check for plugin updates - performance = { - rtp = { - -- disable some rtp plugins - disabled_plugins = { - "gzip", -- "matchit", - -- "matchparen", - -- "netrwPlugin", - "tarPlugin", "tohtml", "tutor", "zipPlugin" - } - } - } -}) diff --git a/home/.config/nvim/lua/config/options.lua b/home/.config/nvim/lua/config/options.lua deleted file mode 100644 index d5da513..0000000 --- a/home/.config/nvim/lua/config/options.lua +++ /dev/null @@ -1,10 +0,0 @@ --- Options are automatically loaded before lazy.nvim startup --- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua --- Add any additional options here -vim.g.autoformat = false - -local opt = vim.opt - -opt.shiftwidth = 4 -- size of an indent -opt.tabstop = 4 -- number of spaces tabs count for -opt.autowriteall = true -- autosave diff --git a/home/.config/nvim/lua/plugins/disabled.lua b/home/.config/nvim/lua/plugins/disabled.lua deleted file mode 100644 index b45002a..0000000 --- a/home/.config/nvim/lua/plugins/disabled.lua +++ /dev/null @@ -1 +0,0 @@ -return {{"echasnovski/mini.pairs", enabled = false}} diff --git a/home/.config/nvim/lua/plugins/example.lua b/home/.config/nvim/lua/plugins/example.lua deleted file mode 100644 index 58ef265..0000000 --- a/home/.config/nvim/lua/plugins/example.lua +++ /dev/null @@ -1,156 +0,0 @@ --- since this is just an example spec, don't actually load anything here and return an empty spec --- stylua: ignore -if true then return {} end - --- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim --- --- In your plugin files, you can: --- * add extra plugins --- * disable/enabled LazyVim plugins --- * override the configuration of LazyVim plugins -return { - -- add gruvbox - {"ellisonleao/gruvbox.nvim"}, -- Configure LazyVim to load gruvbox - {"LazyVim/LazyVim", opts = {colorscheme = "gruvbox"}}, - - -- change trouble config - { - "folke/trouble.nvim", - -- opts will be merged with the parent spec - opts = {use_diagnostic_signs = true} - }, -- disable trouble - {"folke/trouble.nvim", enabled = false}, - - -- override nvim-cmp and add cmp-emoji - { - "hrsh7th/nvim-cmp", - dependencies = {"hrsh7th/cmp-emoji"}, - ---@param opts cmp.ConfigSchema - opts = function(_, opts) - table.insert(opts.sources, {name = "emoji"}) - end - }, -- change some telescope options and a keymap to browse plugin files - { - "nvim-telescope/telescope.nvim", - keys = { - -- add a keymap to browse plugin files - -- stylua: ignore - { - "fp", - function() - require("telescope.builtin").find_files({ - cwd = require("lazy.core.config").options.root - }) - end, - desc = "Find Plugin File" - } - }, - -- change some options - opts = { - defaults = { - layout_strategy = "horizontal", - layout_config = {prompt_position = "top"}, - sorting_strategy = "ascending", - winblend = 0 - } - } - }, -- add pyright to lspconfig - { - "neovim/nvim-lspconfig", - ---@class PluginLspOpts - opts = { - ---@type lspconfig.options - servers = { - -- pyright will be automatically installed with mason and loaded with lspconfig - pyright = {} - } - } - }, -- add tsserver and setup with typescript.nvim instead of lspconfig - { - "neovim/nvim-lspconfig", - dependencies = { - "jose-elias-alvarez/typescript.nvim", - init = function() - require("lazyvim.util").lsp.on_attach(function(_, buffer) - -- stylua: ignore - vim.keymap.set("n", "co", - "TypescriptOrganizeImports", - {buffer = buffer, desc = "Organize Imports"}) - vim.keymap.set("n", "cR", "TypescriptRenameFile", - {desc = "Rename File", buffer = buffer}) - end) - end - }, - ---@class PluginLspOpts - opts = { - ---@type lspconfig.options - servers = { - -- tsserver will be automatically installed with mason and loaded with lspconfig - tsserver = {} - }, - -- you can do any additional lsp server setup here - -- return true if you don't want this server to be setup with lspconfig - ---@type table - setup = { - -- example to setup with typescript.nvim - tsserver = function(_, opts) - require("typescript").setup({server = opts}) - return true - end - -- Specify * to use this function as a fallback for any server - -- ["*"] = function(server, opts) end, - } - } - }, - - -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, - -- treesitter, mason and typescript.nvim. So instead of the above, you can use: - {import = "lazyvim.plugins.extras.lang.typescript"}, - - -- add more treesitter parsers - { - "nvim-treesitter/nvim-treesitter", - opts = { - ensure_installed = { - "bash", "html", "javascript", "json", "lua", "markdown", - "markdown_inline", "python", "query", "regex", "tsx", - "typescript", "vim", "yaml" - } - } - }, - - -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above - -- would overwrite `ensure_installed` with the new value. - -- If you'd rather extend the default config, use the code below instead: - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - -- add tsx and treesitter - vim.list_extend(opts.ensure_installed, {"tsx", "typescript"}) - end - }, -- the opts function can also be used to change the default opts: - { - "nvim-lualine/lualine.nvim", - event = "VeryLazy", - opts = function(_, opts) - table.insert(opts.sections.lualine_x, "😄") - end - }, -- or you can return new options to override all the defaults - { - "nvim-lualine/lualine.nvim", - event = "VeryLazy", - opts = function() - return { --[[add your custom lualine config here]] } - end - }, -- use mini.starter instead of alpha - {import = "lazyvim.plugins.extras.ui.mini-starter"}, - - -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc - {import = "lazyvim.plugins.extras.lang.json"}, - - -- add any tools you want to have installed below - { - "williamboman/mason.nvim", - opts = {ensure_installed = {"stylua", "shellcheck", "shfmt", "flake8"}} - } -} diff --git a/home/.config/nvim/lua/plugins/monokai.lua b/home/.config/nvim/lua/plugins/monokai.lua deleted file mode 100644 index 4aba8a1..0000000 --- a/home/.config/nvim/lua/plugins/monokai.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - "tanvirtin/monokai.nvim", - lazy = false, - priority = 1000, - config = function() vim.cmd("colorscheme monokai") end -} diff --git a/home/.config/nvim/stylua.toml b/home/.config/nvim/stylua.toml deleted file mode 100644 index e55efd5..0000000 --- a/home/.config/nvim/stylua.toml +++ /dev/null @@ -1,3 +0,0 @@ -indent_type = "Spaces" -indent_width = 4 -column_width = 120 diff --git a/home/.gitconfig b/home/.gitconfig index 32b9735..6b1b011 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -28,3 +28,6 @@ [user] email = rgpeach10@gmail.com name = Ryan Peach + +[url "https://github.com/snps-genai/"] + insteadOf = git@github.com:snps-genai/ From 5fd326961fa4ccb309f43d6479847ef151138956 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Fri, 27 Mar 2026 19:16:19 -0400 Subject: [PATCH 02/14] Remove nvim --- home/.config/nvim/lua/plugins/random.lua | 118 ------------------- home/.config/nvim/lua/plugins/treesitter.lua | 15 --- 2 files changed, 133 deletions(-) delete mode 100644 home/.config/nvim/lua/plugins/random.lua delete mode 100644 home/.config/nvim/lua/plugins/treesitter.lua diff --git a/home/.config/nvim/lua/plugins/random.lua b/home/.config/nvim/lua/plugins/random.lua deleted file mode 100644 index 655e218..0000000 --- a/home/.config/nvim/lua/plugins/random.lua +++ /dev/null @@ -1,118 +0,0 @@ --- Helper function to generate a random character based on input and preserve the case -local function get_random_character(char) - if char:match('%a') then - if char:match('%u') then - -- Replace with a random uppercase letter - return string.char(math.random(65, 90)) -- ASCII range for 'A'-'Z' - elseif char:match('%l') then - -- Replace with a random lowercase letter - return string.char(math.random(97, 122)) -- ASCII range for 'a'-'z' - end - elseif char:match('%d') then - -- Replace with a random digit (0-9) - return tostring(math.random(0, 9)) - else - -- Keep non-alphanumeric characters unchanged - return char - end -end - --- Function to replace characters with random characters within a motion range --- Used to obfuscate text -function _G.replace_with_random_motion(type) - local start_pos = vim.fn.getpos("'[") - local end_pos = vim.fn.getpos("']") - - local start_line = start_pos[2] - local start_col = start_pos[3] - local end_line = end_pos[2] - local end_col = end_pos[3] - - if type == "block" then - -- Handle block-wise selection - for line_num = start_line, end_line do - local line = vim.fn.getline(line_num) - local s_col = start_col - local e_col = end_col - 1 -- Adjusting for Lua's 1-based indexing - - -- Ensure we don't exceed the line length - s_col = math.min(s_col, #line + 1) - e_col = math.min(e_col, #line) - - local new_line = line:sub(1, s_col - 1) - for col = s_col, e_col do - local current_char = line:sub(col, col) - new_line = new_line .. get_random_character(current_char) - end - new_line = new_line .. line:sub(e_col + 1) - vim.fn.setline(line_num, new_line) - end - else - if type == "line" then - start_col = 1 - end_col = math.huge -- Use a large number to cover the entire line - end - - for line_num = start_line, end_line do - local line = vim.fn.getline(line_num) - local s_col = (line_num == start_line) and start_col or 1 - local e_col = (line_num == end_line) and end_col - 1 or #line - - -- Ensure end column does not exceed line length - e_col = math.min(e_col, #line) - - local new_line = line:sub(1, s_col - 1) - for col = s_col, e_col do - local current_char = line:sub(col, col) - new_line = new_line .. get_random_character(current_char) - end - new_line = new_line .. line:sub(e_col + 1) - vim.fn.setline(line_num, new_line) - end - end -end - --- Function to generate a random string based on the input word, preserving the case -function _G.get_random_string(word, ...) - local random_string = "" - for i = 1, #word do - local char = word:sub(i, i) - random_string = random_string .. get_random_character(char) - end - return random_string -end - --- Function to replace all occurrences of a word with random text -function _G.replace_word_with_random_global() - -- Get the word under the cursor - local current_word = vim.fn.expand("") - if current_word == "" then - print("No word under cursor") - return - end - - -- Escape special characters in the word - local escaped_word = vim.fn.escape(current_word, [[\]]) - - -- Build the substitution command - local cmd = string.format( - "%%s/\\<%s\\>/\\=luaeval('get_random_string(_A)', submatch(0))/g", - escaped_word) - - -- Execute the substitution command - vim.cmd(cmd) -end - --- Set up which-key mappings -local wk = require("which-key") -wk.add({ - { - "gRr", - ":set opfunc=v:lua.replace_with_random_motiong@", - desc = "Replace with Random Character" - }, { - "gRW", - ":call v:lua.replace_word_with_random_global()", - desc = "Replace Word with Random Text Globally" - } -}) diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua deleted file mode 100644 index 5c1ddd4..0000000 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ /dev/null @@ -1,15 +0,0 @@ -return { - {"IndianBoy42/tree-sitter-just"}, - -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above - -- would overwrite `ensure_installed` with the new value. - -- If you'd rather extend the default config, use the code below instead: - { - "nvim-treesitter/nvim-treesitter", - opts = function(_, opts) - -- add tsx and treesitter - require('tree-sitter-just').setup({}) - vim.list_extend(opts.ensure_installed, {"just"}) - end - } -- the opts function can also be used to change the default opts: - -} From e8eb84e6f6d8ce1e5a5cb46f9759d59ae1dbdac6 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Fri, 27 Mar 2026 19:16:49 -0400 Subject: [PATCH 03/14] Remove zed --- home/.config/zed/settings.json | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 home/.config/zed/settings.json diff --git a/home/.config/zed/settings.json b/home/.config/zed/settings.json deleted file mode 100644 index 618a308..0000000 --- a/home/.config/zed/settings.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "base_keymap": "VSCode", - "vim_mode": true, - "ui_font_size": 16, - "buffer_font_size": 15, - "load_direnv": "direct", - "format_on_save": "off", - "minimap": { - "show": "auto" - }, - "autosave": "on_focus_change", - "theme": { - "mode": "system", - "light": "One Light", - "dark": "Monokai Nebula" - } -} From b0843a2512487e2f47c8dd7ba6ff19a9aae0015f Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Fri, 27 Mar 2026 19:24:51 -0400 Subject: [PATCH 04/14] Fixed alacrity --- home/.alacritty/profiles/tmux.toml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/home/.alacritty/profiles/tmux.toml b/home/.alacritty/profiles/tmux.toml index df18f38..7b1fed2 100644 --- a/home/.alacritty/profiles/tmux.toml +++ b/home/.alacritty/profiles/tmux.toml @@ -1,11 +1,8 @@ -[general] import = [ "~/.alacritty/includes/shared.toml" ] -[terminal] - -[terminal.shell] +[shell] program = "/bin/zsh" args = [ "-l", From 1badd541c8d97d78ba1bfc55b3f8ab28fabdc557 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Fri, 27 Mar 2026 19:26:47 -0400 Subject: [PATCH 05/14] Fix github building --- .github/workflows/docker-image.yml | 12 ------------ .github/workflows/docker-publish.yml | 11 ----------- .github/workflows/linting.yml | 21 --------------------- 3 files changed, 44 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 282c772..8703f94 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -28,19 +28,7 @@ jobs: env: BRANCH_NAME: ${{ github.head_ref || github.ref_name }} - - name: Git Setup - run: | - mkdir -p ~/.ssh - echo 'Host ${{ vars.SERVER_IP }} ' >> ~/.ssh/config - echo ' HostName ${{ vars.SERVER_IP }}' >> ~/.ssh/config - echo ' Port ${{ vars.SERVER_SSH_PORT }}' >> ~/.ssh/config - cat ~/.ssh/config - - uses: actions/checkout@v4 - with: - ssh-key: ${{ secrets.DEPLOY_PRIVATE_KEY }} - token: ${{ secrets.GITEA_TOKEN }} - ssh-known-hosts: ${{ secrets.KNOWN_HOSTS }} - name: Set up QEMU uses: docker/setup-qemu-action@v1 diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 70df84e..c788ee5 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -38,19 +38,8 @@ jobs: id-token: write steps: - - name: Git Setup - run: | - mkdir -p ~/.ssh - echo 'Host ${{ vars.SERVER_IP }} ' >> ~/.ssh/config - echo ' HostName ${{ vars.SERVER_IP }}' >> ~/.ssh/config - echo ' Port ${{ vars.SERVER_SSH_PORT }}' >> ~/.ssh/config - cat ~/.ssh/config - uses: actions/checkout@v4 - with: - ssh-key: ${{ secrets.DEPLOY_PRIVATE_KEY }} - token: ${{ secrets.GITEA_TOKEN }} - ssh-known-hosts: ${{ secrets.KNOWN_HOSTS }} - name: Set up QEMU uses: docker/setup-qemu-action@v1 diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index bbb4b81..3e273d4 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -11,27 +11,6 @@ jobs: runs-on: ubuntu-latest steps: - - name: Git Setup - run: | - mkdir -p ~/.ssh - echo 'Host ${{ vars.SERVER_IP }} ' >> ~/.ssh/config - echo ' HostName ${{ vars.SERVER_IP }}' >> ~/.ssh/config - echo ' Port ${{ vars.SERVER_SSH_PORT }}' >> ~/.ssh/config - cat ~/.ssh/config - - uses: actions/checkout@v4 - with: - ssh-key: ${{ secrets.DEPLOY_PRIVATE_KEY }} - token: ${{ secrets.GITEA_TOKEN }} - ssh-known-hosts: ${{ secrets.KNOWN_HOSTS }} - - uses: actions/setup-python@v3 - - uses: leafo/gh-actions-lua@v9 - - uses: leafo/gh-actions-luarocks@v4 - - name: Install luaformatter - run: | - apt-get update - apt-get install cmake -y - luarocks install --server=https://luarocks.org/dev luaformatter - - uses: pre-commit/action@v3.0.1 From 5e769bbf46842916b603602344f8b5757685a3b8 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Fri, 27 Mar 2026 19:47:59 -0400 Subject: [PATCH 06/14] Need to add this directory or the del fails --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 4bd6dbe..80a2f99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -168,6 +168,7 @@ RUN apk --no-cache --virtual .build-deps add \ && set -x && autoreconf -iv \ && ./configure \ && make install \ + && mkdir -p /usr/share/info \ && apk del .build-deps # Copies From 95a1ea3c8a83717d4cbfdd4ef6e1085bca2dc70e Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Fri, 27 Mar 2026 20:09:10 -0400 Subject: [PATCH 07/14] I don't care enough to work on deleting build deps atm --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 80a2f99..73a443c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -167,9 +167,8 @@ RUN apk --no-cache --virtual .build-deps add \ && sed -i '/check_pmdir/d' Makefile.am \ && set -x && autoreconf -iv \ && ./configure \ - && make install \ - && mkdir -p /usr/share/info \ - && apk del .build-deps + && make install + # && apk del .build-deps # Copies ENV SHELL_DIR=$HOME/shell From 065e0a88914a5a03267a6547afdfb2adaeaeebbc Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Fri, 27 Mar 2026 20:16:53 -0400 Subject: [PATCH 08/14] Add regular vim --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 73a443c..788e204 100644 --- a/Dockerfile +++ b/Dockerfile @@ -64,6 +64,7 @@ RUN apk add --no-cache \ jq \ neofetch \ tmux \ + vim \ # Shells and Zsh plugins \ zsh \ zsh-autosuggestions \ From 704a39f09ee3430ff280dc7cf24a3334114c2696 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Fri, 27 Mar 2026 20:35:27 -0400 Subject: [PATCH 09/14] Apparently we do need that directory --- Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 788e204..5ed7960 100644 --- a/Dockerfile +++ b/Dockerfile @@ -157,7 +157,8 @@ RUN git clone https://github.com/eth-p/bat-extras.git \ && ./build.sh --install --no-verify # Stow -RUN apk --no-cache --virtual .build-deps add \ +RUN mkdir -p /usr/share/info \ + && apk --no-cache --virtual .build-deps add \ build-base \ automake \ autoconf \ @@ -168,8 +169,8 @@ RUN apk --no-cache --virtual .build-deps add \ && sed -i '/check_pmdir/d' Makefile.am \ && set -x && autoreconf -iv \ && ./configure \ - && make install - # && apk del .build-deps + && make install \ + && apk del .build-deps # Copies ENV SHELL_DIR=$HOME/shell From f4a5375dd948e5f34565ce373df65ae2c2081e57 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Fri, 27 Mar 2026 20:50:42 -0400 Subject: [PATCH 10/14] These are taking forever --- Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5ed7960..8eaee69 100644 --- a/Dockerfile +++ b/Dockerfile @@ -133,10 +133,6 @@ RUN .tfenv/bin/tfenv install latest # Go installs ENV PATH="$HOME/go/bin:$PATH" -RUN go install github.com/terraform-docs/terraform-docs@v0.18.0 \ - && terraform-docs --version \ - && go install github.com/ankitpokhrel/jira-cli/cmd/jira@latest \ - && jira --help # Install gh ENV PATH=$HOME/.local/bin:$PATH From fa18b91e6656d0295dc69be095842e43efec72e2 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Fri, 27 Mar 2026 20:52:21 -0400 Subject: [PATCH 11/14] Lets try again getting rid of del --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8eaee69..04f5aec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -165,8 +165,8 @@ RUN mkdir -p /usr/share/info \ && sed -i '/check_pmdir/d' Makefile.am \ && set -x && autoreconf -iv \ && ./configure \ - && make install \ - && apk del .build-deps + && make install + # && apk del .build-deps # Copies ENV SHELL_DIR=$HOME/shell From 8a757d630503493a460d43a402b5bf987e3a4c41 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Fri, 27 Mar 2026 20:53:42 -0400 Subject: [PATCH 12/14] Oh, stow needs perl --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 04f5aec..c8f4cf9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -153,20 +153,20 @@ RUN git clone https://github.com/eth-p/bat-extras.git \ && ./build.sh --install --no-verify # Stow -RUN mkdir -p /usr/share/info \ - && apk --no-cache --virtual .build-deps add \ +RUN apk --no-cache --virtual .build-deps add \ build-base \ automake \ autoconf \ texinfo \ + perl \ && git clone https://github.com/aspiers/stow.git \ && cd stow \ && sed '131,143d' -i Makefile.am \ && sed -i '/check_pmdir/d' Makefile.am \ && set -x && autoreconf -iv \ && ./configure \ - && make install - # && apk del .build-deps + && make install \ + && apk del .build-deps # Copies ENV SHELL_DIR=$HOME/shell From ddfff0a4be2dc0aee1d8fbcebfaf417ef4579878 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Fri, 27 Mar 2026 20:58:50 -0400 Subject: [PATCH 13/14] Try texlive --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index c8f4cf9..845bde5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -159,6 +159,7 @@ RUN apk --no-cache --virtual .build-deps add \ autoconf \ texinfo \ perl \ + texlive \ && git clone https://github.com/aspiers/stow.git \ && cd stow \ && sed '131,143d' -i Makefile.am \ From dd795e3ee2ef7177ed8f363abbde8fbbcf1a8de8 Mon Sep 17 00:00:00 2001 From: Ryan Peach Date: Fri, 27 Mar 2026 20:59:57 -0400 Subject: [PATCH 14/14] Can we just apk install stow --- Dockerfile | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 845bde5..7b12240 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,6 +39,7 @@ RUN apk add --no-cache \ rsync \ # System apps \ sed \ + stow \ gawk \ graphviz \ zoxide \ @@ -152,23 +153,6 @@ RUN git clone https://github.com/eth-p/bat-extras.git \ && cd bat-extras \ && ./build.sh --install --no-verify -# Stow -RUN apk --no-cache --virtual .build-deps add \ - build-base \ - automake \ - autoconf \ - texinfo \ - perl \ - texlive \ - && git clone https://github.com/aspiers/stow.git \ - && cd stow \ - && sed '131,143d' -i Makefile.am \ - && sed -i '/check_pmdir/d' Makefile.am \ - && set -x && autoreconf -iv \ - && ./configure \ - && make install \ - && apk del .build-deps - # Copies ENV SHELL_DIR=$HOME/shell COPY . $SHELL_DIR