diff --git a/.github/README.md b/.github/README.md index 2f08bd7..1122793 100755 --- a/.github/README.md +++ b/.github/README.md @@ -1,7 +1,7 @@ -# NeoVim Forge +# Neovim Forge My [Winchester Mystery](https://en.wikipedia.org/wiki/Winchester_Mystery_House) -NeoVim Configuration, using `lazy.nvim` for plugin management and Lua as its +Neovim Configuration, using `lazy.nvim` for plugin management and Lua as its configuration language. My _Personal Development Environment_ (PDE) and the core tool used in cultivating my Personal Knowledge Base (PKB). > **Warning** @@ -11,24 +11,25 @@ configuration language. My _Personal Development Environment_ (PDE) and the core > to use as it is presented. With this in mind, **feel free to take from it as you please**, use pieces of -it or the whole thing as a basis for your own and you are more than welcome +it or the whole thing as a basis for your own, and you are more than welcome to **submit pull requests** if it so pleases you, that's why its on -GitHub |wink | +GitHub |wink| ## Installation -To use this configuration, clone it into your `~/.config/nvim` directory | +To use this configuration, clone or copy it directly into your `~/.config/nvim` directory. ```sh # Back up your old configuration if present mv ~/.config/nim ~/.config/nvim.bak + # Now clone this one git clone https://github.com/Thomashighbaugh/nvim-forge ~/.config/nvim ``` -And that should be it, if you have the prerequisites installed it should run through the lazy.nvim installation process and handle setting up everything in the process from Treesitter grammars to Mason dependencies, it might just take a few minutes so be patient. +And that _should_ be it, if you have the prerequisites installed it should run through the lazy.nvim installation process and handle setting up everything in the process from Treesitter grammars to Mason dependencies, it might just take a few minutes so be patient. ## Configuration Structure @@ -36,93 +37,87 @@ This configuration roughly follows that of LazyVim, with some minor changes that Unlike many other highly customized NeoVim configurations, as well as most major configuration frameworks, the configuration is not nested within a subdirectory of the Lua subdirectory named after the author, plugin or configuration, I find no need to brand this configuration in a way that makes using its parts elsewhere highly onerous and introduces a needless source of potential errors for me to deal with instead of working on code like I intend to be. -Below is a representation of the structure of the configuration in tree format | +Below is a representation of the structure of the configuration in tree format +  . -├──  cheatsheet.txt -├──  doc -│ └──  nvim-forge.txt ├──  Dockerfile +├──  ftplugin +│ └──  java.lua ├──  init.lua ├──  lazy-lock.json -├──  LICENSE ├──  lua +│ ├──  code_action_utils.lua │ ├──  core -│ │ ├──  autocmds.lua -│ │ ├──  commands.lua -│ │ ├──  icons.lua -│ │ ├──  init.lua +│ │ ├──  autocommands.lua │ │ ├──  keymaps.lua -│ │ ├──  lazy.lua -│ │ ├──  logos.lua -│ │ └──  options.lua -│ ├──  features -│ │ ├──  lsp -│ │ │ ├──  diagnostics.lua -│ │ │ ├──  init.lua -│ │ │ ├──  keymaps.lua -│ │ │ ├──  lang -│ │ │ │ ├──  docker.lua -│ │ │ │ ├──  flutter.lua -│ │ │ │ ├──  go.lua -│ │ │ │ ├──  java.lua -│ │ │ │ ├──  json.lua -│ │ │ │ ├──  markdown.lua -│ │ │ │ ├──  markup.lua -│ │ │ │ ├──  nix.lua -│ │ │ │ ├──  php.lua -│ │ │ │ ├──  python.lua -│ │ │ │ ├──  rust.lua -│ │ │ │ ├──  typescript.lua -│ │ │ │ └──  vue.lua -│ │ │ └──  navic.lua -│ │ ├──  lualine -│ │ │ ├──  components.lua -│ │ │ ├──  config.lua -│ │ │ ├──  init.lua -│ │ │ ├──  palette.lua -│ │ │ └──  theme.lua -│ │ └──  neo-tree -│ │ ├──  init.lua -│ │ └──  sources -│ │ └──  filesystem -│ │ └──  components.lua -│ ├──  init.lua -│ ├──  plugins -│ │ ├──  aisync.lua -│ │ ├──  coding.lua -│ │ ├──  colorscheme.lua -│ │ ├──  editor.lua -│ │ ├──  formatting.lua -│ │ ├──  init.lua -│ │ ├──  linting.lua -│ │ ├──  lsp.lua -│ │ ├──  shared.lua -│ │ ├──  tools.lua -│ │ ├──  treesitter.lua -│ │ └──  ui.lua -│ ├──  profile.lua -│ └──  utils -│ ├──  cmd.lua +│ │ ├──  options.lua +│ │ ├──  usercommands.lua +│ │ └──  utils.lua +│ └──  plugins +│ ├──  aisync.lua +│ ├──  bufferline.lua +│ ├──  cmp.lua +│ ├──  codesnap.lua +│ ├──  comments.lua +│ ├──  conform.lua +│ ├──  dap +│ │ └──  debug_adapter.lua +│ ├──  dashboard.lua +│ ├──  devdocs.lua +│ ├──  dressing.lua +│ ├──  flash.lua +│ ├──  focus.lua +│ ├──  git.lua +│ ├──  image_preview.lua +│ ├──  inc_rename.lua +│ ├──  indent-blankline.lua │ ├──  init.lua -│ ├──  lsp.lua +│ ├──  lsp +│ │ ├──  aerial.lua +│ │ ├──  glance.lua +│ │ ├──  lazydev.lua +│ │ ├──  lsp-config.lua +│ │ ├──  mason.lua +│ │ ├──  nvim-navic.lua +│ │ ├──  outline.lua +│ │ └──  trouble.lua │ ├──  lualine.lua -│ ├──  plugin.lua -│ ├──  root.lua -│ ├──  string.lua -│ ├──  table.lua +│ ├──  luasnip.lua +│ ├──  mini-align.lua +│ ├──  mini-indentscope.lua +│ ├──  neo-tree.lua +│ ├──  noice.lua +│ ├──  nvim-autopairs.lua +│ ├──  nvim-lint.lua +│ ├──  nvim-notify.lua +│ ├──  nvim-surround.lua +│ ├──  nvim-tree.lua +│ ├──  oil.lua +│ ├──  ollama.lua +│ ├──  rainbow-delimiters.lua +│ ├──  rest.lua +│ ├──  snipe.lua +│ ├──  ssr.lua +│ ├──  statuscol.lua +│ ├──  symbols.lua │ ├──  telescope.lua -│ └──  theme.lua -├──  README.md -> .github/README.md +│ ├──  toggleterm.lua +│ ├──  treesitter.lua +│ ├──  web_devicons.lua +│ ├──  which-key.lua +│ └──  yanky.lua +├── 󰂺 README.md → .github/README.md ├──  snippets │ ├──  all.lua │ ├──  java.snippets +│ ├──  javascript.lua +│ ├──  lua.lua │ ├──  markdown.lua │ ├──  package.json │ ├──  vscode │ │ ├──  c.json │ │ ├──  cpp.json │ │ ├──  css.json -│ │ ├──  fennel.json │ │ ├──  frameworks │ │ │ ├──  ejs.json │ │ │ ├──  flutter.json @@ -158,6 +153,7 @@ Below is a representation of the structure of the configuration in tree format | │ │ ├──  meson.json │ │ ├──  norg.json │ │ ├──  org.json +│ │ ├──  package-lock.json │ │ ├──  package.json │ │ ├──  python │ │ │ ├──  base.json @@ -170,84 +166,247 @@ Below is a representation of the structure of the configuration in tree format | │ │ ├──  shell.json │ │ └──  sql.json │ └──  yaml.lua -├──  spell -│ ├──  en.dict -│ ├──  en.utf-8.add -│ ├──  en.utf-8.add.spl -│ ├──  es.dict -│ ├──  hi.dict -│ └──  README.md -├──  stylua.toml -└──  ui.lua +└──  spell +├──  en.dict +├──  en.utf-8.add +└──  en.utf-8.add.spl -``` ## Keybindings Below are the keybind mappings used in this configuration, they are subject to change and are not exhaustive, but they should give you a good idea of how the configuration is set up and how to use it. - -### General Keybindings - -| \\ | Open a vertical split. | -| / | Open a horizontal split. | -| | Compile the current file. | -| | Inspect the current file. | -| Tab | Move to the next buffer. | -| | Move to the previous buffer. | -| / | Search for text. | -| | Save the current file (works in various modes). | -| w | Save the current file. | -| q | Quit NeoVim. | -| Q | Quit all open buffers in NeoVim. | -| h | Clear highlighting. | -| | Navigate to the previous buffer. | -| g | Access Git functionalities. | -| l | Access LSP functionalities. | -| s | Manage sessions. | -| f | Fold code. | -| g | Go to specific line or location. | -| s | Search for text. | - -### Buffer Management - - | Change to buffers 1 through 9. | - | Move to the next buffer. | - | Move to the previous buffer. | - | Move buffer to the right. | - | Move buffer to the left. | -d or | Close the current buffer. | - -### Session Management - -| ss | Restore a saved session. | -| sl | Restore the last saved session. -| sd | Don't save the current session. - -### NeoTree -| e | Open NeoTree in the current window. | -| E | Open NeoTree in a floating window. | - -### Telescope - -| gd | Go to definition. | -| gr | Go to references. | -| gi | Go to implementations. | -| go | Open a recently changed file. | -| gb | Checkout a Git branch. | -| gc | Checkout a Git commit. | -| f | Find files. | -| F | Find text. | -| b | Find buffers. | - -### Other Keybindings - -| | Toggle the terminal. | -| | Open the dashboard. | -| m | Zoom the current window. | -| r | Open the nvim-forge.core configuration file. | -| P | Preview the current Markdown file. | - - +### General Keybindings + +> [!] Note: +> +> - means press both keys at the same time +> → means first the key on the left then the key on the right + +### Basic Navigation and Editing + +| Keys | Mode | Description | +| --------------------------------- | ------------- | --------------------------- | +| j/k | Normal/Visual | _Better_ Up/Down | +| / | Normal | Search | +| g, | Normal | Go to the newest change | +| g; | Normal | Go to last change | +| i | Normal | _Better_ Insert | +| , → w | Normal | Save | +| Alt + Enter | Normal | List suggested code actions | + +### Text Manipulation + +| Keys | Mode | Description | +| ---------------------------------- | --------------- | ---------------------------------- | +| Ctrl + k | Normal | Move line up | +| Ctrl + j | Normal | Move line down | +| Ctrl + k | Visual | Move line up visual | +| Ctrl + j | Visual | Move line down visual | +| < | Visual | Unindent lines in visual selection | +| > | Visual | Indent lines in visual selection | +| p | Visual | Paste without yanking | +| p | Select(x) | Paste without yanking | +| c | Normal/Visual | Change without yanking | +| C | Normal | Change line without yanking | +| Space + Up | Normal | Add blank line below | +| Space + Down | Normal | Add blank line below | +| Ctrl + , | Insert | Add comma after character | +| Ctrl + b | Insert | Add curly with comma {}, | +| i + q | Operator/Visual | Inner Single Quotes | +| i + Q | Operator/Visual | Inner Double Quotes | +| a + q | Operator/Visual | Around Single Quotes | +| a + Q | Operator/Visual | Around Double Quotes | +| a + ' | Operator/Visual | Around Single Quotes | +| a + " | Operator/Visual | Around Double Quotes | +| i + r | Operator/Visual | Inner Brackets | +| a + r | Operator/Visual | Inner Brackets | + +### Buffer Management + +| Keys | Mode | Description | +| -------------------------------------------------- | ------ | -------------------- | +| , → b → d | Normal | Delete Buffer | +| Leader → f → n | Normal | New File | +| Shift + Left | Normal | Buffer Previous | +| Shift + Right | Normal | Buffer Next | +| Space → b → p | Normal | Pin Buffer | +| Space → b → k | Normal | Pick Buffer | +| Space → b → o | Normal | Close Other Buffers | +| Space → b → Left | Normal | Move Buffer to Left | +| Space → b → Right | Normal | Move Buffer to Right | +| Space → b → 1 | Normal | Go to Buffer 1 | +| Space → b → 2 | Normal | Go to Buffer 2 | +| Space → b → 3 | Normal | Go to Buffer 3 | +| Space → b → 4 | Normal | Go to Buffer 4 | +| Space → b → 5 | Normal | Go to Buffer 5 | +| Space → b → 6 | Normal | Go to Buffer 6 | +| Space → b → 7 | Normal | Go to Buffer 7 | +| Space → b → 8 | Normal | Go to Buffer 8 | +| Space → b → 9 | Normal | Go to Buffer 9 | + +### Window Management + +| Keys | Mode | Description | +| ------------------------------------- | ------ | ----------------------------------- | +| Space → \\ | Normal | Split Window Vertically | +| Space → / | Normal | Split Window Vertically | +| Space → h/l/k/j | Normal | Move split panes Left/Right/Up/Down | +| Space → m | Normal | Equalize split panes | +| Alt + Up | Normal | Resize pane up | +| Alt + Down | Normal | Resize pane down | +| Alt + Left | Normal | Resize pane left | +| Alt + Right | Normal | Resize pane right | + +### Search and Replace + +| Keys | Mode | Description | +| --------------------------- | ------ | ---------------------------------------- | +| , → R | Normal | Search and Replace the word under cursor | +| , → r | Normal | Search and replace in visual selection | + +### Selection and Deletion + +| Keys | Mode | Description | +| --------------------------------- | ------ | ----------------------------------- | +| Control + a | Normal | Select All | +| d + D | Normal | Delete current line without yanking | +| d + d | Normal | Yank non-empty lines | + +### Insert Mode + +| Keys | Mode | Description | +| --------------------------------- | ------ | ------------------------------------- | +| Escape | Insert | Exit Insert Mode | +| Control + l | Insert | Correct Word | +| Alt + i | Insert | Jump to Beginn of Line in insert mode | +| Alt + a | Insert | Jump to End of Line in insert mode | +| Ctrl + b | Insert | Add curly with comma {}, | + +### Editor Functionality + +| Keys | Mode | Description | +| ----------------------------------------------- | ------------- | ----------------------------------- | +| Escape | Insert/Normal | Escape and clear highlighted search | +| z → . | Normal | 󰓆 Fix Spelling | +| z → = | Normal | Spelling suggestions | +| Leader → m → m | Normal | File Changes (Messages) | +| Leader → c → t | Normal | Toggle TS Context | + +### Plugin Management (Lazy) + +| Keys | Mode | Description | +| ----------------------------------------------- | ------ | ------------------ | +| Leader → l → a | Normal | Open Lazy | +| Leader → l → c | Normal | Check Lazy Plugins | +| Leader → l → s | Normal | Sync Lazy Plugins | + +### Debugging + +| Keys | Mode | Description | +| -------------------------------------------------------------- | ------ | -------------------------- | +| Leader → d → B | Normal | Add Conditional Breakpoint | +| Leader → d → c | Normal | Dap Continue | +| Leader → d → s → i | Normal | Dap Step Into | +| Leader → d → s → o | Normal | Dap Step Over | +| Leader → d → s → t | Normal | Dap Step Out | +| Leader → d → t | Normal | Dap Terminate | +| Leader → d → l | Normal | Dap Show Log | +| Leader → d → r | Normal | Dap Toggle Repl | + +### Diff View + +| Keys | Mode | Description | +| ----------------------------------------------- | ------ | --------------- | +| Leader → d → v | Normal | Diffview Toggle | + +### Noice + +| Keys | Mode | Description | +| ---------------------------------------------- | ------ | ------------------- | +| Space → n → n | Normal | Noice Messages | +| Space → n → a | Normal | Noice All Messages | +| Space → n → l | Normal | Noice Last | +| Space → n → t | Normal | Noice Telescope | +| Space → n → e | Normal | Noice Errors | +| Space → n → s | Normal | Noice Notifications | + +### Terminal Bindings + +| Keys | Mode | Description | +| ------------------------------ | -------- | ------------------ | +| Escape | Terminal | Exit Terminal Mode | +| k → j | Terminal | Exit Terminal Mode | +| Ctrl + h | Terminal | Window Left | +| Ctrl + j | Terminal | Window Down | +| Ctrl + k | Terminal | Window Up | +| Ctrl + l | Terminal | Window Right | +| Ctrl + w | Terminal | Window | + +### Java Development Tools + +| Keys | Mode | Description | +| ----------------------------------------------- | ------------- | ------------------- | +| Alt + o | Normal | Organize Imports | +| c → r → v | Normal/Visual | Extract Variable | +| c → r → c | Normal/Visual | Extract Constant | +| c → r → m | Visual | Extract Method | +| Leader → d → f | Normal | Test Class | +| Leader → d → n | Normal | Test Nearest Method | + +### LuaSnip + +| Keys | Mode | Description | +| ------------------------------------------------- | ------------- | ----------- | +| Ctrl + i | Insert/Select | | +| Ctrl + l | Insert/Select | | +| Ctrl + h | Insert/Select | | +| Ctrl + Shift + o | Insert/Select | | +| Ctrl + Shift + a | Insert/Select | | + +### Nvim-Toggler + +| Keys | Mode | Description | +| -------------------------------- | ------------- | -------------- | +| Leader → w | Normal/Visual | Toggle a Value | + +### Nvim-Tree + +| Keys | Mode | Description | +| ------------------------------ | ------ | --------------------- | +| Ctrl + t | Normal | Up Change Directory | +| Ctrl + d | Normal | Change Root Directory | +| ? | Normal | Help | + +### LSP (Language Server Protocol) + +| Keys | Mode | Description | +| --------------------------------------------------------- | ------------- | ---------------------------- | +| Space → d | Normal | Open Diagnostic Window | +| Space → Left | Normal | | +| Space → Right | Normal | | +| Space → q | Normal | Send Diagnostic to Locallist | +| K | Normal | Hover | +| g → r → a | Normal/Visual | LSP Code Action | +| Alt + Enter | Normal/Visual | LSP Code Action | +| g → r → n | Normal | LSP Rename | +| g → r → r | Normal | LSP References | +| g → r → d | Normal | LSP Go to Definition | +| g → r → D | Normal | LSP Go to Declaration | +| g → r → i | Normal | LSP Go to Implementation | +| g → r → f | Normal | | +| g → r → k | Normal | LSP Signature Help | +| g → r → s | Normal | LSP Document Symbols | +| g → r → t | Normal | LSP Type Definition | +| g → r → w → a | Normal | LSP Add Workspace Folder | +| g → r → w → r | Normal | LSP Remove Workspace Folder | +| g → r → w → l | Normal | List Workplace Folder | +| Space → i → h | Normal | Inlay Hints | + +### Treesitter + +| Keys | Mode | Description | +| ------------ | --------------- | ---------------- | +| m | Visual/Operator | Treesitter Nodes | ## Inspiration @@ -261,5 +420,8 @@ The following projects were instrumental in the crafting of this environment - [dragove's nvim](https://github.com/dragove/nvim) - [Dharmx's Nvim](https://github.com/dharmx/nvim) - [loctvl842's nvim'](https://github.com/loctvl842/nvim) +- **... and many, many more!** + +``` ``` diff --git a/.github/workflows/codeberg_mirror.yml b/.github/workflows/codeberg_mirror.yml new file mode 100644 index 0000000..96fbc0c --- /dev/null +++ b/.github/workflows/codeberg_mirror.yml @@ -0,0 +1,16 @@ +# Pushes the contents of the repo to Codeberg repo for backup/redundancy +name: Mirror Repository to Codeberg +on: + workflow_dispatch: # Run workflow via GitHub website + schedule: + - cron: '30 3 * * *' # Run workflow automatically at 03:30 daily +jobs: + codeberg: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: { fetch-depth: 0 } + - uses: pixta-dev/repository-mirroring-action@v1 + with: + target_repo_url: git@codeberg.org:ThomasHighbaugh/nvim-forge.git + ssh_private_key: ${{ secrets.CODEBERG_SSH }} diff --git a/README.md b/README.md new file mode 120000 index 0000000..3a782ce --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +.github/README.md \ No newline at end of file diff --git a/lazy-lock.json b/lazy-lock.json index 9184ff4..eb8b2b3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -25,59 +25,61 @@ "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dressing.nvim": { "branch": "master", "commit": "56ef6a969a4990d938c5fed40c370f65e125fc97" }, "easytables.nvim": { "branch": "master", "commit": "ae57fdaad25a5f9ac2773ebdb8782c7bbc7d8932" }, - "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, + "flash.nvim": { "branch": "main", "commit": "f899265876ecdcf7352dbc9f0adf87068cedefbb" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "gitsigns.nvim": { "branch": "main", "commit": "d8918f06624dd53b9a82bd0e29c31bcfd541b40d" }, + "gitsigns.nvim": { "branch": "main", "commit": "4baa13519c2168cc9a7890a3580c50226ed018fb" }, "glance.nvim": { "branch": "master", "commit": "1a08824835d7582457b67acbe23ca33487912a5e" }, "glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" }, "image_preview.nvim": { "branch": "main", "commit": "3f3f46210ba13bf82b1eb750b2d6d90eb211ee24" }, "inc-rename.nvim": { "branch": "main", "commit": "f9b9e5b9a75074810f40881b7e254b5bbeaf122e" }, "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" }, - "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, + "lazy.nvim": { "branch": "main", "commit": "f15a93907ddad3d9139aea465ae18336d87f5ce6" }, "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" }, "llm.nvim": { "branch": "main", "commit": "ce69731ba3f8d3ea8bc4c8f58c74c2f9ea0b33de" }, - "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, + "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, "luvit-meta": { "branch": "main", "commit": "1df30b60b1b4aecfebc785aa98943db6c6989716" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "markdown-table-mode.nvim": { "branch": "main", "commit": "870d0449c1c78c673faa9637a63036f9537b4caa" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "e942edf5c85b6a2ab74059ea566cac5b3e1514a4" }, + "markdown-table-mode.nvim": { "branch": "main", "commit": "fe207ea7cef615ccaf2c0f1257c58ffa0a50a9f5" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.align": { "branch": "main", "commit": "e715137aece7d05734403d793b8b6b64486bc812" }, - "mini.indentscope": { "branch": "main", "commit": "613df2830d7faeae7483ba2e736683154b95921e" }, - "mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" }, + "mini.align": { "branch": "main", "commit": "3bdf6f0b91b31db5300a7b04f53f296a7fb150c1" }, + "mini.indentscope": { "branch": "main", "commit": "8ce41a77eed7f4121c83c67fda5e2e86af999e6d" }, + "mini.surround": { "branch": "main", "commit": "f40be56134835421061bf32c3702de9a29fb789c" }, "monokai-pro.nvim": { "branch": "master", "commit": "6c15e36834a624a32f46c6db8f9fc063995b24b6" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "5d172e8315444dbc32867d1c7b04d8e7e68ec4e1" }, "neogit": { "branch": "master", "commit": "63124cf520ff24d09deb3b850e053908ab0fc66a" }, - "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" }, + "noice.nvim": { "branch": "main", "commit": "dbfc5fbab19ff1c3e29a3268ffa5eda4c09c72ce" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "nvim-alt-substitute": { "branch": "main", "commit": "f0e6ef3a656187108d695a0115c09eda62474971" }, "nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" }, "nvim-cmp": { "branch": "main", "commit": "12509903a5723a876abd65953109f926f4634c30" }, - "nvim-dap": { "branch": "master", "commit": "1c96e487dd4180edc5a3c075ea1f03b6b751ef4f" }, + "nvim-comment-frame": { "branch": "main", "commit": "3dbdfc89c5d1f7e00ea824e4ef6c8b746cb277a5" }, + "nvim-dap": { "branch": "master", "commit": "52302f02fea3a490e55475de52fa4deb8af2eb11" }, "nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" }, "nvim-devdocs": { "branch": "master", "commit": "1ab982d3e069d191d9157b897c8b70cf48b7f77a" }, "nvim-highlight-colors": { "branch": "main", "commit": "68a4df620cf58e2c7336e53738e8cf3a522ad694" }, - "nvim-jdtls": { "branch": "master", "commit": "3efcd0700a293efea9dada58f79c32a64850eb24" }, - "nvim-lint": { "branch": "master", "commit": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87" }, - "nvim-lspconfig": { "branch": "master", "commit": "b4d65bce97795438ab6e1974b3672c17a4865e3c" }, + "nvim-jdtls": { "branch": "master", "commit": "3cdd09f336ab7169476b936c0825213d86d32e41" }, + "nvim-lint": { "branch": "master", "commit": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8" }, + "nvim-lspconfig": { "branch": "master", "commit": "5dca9e1480ebe39f3f96f98a8196f8ee18fad207" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" }, "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" }, "nvim-toggler": { "branch": "main", "commit": "467808600882fd6c9e33b9dbc4889b1b80cfd917" }, "nvim-treehopper": { "branch": "master", "commit": "e87002968983ed23836dfad53bcf023e609db42d" }, - "nvim-treesitter": { "branch": "master", "commit": "f3d7c0dafcbc86c4d63f765649c884a03bc1360a" }, - "nvim-treesitter-context": { "branch": "master", "commit": "bece284c5322ddf6946fa4bdc383a2bc033269d7" }, + "nvim-treesitter": { "branch": "master", "commit": "3973f53d7a8c4b87151dc3fd0e3d654aaa036c31" }, + "nvim-treesitter-context": { "branch": "master", "commit": "03f382ef224c27a8508cdab2d0b463dcb8ca12a6" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, - "nvim-web-devicons": { "branch": "master", "commit": "37334adf4517fecfd97c0b44e1d4718e377e9e52" }, - "oil.nvim": { "branch": "master", "commit": "a3fc6623fa9a3c49ed94b5dbe9f181fbd2e93e64" }, + "nvim-web-devicons": { "branch": "master", "commit": "402377242b04be3f4f0f3720bd952df86e946c30" }, + "oil.nvim": { "branch": "master", "commit": "add50252b5e9147c0a09d36480d418c7e2737472" }, "ollama.nvim": { "branch": "main", "commit": "45e58779fecde7ac5b8f62800bbe7180d4b48507" }, - "outline.nvim": { "branch": "main", "commit": "d5c29ee3ff3b7d1bdd454b37698316e67808c36e" }, + "outline.nvim": { "branch": "main", "commit": "f01eae624e6170656b6fadd6d7b8717636078bd6" }, "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "85b80abaa09cbbc039e3095b2f515b3cf8cadd11" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "cf0da2516b0684596b09c51dbc93c609cdc2f455" }, + "rest.nvim": { "branch": "main", "commit": "62606c3599bd304227457d6e20580965939b191e" }, "snipe.nvim": { "branch": "main", "commit": "0d0a482ac713370196e4fc0025d5aaac5030104d" }, "sort.nvim": { "branch": "main", "commit": "c789da6968337d2a61104a929880b5f144e02855" }, "statuscol.nvim": { "branch": "main", "commit": "a2a0e3ed55ba0f636ce0b2ccf61bca4050edd288" }, @@ -87,14 +89,14 @@ "telescope-heading.nvim": { "branch": "main", "commit": "e85c0f69cb64048f56e76548dcb2f10277576df9" }, "telescope-import.nvim": { "branch": "main", "commit": "6fd69447679a99b463025e7f2f787e8b185dd740" }, "telescope-symbols.nvim": { "branch": "master", "commit": "a6d0127a53d39b9fc2af75bd169d288166118aec" }, - "telescope-undo.nvim": { "branch": "main", "commit": "2971cc9f193ec09e0c5de3563f99cbea16b63f10" }, + "telescope-undo.nvim": { "branch": "main", "commit": "928d0c2dc9606e01e2cc547196f48d2eaecf58e5" }, "telescope-zoxide": { "branch": "main", "commit": "54bfe630bad08dc9891ec78c7cf8db38dd725c97" }, "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, - "trouble.nvim": { "branch": "main", "commit": "50481f414bd3c1a40122c1d759d7e424d5fafe84" }, + "trouble.nvim": { "branch": "main", "commit": "6f380b8826fb819c752c8fd7daaee9ef96d4c689" }, "ts-node-action": { "branch": "master", "commit": "bfaa787cc85d753af3c19245b4142ed727a534b5" }, "wezterm-types": { "branch": "main", "commit": "1518752906ba3fac0060d9efab6e4d3ec15d4b5a" }, - "which-key.nvim": { "branch": "main", "commit": "6cebd86917df559a88de0f806b2989799c6e6423" }, + "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" }, "yanky.nvim": { "branch": "main", "commit": "d2696b30e389dced94d5acab728f524a25f308d2" } } diff --git a/lua/code_action_utils.lua b/lua/code_action_utils.lua index 5fbf8e7..555ce01 100644 --- a/lua/code_action_utils.lua +++ b/lua/code_action_utils.lua @@ -7,7 +7,9 @@ function M.code_action_listener() local context = { diagnostics = vim.lsp.diagnostic.get_line_diagnostics() } local params = lsp_util.make_range_params() params.context = context - vim.lsp.buf_request(0, 'textDocument/codeAction', params, function(err, result, ctx, config) end) + -- Produces the most annoying error preventing one from working on lines 1-8 + -- need to either replace with some plugin or turn off the message + -- vim.lsp.buf_request(0, 'textDocument/codeAction', params, function(err, result, ctx, config) end) end return M diff --git a/lua/core/keymaps.lua b/lua/core/keymaps.lua index 7f46554..501055a 100644 --- a/lua/core/keymaps.lua +++ b/lua/core/keymaps.lua @@ -8,6 +8,13 @@ local Utils = require('core.utils') -- Exit from insert mode vim.keymap.set('i', 'kj', '', { desc = 'Exit insert mode' }) +-- Save +vim.keymap.set('n', 'w', 'w!', { desc = 'Save' }) + +-- Create Splits +vim.keymap.set('n', '\\', ':vsplit', { desc = 'Split Window Vertically' }) +vim.keymap.set('n', '/', ':split', { desc = 'Split Window Horizontally' }) + -- Better up/down vim.keymap.set({ 'n', 'x' }, 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true }) vim.keymap.set({ 'n', 'x' }, 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true }) @@ -26,10 +33,7 @@ vim.keymap.set( vim.keymap.set('x', 'r', [[:s/\%V]], { desc = 'Search and replace in visual selection' }) -- Select all -vim.keymap.set('n', '', 'ggG', { desc = 'Select all' }) - --- norm! command -vim.keymap.set('x', 'n', [[:norm! ]], { desc = 'norm!' }) +vim.keymap.set({ 'n', 'x' }, '', 'ggG', { desc = 'Select all' }) -- For correcting a word in insert mode vim.keymap.set('i', '', 'u[s1z=`]au') @@ -37,11 +41,13 @@ vim.keymap.set('i', '', 'u[s1z=`]au') -- Buffers vim.keymap.set('n', 'bd', 'bd', { desc = 'Delete Buffer' }) --- Move to window (split) using hlkj keys -vim.keymap.set('n', 'h', 'h', { desc = 'Split Left' }) -vim.keymap.set('n', 'l', 'l', { desc = 'Split Right' }) -vim.keymap.set('n', 'k', 'k', { desc = 'Split Up' }) -vim.keymap.set('n', 'j', 'j', { desc = 'Split Down' }) +-- Move to split panes using hlkj keys +vim.keymap.set('n', 'h', 'h', { desc = 'Move Split Pane Left' }) +vim.keymap.set('n', 'l', 'l', { desc = 'Move Split Pane Right' }) +vim.keymap.set('n', 'k', 'k', { desc = 'Move Split Pane Up' }) +vim.keymap.set('n', 'j', 'j', { desc = 'Move Split Pane Down' }) + +-- Equalize split panes vim.keymap.set('n', 'm', function() Utils.max_or_equal() end, { desc = 'Max or Equal Split' }) @@ -74,7 +80,7 @@ vim.keymap.set({ 'n', 'v' }, 'c', '"_c') vim.keymap.set('n', 'C', '"_C') -- vim.keymap.set('n', 'x', '"_x') --- Jump to BoL and EoL without living instert mode +-- Jump to BoL and EoL without leaving insert mode vim.keymap.set('i', '', 'I', { desc = 'Jump to Beginn of Line in insert mode' }) vim.keymap.set('i', '', 'A', { desc = 'Jump to End of Line in insert mode' }) @@ -92,24 +98,9 @@ vim.keymap.set({ 'o', 'x' }, 'a"', '2i"', { desc = 'Around Double Quotes' }) vim.keymap.set({ 'o', 'x' }, 'ir', 'i[', { desc = 'Inner Brackets' }) vim.keymap.set({ 'o', 'x' }, 'ar', 'a[', { desc = 'Inner Brackets' }) --- Add blank line without leaving normal mode -vim.keymap.set( - 'n', - '', - "call append(line('.') - 1, repeat([''], v:count1))", - { desc = 'Add blank line below' } -) -vim.keymap.set( - 'n', - '', - "call append(line('.'), repeat([''], v:count1))", - { desc = 'Add blank line below' } -) - --- Add komma +-- Add comma -- vim.keymap.set("n", ",,", [[f'a]]) -vim.keymap.set('i', '', 'la,', { silent = true, desc = 'Add komma after character' }) -vim.keymap.set('i', '', '{},hha', { silent = true, desc = 'Add curly with komma {},' }) +vim.keymap.set('i', '', '{},hha', { silent = true, desc = 'Add curly with comma {},' }) -- Go to last change vim.keymap.set('n', 'g,', 'g;', { desc = 'Go to newest change' }) @@ -145,7 +136,7 @@ vim.keymap.set('n', 'z=', function() end, { desc = 'Spelling suggestions' }) -- Messages -vim.keymap.set('n', 'mm', 'messages', { desc = 'Messages' }) +vim.keymap.set('n', 'mm', 'messages', { desc = 'File Changes (Messages)' }) -- Don't yank emty lines with dd vim.keymap.set('n', 'dd', function() @@ -177,7 +168,6 @@ vim.keymap.set('n', 'b7', 'BufferLineGoToBuffer 7', { desc = 'Go vim.keymap.set('n', 'b8', 'BufferLineGoToBuffer 8', { desc = 'Go to Buffer 8' }) vim.keymap.set('n', 'b9', 'BufferLineGoToBuffer 9', { desc = 'Go to Buffer 9' }) --- nvim-treehopper (vm or ym) vim.keymap.set('o', 'm', [[:lua require 'tsht'.nodes()]], { silent = true, remap = true }) vim.keymap.set('x', 'm', [[:lua require 'tsht'.nodes()]], { silent = true }) diff --git a/lua/plugins/aisync.lua b/lua/plugins/aisync.lua index 315fd4d..e9441db 100644 --- a/lua/plugins/aisync.lua +++ b/lua/plugins/aisync.lua @@ -9,8 +9,8 @@ return { build = ':Copilot auth', dependencies = { 'zbirenbaum/copilot-cmp' }, opts = { - suggestion = { enabled = false }, - panel = { enabled = false }, + suggestion = { enabled = true }, + panel = { enabled = true }, filetypes = { ['*'] = true, -- disable for all other filetypes and ignore default `filetypes` }, diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index b9dbc49..85d7c84 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -6,16 +6,18 @@ return { enabled = true, event = { 'InsertEnter', 'CmdlineEnter' }, dependencies = { - 'hrsh7th/cmp-nvim-lsp', - 'zbirenbaum/copilot-cmp', - 'hrsh7th/cmp-cmdline', 'hrsh7th/cmp-buffer', - 'saadparwaiz1/cmp_luasnip', - 'ray-x/cmp-treesitter', + 'hrsh7th/cmp-cmdline', + 'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-nvim-lsp-signature-help', 'hrsh7th/cmp-nvim-lua', 'hrsh7th/cmp-path', + 'mfussenegger/nvim-jdtls', 'octaltree/cmp-look', + 'ray-x/cmp-treesitter', + 'saadparwaiz1/cmp_luasnip', + 'zbirenbaum/copilot-cmp', + -- 'chrisgrieser/cmp_yanky', }, config = function() @@ -192,8 +194,8 @@ return { vim_item.abbr = trim(vim_item.abbr) -- Source vim_item.menu = ({ - codeium = 'Codeium', - copilot = 'Copilot', + codeium = '( Codeium )', + copilot = '( Copilot )', nvim_lsp = '( LSP )', nvim_lsp_signature_help = '( Signature )', luasnip = '( LuaSnip )', @@ -240,12 +242,6 @@ return { -- ╰───────────────────╯ cmp.setup.cmdline(':', { mapping = cmp.mapping.preset.cmdline(), - -- sources = cmp.config.sources({ - -- { name = 'path' }, - -- }, { - -- { name = 'cmdline' }, - -- }), - -- Same as above sources = cmp.config.sources({ { name = 'path', group_index = 1 }, { name = 'cmdline', group_index = 2 }, diff --git a/lua/plugins/comments.lua b/lua/plugins/comments.lua index fa76f4d..0305708 100644 --- a/lua/plugins/comments.lua +++ b/lua/plugins/comments.lua @@ -71,7 +71,7 @@ return { -- ╰─────────────────────────────────────────────────────────╯ { 's1n7ax/nvim-comment-frame', - enabled = false, + enabled = true, keys = { { 'cf', desc = 'Single Comment Frame' }, { 'cm', desc = 'Multi Comment Frame' }, diff --git a/lua/plugins/focus.lua b/lua/plugins/focus.lua deleted file mode 100644 index 41dd82e..0000000 --- a/lua/plugins/focus.lua +++ /dev/null @@ -1,62 +0,0 @@ -return { - 'nvim-focus/focus.nvim', - enabled = false, - version = false, - keys = { - { 'h', 'FocusSplitLeft', desc = 'Focus Split Left' }, - { 'j', 'FocusSplitDown', desc = 'Focus Split Down' }, - { 'k', 'FocusSplitUp', desc = 'Focus Split Up' }, - { 'l', 'FocusSplitRight', desc = 'Focus Split Right' }, - { 'm', 'FocusMaxOrEqual', desc = 'Maximaze or Equalises Split' }, - }, - init = function() - local ignore_filetypes = { 'neo-tree', 'Trouble' } - local ignore_buftypes = { 'nofile', 'prompt', 'popup' } - - local augroup = vim.api.nvim_create_augroup('FocusDisable', { clear = true }) - - vim.api.nvim_create_autocmd('WinEnter', { - group = augroup, - callback = function(_) - if vim.tbl_contains(ignore_buftypes, vim.bo.buftype) then - vim.w.focus_disable = true - else - vim.w.focus_disable = false - end - end, - desc = 'Disable focus autoresize for BufType', - }) - - vim.api.nvim_create_autocmd('FileType', { - group = augroup, - callback = function(_) - if vim.tbl_contains(ignore_filetypes, vim.bo.filetype) then - vim.w.focus_disable = true - else - vim.w.focus_disable = false - end - end, - desc = 'Disable focus autoresize for FileType', - }) - end, - opts = { - autoresize = { - enable = false, - }, - ui = { - number = false, - relativenumber = false, - hybridnumber = false, - signcolumn = false, - }, - -- excluded_filetypes = { - -- 'toggleterm', - -- 'qf', - -- 'help', - -- 'NvimTree', - -- 'Trouble', - -- 'tsplayground', - -- 'Outline', - -- }, - }, -} diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index 9bb9321..dd9df68 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -41,18 +41,6 @@ return { -- ╭──────────────────────────────────────────────────────────╮ -- │ UTILS │ -- ╰──────────────────────────────────────────────────────────╯ - { - 'smjonas/live-command.nvim', - enabled = false, - event = 'CmdlineEnter', - config = function() - require('live-command').setup({ - commands = { - Norm = { cmd = 'norm' }, - }, - }) - end, - }, { 'nguyenvukhang/nvim-toggler', keys = { @@ -62,7 +50,12 @@ return { require('nvim-toggler').setup({ remove_default_keybinds = true, }) - vim.keymap.set({ 'n', 'v' }, 'w', require('nvim-toggler').toggle, { desc = 'Toggle a Word' }) + vim.keymap.set( + { 'n', 'v' }, + 'w', + require('nvim-toggler').toggle, + { desc = 'Toggle a Boolean Value' } + ) end, }, { @@ -72,21 +65,6 @@ return { -- lazy-loading with `cmd =` does not work well with incremental preview event = 'CmdlineEnter', }, - { - 'jokajak/keyseer.nvim', - enabled = false, - version = false, - cmd = 'KeySeer', - opts = { - ui = { - winblend = 100, - border = 'rounded', - }, - keyboard = { - layout = 'qwerty', - }, - }, - }, { 'ellisonleao/glow.nvim', cmd = 'Glow', @@ -177,14 +155,6 @@ return { -- ╭─────────────────────────────────────────────────────────╮ -- │ Markdown Writing │ -- ╰─────────────────────────────────────────────────────────╯ - { - 'iamcco/markdown-preview.nvim', - cmd = { 'MarkdownPreviewToggle', 'MarkdownPreview', 'MarkdownPreviewStop' }, - ft = 'markdown', - build = function() - vim.fn['mkdp#util#install']() - end, - }, { 'Myzel394/easytables.nvim', ft = 'markdown', @@ -238,13 +208,4 @@ return { 'mfussenegger/nvim-dap', }, }, - - -- ╭──────────────────────────────────────────────────────────╮ - -- │ REST-HTML │ - -- ╰──────────────────────────────────────────────────────────╯ - { - 'diepm/vim-rest-console', - enabled = false, - ft = 'rest', - }, } diff --git a/lua/plugins/lsp/lsp-config.lua b/lua/plugins/lsp/lsp-config.lua index 6f341f7..903faea 100644 --- a/lua/plugins/lsp/lsp-config.lua +++ b/lua/plugins/lsp/lsp-config.lua @@ -104,6 +104,7 @@ return { -- Default lsp keymaps. Setting the keymaps again, only to change the description. vim.keymap.set('n', 'K', vim.lsp.buf.hover, bufopts('Hover')) vim.keymap.set({ 'n', 'v' }, 'gra', vim.lsp.buf.code_action, bufopts('LSP Code Action')) + vim.keymap.set({ 'n', 'v' }, '', vim.lsp.buf.code_action, bufopts('LSP Code Action')) vim.keymap.set('n', 'grn', vim.lsp.buf.rename, bufopts('LSP Rename')) vim.keymap.set('n', 'grr', vim.lsp.buf.references, bufopts('LSP References')) -- Custom lsp keymaps. diff --git a/lua/plugins/nvim-tree.lua b/lua/plugins/nvim-tree.lua deleted file mode 100644 index 6d42224..0000000 --- a/lua/plugins/nvim-tree.lua +++ /dev/null @@ -1,84 +0,0 @@ -return { - 'nvim-tree/nvim-tree.lua', - enabled = false, - version = '*', - lazy = false, - cmd = 'NvimTreeToggle', - keys = { - { 'e', 'NvimTreeToggle', desc = 'File Browser' }, - }, - dependencies = 'nvim-tree/nvim-web-devicons', - config = function() - -- Always open nvim-tree - -- local function open_nvim_tree() - -- require('nvim-tree.api').tree.open() - -- end - - local function my_on_attach(bufnr) - local api = require('nvim-tree.api') - - local function opts(desc) - return { desc = 'nvim-tree: ' .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true } - end - - -- default mappings - api.config.mappings.default_on_attach(bufnr) - - -- custom mappings - vim.keymap.set('n', '', api.tree.change_root_to_parent, opts('Up Change Directory')) - vim.keymap.set('n', '', api.tree.change_root_to_node, opts('Change Root Directory')) - vim.keymap.set('n', '?', api.tree.toggle_help, opts('Help')) - end - - require('nvim-tree').setup({ - on_attach = my_on_attach, - hijack_cursor = true, - view = { - centralize_selection = true, - side = 'right', - width = 45, - -- float = { - -- enable = false, - -- quit_on_focus_loss = true, - -- open_win_config = { - -- relative = 'editor', - -- border = 'rounded', - -- width = 40, - -- height = 30, - -- row = 1, - -- col = 1, - -- }, - -- }, - }, - renderer = { - highlight_git = true, - icons = { - git_placement = 'after', - show = { - folder_arrow = false, - }, - glyphs = { - folder = { - default = '', - open = '', - empty = '', - empty_open = '', - }, - }, - }, - }, - diagnostics = { - enable = true, - }, - modified = { - enable = true, - }, - actions = { - open_file = { - quit_on_open = true, - }, - }, - }) - -- open_nvim_tree() - end, -} diff --git a/lua/plugins/rest.lua b/lua/plugins/rest.lua index d6aa0d6..ea40785 100644 --- a/lua/plugins/rest.lua +++ b/lua/plugins/rest.lua @@ -1,6 +1,6 @@ return { 'rest-nvim/rest.nvim', - enabled = false, + enabled = true, keys = { { 'R', 'lua require("rest-nvim").run()', desc = 'Rest API' }, }, diff --git a/lua/plugins/ssr.lua b/lua/plugins/ssr.lua deleted file mode 100644 index 95850de..0000000 --- a/lua/plugins/ssr.lua +++ /dev/null @@ -1,16 +0,0 @@ -return { - { - 'cshuaimin/ssr.nvim', - enabled = false, - keys = { - { - 'r', - function() - require('ssr').open() - end, - mode = { 'n', 'x' }, - desc = 'Structural Replace', - }, - }, - }, -} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index 977fe53..637de78 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -58,7 +58,7 @@ return { highlight = { enable = true, }, - -- Buildin + -- Builtin incremental_selection = { enable = true, keymaps = { diff --git a/snippets/vscode/fennel.json b/snippets/vscode/fennel.json deleted file mode 100755 index 5b04e47..0000000 --- a/snippets/vscode/fennel.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "fn": { - "prefix": "fn", - "body": "fn name [])", - "description": "Create a function" - }, - "let": { - "prefix": "let", - "body": "let [])", - "description": "Create a variable" - }, - "while": { - "prefix": "while", - "body": "while (condition)\n())", - "description": "Create a while loop" - }, - "var": { - "prefix": "var", - "body": "var name value)", - "description": "Create a variable with var" - }, - "local": { - "prefix": "local", - "body": "local name value)", - "description": "Create a variable with local" - }, - "for": { - "prefix": "for", - "body": "for [i 1 10]\n())", - "description": "Create a while loop" - }, - "global": { - "prefix": "global", - "body": "global )", - "description": "Create a global" - }, - "require": { - "prefix": "require", - "body": "require :module)", - "description": "Require a module" - }, - "set": { - "prefix": "set", - "body": "set tb value)", - "description": "Set a value in a table" - } -} diff --git a/snippets/vscode/package-lock.json b/snippets/vscode/package-lock.json new file mode 100644 index 0000000..cea3499 --- /dev/null +++ b/snippets/vscode/package-lock.json @@ -0,0 +1,13 @@ +{ + "name": "snips", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "snips", + "engines": { + "vscode": "^1.11.0" + } + } + } +} diff --git a/snippets/vscode/package.json b/snippets/vscode/package.json index 8e9369a..ca5d0a8 100755 --- a/snippets/vscode/package.json +++ b/snippets/vscode/package.json @@ -29,14 +29,6 @@ "language": "cpp", "path": "./cpp.json" }, - { - "language": "cs", - "path": "./csharp.json" - }, - { - "language": "csharp", - "path": "./csharp.json" - }, { "language": "gitcommit", "path": "./gitcommit.json" @@ -49,30 +41,10 @@ "language": "ejs", "path": "./frameworks/ejs.json" }, - { - "language": "eruby", - "path": "./erb.json" - }, - { - "language": "elixir", - "path": "./elixir.json" - }, - { - "language": "eelixir", - "path": "./eelixir.json" - }, - { - "language": "fortran", - "path": "./fortran.json" - }, { "language": "glsl", "path": "./glsl.json" }, - { - "language": "liquid", - "path": "./liquid.json" - }, { "language": "lua", "path": "./lua.json" @@ -81,26 +53,6 @@ "language": "go", "path": "./go.json" }, - { - "language": "fennel", - "path": "./fennel.json" - }, - { - "language": "php", - "path": "./php.json" - }, - { - "language": "rescript", - "path": "./rescript.json" - }, - { - "language": "ruby", - "path": "./ruby.json" - }, - { - "language": "rails", - "path": "./frameworks/rails.json" - }, { "language": "rust", "path": "./rust.json" @@ -113,14 +65,6 @@ "language": "scala", "path": "./scala.json" }, - { - "language": "solidity", - "path": "./solidity.json" - }, - { - "language": "swift", - "path": "./swift.json" - }, { "language": "sql", "path": "./sql.json" @@ -265,26 +209,6 @@ "language": "python", "path": "./python/unittest.json" }, - { - "language": "django", - "path": "./frameworks/django/imports.json" - }, - { - "language": "django", - "path": "./frameworks/django/forms.json" - }, - { - "language": "django", - "path": "./frameworks/django/models.json" - }, - { - "language": "django", - "path": "./frameworks/django/views.json" - }, - { - "language": "django", - "path": "./frameworks/django/filetemplates.json" - }, { "language": "flutter", "path": "./frameworks/flutter.json" @@ -293,22 +217,6 @@ "language": "jekyll", "path": "./frameworks/jekyll.json" }, - { - "language": "cobol", - "path": "./cobol/vscode_cobol.json" - }, - { - "language": "cobol", - "path": "./cobol/vscode_cobol-compound.json" - }, - { - "language": "cobol", - "path": "./cobol/vscode_cobol_dir.json" - }, - { - "language": "cobol", - "path": "./cobol/vscode_cobol_jcl.json" - }, { "language": "kotlin", "path": "./kotlin.json" @@ -320,22 +228,6 @@ ], "path": "./latex/latex-snippets.json" }, - { - "language": "twig", - "path": "./frameworks/twig.json" - }, - { - "language": "r", - "path": "./r.json" - }, - { - "language": "rmd", - "path": "./r.json" - }, - { - "language": "rmd", - "path": "./rmarkdown.json" - }, { "language": "org", "path": "./org.json" @@ -344,10 +236,6 @@ "language": "norg", "path": "./norg.json" }, - { - "language": "mint", - "path": "./mint.json" - }, { "language": "gdscript", "path": "./gdscript.json"