merge

2026-03-15 17:58:06 +01:00
parent 3dcd700fe7 c80c65a9ce
commit 6648cff3a1
27 changed files with 327 additions and 1804 deletions
--- a/.bashrc
+++ b/.bashrc
@@ -126,6 +126,9 @@ fi
 #export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 #gpgconf --launch gpg-agent
 ### ripgrep
 export RIPGREP_CONFIG_PATH="$HOME/.ripgreprc"
 ### Passbook setup
 export PASSBOOK_GPG_PATH="/usr/bin/gpg"
 export PASSBOOK_ROOT_DIRECTORY="/home/wholteza/.password-store"
@@ -211,7 +214,6 @@ fi
 export PATH="$HOME/.local/bin:$PATH"
 export PATH=/home/$USER/.fnm:$PATH
 eval "$(fnm env --use-on-cd --version-file-strategy=recursive)"
--- a/.config/nvim/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.config/nvim/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,35 +0,0 @@
 ---
 name: Bug report
 about: Create a report to help us improve
 title: ''
 labels: ''
 assignees: ''
 ---
 <!-- Any bug report not following this template will be immediately closed. Thanks -->
 ## Before Reporting an Issue
 - I have read the kickstart.nvim README.md.
 - I have read the appropriate plugin's documentation.
 - I have searched that this issue has not been reported before.
 - [ ] **By checking this, I confirm that the above steps are completed. I understand leaving this unchecked will result in this report being closed immediately.**
 ## Describe the bug
 <!-- A clear and concise description of what the bug is. -->
 ## To Reproduce
 <!-- Steps to reproduce the behavior. -->
 1. ...
 ## Desktop
 <!-- please complete the following information. -->
 - OS:
 - Terminal:
 ## Neovim Version
 <!-- Output of running `:version` from inside of neovim. -->
 ```
 ```
--- a/.config/nvim/.github/pull_request_template.md
+++ b/.config/nvim/.github/pull_request_template.md
@@ -1,8 +0,0 @@
 ***************************************************************************
 **NOTE**
 Please verify that the `base repository` above has the intended destination!
 Github by default opens Pull Requests against the parent of a forked repository.
 If this is your personal fork and you didn't intend to open a PR for contribution
 to the original project then adjust the `base repository` accordingly.
 **************************************************************************
--- a/.config/nvim/.github/workflows/stylua.yml
+++ b/.config/nvim/.github/workflows/stylua.yml
@@ -1,21 +0,0 @@
 # Check Lua Formatting
 name: Check Lua Formatting
 on: pull_request_target
 jobs:
  stylua-check:
    if: github.repository == 'nvim-lua/kickstart.nvim'
    name: Stylua Check
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Code
        uses: actions/checkout@v2
        with:
          ref: ${{ github.event.pull_request.head.sha }}
      - name: Stylua Check
        uses: JohnnyMorganz/stylua-action@v3
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
          version: latest
          args: --check .
--- a/.config/nvim/.gitignore
+++ b/.config/nvim/.gitignore
@@ -1,7 +0,0 @@
 tags
 test.sh
 .luarc.json
 nvim
 spell/
 lazy-lock.json
--- a/.config/nvim/.stylua.toml
+++ b/.config/nvim/.stylua.toml
@@ -1,6 +0,0 @@
 column_width = 160
 line_endings = "Unix"
 indent_type = "Spaces"
 indent_width = 2
 quote_style = "AutoPreferSingle"
 call_parentheses = "None"
--- a/.config/nvim/LICENSE.md
+++ b/.config/nvim/LICENSE.md
@@ -1,19 +0,0 @@
 MIT License
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
--- a/.config/nvim/README.md
+++ b/.config/nvim/README.md
@@ -1,240 +0,0 @@
 # kickstart.nvim
 ## Introduction
 A starting point for Neovim that is:
 * Small
 * Single-file
 * Completely Documented
 **NOT** a Neovim distribution, but instead a starting point for your configuration.
 ## Installation
 ### Install Neovim
 Kickstart.nvim targets *only* the latest
 ['stable'](https://github.com/neovim/neovim/releases/tag/stable) and latest
 ['nightly'](https://github.com/neovim/neovim/releases/tag/nightly) of Neovim.
 If you are experiencing issues, please make sure you have the latest versions.
 ### Install External Dependencies
 External Requirements:
 - Basic utils: `git`, `make`, `unzip`, C Compiler (`gcc`)
 - [ripgrep](https://github.com/BurntSushi/ripgrep#installation)
 - Clipboard tool (xclip/xsel/win32yank or other depending on the platform)
 - A [Nerd Font](https://www.nerdfonts.com/): optional, provides various icons
  - if you have it set `vim.g.have_nerd_font` in `init.lua` to true
 - Emoji fonts (Ubuntu only, and only if you want emoji!) `sudo apt install fonts-noto-color-emoji`
 - Language Setup:
  - If you want to write Typescript, you need `npm`
  - If you want to write Golang, you will need `go`
  - etc.
 > [!NOTE]
 > See [Install Recipes](#Install-Recipes) for additional Windows and Linux specific notes
 > and quick install snippets
 ### Install Kickstart
 > [!NOTE]
 > [Backup](#FAQ) your previous configuration (if any exists)
 Neovim's configurations are located under the following paths, depending on your OS:
 | OS | PATH |
 | :- | :--- |
 | Linux, MacOS | `$XDG_CONFIG_HOME/nvim`, `~/.config/nvim` |
 | Windows (cmd)| `%localappdata%\nvim\` |
 | Windows (powershell)| `$env:LOCALAPPDATA\nvim\` |
 #### Recommended Step
 [Fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo) this repo
 so that you have your own copy that you can modify, then install by cloning the
 fork to your machine using one of the commands below, depending on your OS.
 > [!NOTE]
 > Your fork's URL will be something like this:
 > `https://github.com/<your_github_username>/kickstart.nvim.git`
 You likely want to remove `lazy-lock.json` from your fork's `.gitignore` file
 too - it's ignored in the kickstart repo to make maintenance easier, but it's
 [recommended to track it in version control](https://lazy.folke.io/usage/lockfile).
 #### Clone kickstart.nvim
 > [!NOTE]
 > If following the recommended step above (i.e., forking the repo), replace
 > `nvim-lua` with `<your_github_username>` in the commands below
 <details><summary> Linux and Mac </summary>
 ```sh
 git clone https://github.com/nvim-lua/kickstart.nvim.git "${XDG_CONFIG_HOME:-$HOME/.config}"/nvim
 ```
 </details>
 <details><summary> Windows </summary>
 If you're using `cmd.exe`:
 ```
 git clone https://github.com/nvim-lua/kickstart.nvim.git "%localappdata%\nvim"
 ```
 If you're using `powershell.exe`
 ```
 git clone https://github.com/nvim-lua/kickstart.nvim.git "${env:LOCALAPPDATA}\nvim"
 ```
 </details>
 ### Post Installation
 Start Neovim
 ```sh
 nvim
 ```
 That's it! Lazy will install all the plugins you have. Use `:Lazy` to view
 the current plugin status. Hit `q` to close the window.
 #### Read The Friendly Documentation
 Read through the `init.lua` file in your configuration folder for more
 information about extending and exploring Neovim. That also includes
 examples of adding popularly requested plugins.
 > [!NOTE]
 > For more information about a particular plugin check its repository's documentation.
 ### Getting Started
 [The Only Video You Need to Get Started with Neovim](https://youtu.be/m8C0Cq9Uv9o)
 ### FAQ
 * What should I do if I already have a pre-existing Neovim configuration?
  * You should back it up and then delete all associated files.
  * This includes your existing init.lua and the Neovim files in `~/.local`
    which can be deleted with `rm -rf ~/.local/share/nvim/`
 * Can I keep my existing configuration in parallel to kickstart?
  * Yes! You can use [NVIM_APPNAME](https://neovim.io/doc/user/starting.html#%24NVIM_APPNAME)`=nvim-NAME`
    to maintain multiple configurations. For example, you can install the kickstart
    configuration in `~/.config/nvim-kickstart` and create an alias:
    ```
    alias nvim-kickstart='NVIM_APPNAME="nvim-kickstart" nvim'
    ```
    When you run Neovim using `nvim-kickstart` alias it will use the alternative
    config directory and the matching local directory
    `~/.local/share/nvim-kickstart`. You can apply this approach to any Neovim
    distribution that you would like to try out.
 * What if I want to "uninstall" this configuration:
  * See [lazy.nvim uninstall](https://lazy.folke.io/usage#-uninstalling) information
 * Why is the kickstart `init.lua` a single file? Wouldn't it make sense to split it into multiple files?
  * The main purpose of kickstart is to serve as a teaching tool and a reference
    configuration that someone can easily use to `git clone` as a basis for their own.
    As you progress in learning Neovim and Lua, you might consider splitting `init.lua`
    into smaller parts. A fork of kickstart that does this while maintaining the
    same functionality is available here:
    * [kickstart-modular.nvim](https://github.com/dam9000/kickstart-modular.nvim)
  * Discussions on this topic can be found here:
    * [Restructure the configuration](https://github.com/nvim-lua/kickstart.nvim/issues/218)
    * [Reorganize init.lua into a multi-file setup](https://github.com/nvim-lua/kickstart.nvim/pull/473)
 ### Install Recipes
 Below you can find OS specific install instructions for Neovim and dependencies.
 After installing all the dependencies continue with the [Install Kickstart](#Install-Kickstart) step.
 #### Windows Installation
 <details><summary>Windows with Microsoft C++ Build Tools and CMake</summary>
 Installation may require installing build tools and updating the run command for `telescope-fzf-native`
 See `telescope-fzf-native` documentation for [more details](https://github.com/nvim-telescope/telescope-fzf-native.nvim#installation)
 This requires:
 - Install CMake and the Microsoft C++ Build Tools on Windows
 ```lua
 {'nvim-telescope/telescope-fzf-native.nvim', build = 'cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build' }
 ```
 </details>
 <details><summary>Windows with gcc/make using chocolatey</summary>
 Alternatively, one can install gcc and make which don't require changing the config,
 the easiest way is to use choco:
 1. install [chocolatey](https://chocolatey.org/install)
 either follow the instructions on the page or use winget,
 run in cmd as **admin**:
 ```
 winget install --accept-source-agreements chocolatey.chocolatey
 ```
 2. install all requirements using choco, exit the previous cmd and
 open a new one so that choco path is set, and run in cmd as **admin**:
 ```
 choco install -y neovim git ripgrep wget fd unzip gzip mingw make
 ```
 </details>
 <details><summary>WSL (Windows Subsystem for Linux)</summary>
 ```
 wsl --install
 wsl
 sudo add-apt-repository ppa:neovim-ppa/unstable -y
 sudo apt update
 sudo apt install make gcc ripgrep unzip git xclip neovim
 ```
 </details>
 #### Linux Install
 <details><summary>Ubuntu Install Steps</summary>
 ```
 sudo add-apt-repository ppa:neovim-ppa/unstable -y
 sudo apt update
 sudo apt install make gcc ripgrep unzip git xclip neovim
 ```
 </details>
 <details><summary>Debian Install Steps</summary>
 ```
 sudo apt update
 sudo apt install make gcc ripgrep unzip git xclip curl
 # Now we install nvim
 curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux-x86_64.tar.gz
 sudo rm -rf /opt/nvim-linux-x86_64
 sudo mkdir -p /opt/nvim-linux-x86_64
 sudo chmod a+rX /opt/nvim-linux-x86_64
 sudo tar -C /opt -xzf nvim-linux-x86_64.tar.gz
 # make it available in /usr/local/bin, distro installs to /usr/bin
 sudo ln -sf /opt/nvim-linux-x86_64/bin/nvim /usr/local/bin/
 ```
 </details>
 <details><summary>Fedora Install Steps</summary>
 ```
 sudo dnf install -y gcc make git ripgrep fd-find unzip neovim
 ```
 </details>
 <details><summary>Arch Install Steps</summary>
 ```
 sudo pacman -S --noconfirm --needed gcc make git ripgrep fd unzip neovim
 ```
 </details>
--- a/.config/nvim/doc/kickstart.txt
+++ b/.config/nvim/doc/kickstart.txt
@@ -1,24 +0,0 @@
 ================================================================================
 INTRODUCTION                                                  *kickstart.nvim*
 Kickstart.nvim is a project to help you get started on your neovim journey.
                                                            *kickstart-is-not*
 It is not:
 - Complete framework for every plugin under the sun
 - Place to add every plugin that could ever be useful
                                                                *kickstart-is*
 It is:
 - Somewhere that has a good start for the most common "IDE" type features:
    - autocompletion
    - goto-definition
    - find references
    - fuzzy finding
    - and hinting at what more can be done :)
 - A place to _kickstart_ your journey.
    - You should fork this project and use/modify it so that it matches your
      style and preferences. If you don't want to do that, there are probably
      other projects that would fit much better for you (and that's great!)!
 vim:tw=78:ts=8:ft=help:norl:
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -1,36 +0,0 @@
 {
  "LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
  "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" },
  "catppuccin": { "branch": "main", "commit": "f19cab18ec4dc86d415512c7a572863b2adbcc18" },
  "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" },
  "copilot.lua": { "branch": "master", "commit": "f8fa941f1152ad89c73f8f2ae6e570869bf62b28" },
  "fidget.nvim": { "branch": "main", "commit": "b45d21d33d61ed9295308eb6571c0a5f0f7f3765" },
  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
  "gitsigns.nvim": { "branch": "main", "commit": "f780609807eca1f783a36a8a31c30a48fbe150c5" },
  "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
  "lazydev.nvim": { "branch": "main", "commit": "258d2a5ef4a3e3d6d9ba9da72c9725c53e9afcbd" },
  "mason-lspconfig.nvim": { "branch": "main", "commit": "a1067cf84b4ff81b66d2bf4d01f4cbdb5de40bd0" },
  "mason-nvim-dap.nvim": { "branch": "main", "commit": "86389a3dd687cfaa647b6f44731e492970034baa" },
  "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" },
  "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
  "mini.nvim": { "branch": "main", "commit": "bc34736e5b1d5561bc628f1cedd7c01f5ce5ee9f" },
  "neo-tree.nvim": { "branch": "main", "commit": "ed057048a281b418d5318dd5153f9486daa517a3" },
  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
  "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
  "nvim-dap": { "branch": "master", "commit": "7367cec8e8f7a0b1e4566af9a7ef5959d11206a7" },
  "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" },
  "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" },
  "nvim-lint": { "branch": "master", "commit": "0864f81c681e15d9bdc1156fe3a17bd07db5a3ed" },
  "nvim-lspconfig": { "branch": "master", "commit": "ef73a4f2a1ddf0439eb97b46de2aab265ddba1cd" },
  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
  "nvim-treesitter": { "branch": "main", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
  "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" },
  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
  "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
  "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
  "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
  "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
 }
--- a/.config/nvim/lua/custom/plugins/init.lua
+++ b/.config/nvim/lua/custom/plugins/init.lua
@@ -1,36 +0,0 @@
 -- You can add your own plugins here or in other files in this directory!
 --  I promise not to create any merge conflicts in this directory :)
 --
 -- See the kickstart.nvim README for more information
 return {
  -- Configure copilot
  {
    'zbirenbaum/copilot.lua',
    cmd = 'Copilot',
    build = ':Copilot auth',
    event = 'InsertEnter',
    config = function()
      require('copilot').setup {
        suggestion = { enabled = false },
        panel = { enabled = false },
        filetypes = {
          markdown = true,
          help = true,
        },
      }
      vim.api.nvim_create_autocmd('User', {
        pattern = 'BlinkCmpMenuOpen',
        callback = function()
          vim.b.copilot_suggestion_hidden = true
        end,
      })
      vim.api.nvim_create_autocmd('User', {
        pattern = 'BlinkCmpMenuClose',
        callback = function()
          vim.b.copilot_suggestion_hidden = false
        end,
      })
    end,
  },
 }
--- a/.config/nvim/lua/kickstart/health.lua
+++ b/.config/nvim/lua/kickstart/health.lua
@@ -1,52 +0,0 @@
 --[[
 --
 -- This file is not required for your own configuration,
 -- but helps people determine if their system is setup correctly.
 --
 --]]
 local check_version = function()
  local verstr = tostring(vim.version())
  if not vim.version.ge then
    vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
    return
  end
  if vim.version.ge(vim.version(), '0.10-dev') then
    vim.health.ok(string.format("Neovim version is: '%s'", verstr))
  else
    vim.health.error(string.format("Neovim out of date: '%s'. Upgrade to latest stable or nightly", verstr))
  end
 end
 local check_external_reqs = function()
  -- Basic utils: `git`, `make`, `unzip`
  for _, exe in ipairs { 'git', 'make', 'unzip', 'rg' } do
    local is_executable = vim.fn.executable(exe) == 1
    if is_executable then
      vim.health.ok(string.format("Found executable: '%s'", exe))
    else
      vim.health.warn(string.format("Could not find executable: '%s'", exe))
    end
  end
  return true
 end
 return {
  check = function()
    vim.health.start 'kickstart.nvim'
    vim.health.info [[NOTE: Not every warning is a 'must-fix' in `:checkhealth`
  Fix only warnings for plugins and languages you intend to use.
    Mason will give warnings for languages that are not installed.
    You do not need to install, unless you want to use those languages!]]
    local uv = vim.uv or vim.loop
    vim.health.info('System Information: ' .. vim.inspect(uv.os_uname()))
    check_version()
    check_external_reqs()
  end,
 }
--- a/.config/nvim/lua/kickstart/plugins/autopairs.lua
+++ b/.config/nvim/lua/kickstart/plugins/autopairs.lua
@@ -1,8 +0,0 @@
 -- autopairs
 -- https://github.com/windwp/nvim-autopairs
 return {
  'windwp/nvim-autopairs',
  event = 'InsertEnter',
  opts = {},
 }
--- a/.config/nvim/lua/kickstart/plugins/debug.lua
+++ b/.config/nvim/lua/kickstart/plugins/debug.lua
@@ -1,148 +0,0 @@
 -- debug.lua
 --
 -- Shows how to use the DAP plugin to debug your code.
 --
 -- Primarily focused on configuring the debugger for Go, but can
 -- be extended to other languages as well. That's why it's called
 -- kickstart.nvim and not kitchen-sink.nvim ;)
 return {
  -- NOTE: Yes, you can install new plugins here!
  'mfussenegger/nvim-dap',
  -- NOTE: And you can specify dependencies as well
  dependencies = {
    -- Creates a beautiful debugger UI
    'rcarriga/nvim-dap-ui',
    -- Required dependency for nvim-dap-ui
    'nvim-neotest/nvim-nio',
    -- Installs the debug adapters for you
    'williamboman/mason.nvim',
    'jay-babu/mason-nvim-dap.nvim',
    -- Add your own debuggers here
    'leoluz/nvim-dap-go',
  },
  keys = {
    -- Basic debugging keymaps, feel free to change to your liking!
    {
      '<F5>',
      function()
        require('dap').continue()
      end,
      desc = 'Debug: Start/Continue',
    },
    {
      '<F1>',
      function()
        require('dap').step_into()
      end,
      desc = 'Debug: Step Into',
    },
    {
      '<F2>',
      function()
        require('dap').step_over()
      end,
      desc = 'Debug: Step Over',
    },
    {
      '<F3>',
      function()
        require('dap').step_out()
      end,
      desc = 'Debug: Step Out',
    },
    {
      '<leader>b',
      function()
        require('dap').toggle_breakpoint()
      end,
      desc = 'Debug: Toggle Breakpoint',
    },
    {
      '<leader>B',
      function()
        require('dap').set_breakpoint(vim.fn.input 'Breakpoint condition: ')
      end,
      desc = 'Debug: Set Breakpoint',
    },
    -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
    {
      '<F7>',
      function()
        require('dapui').toggle()
      end,
      desc = 'Debug: See last session result.',
    },
  },
  config = function()
    local dap = require 'dap'
    local dapui = require 'dapui'
    require('mason-nvim-dap').setup {
      -- Makes a best effort to setup the various debuggers with
      -- reasonable debug configurations
      automatic_installation = true,
      -- You can provide additional configuration to the handlers,
      -- see mason-nvim-dap README for more information
      handlers = {},
      -- You'll need to check that you have the required things installed
      -- online, please don't ask me how to install them :)
      ensure_installed = {
        -- Update this to ensure that you have the debuggers for the langs you want
        'delve',
      },
    }
    -- Dap UI setup
    -- For more information, see |:help nvim-dap-ui|
    dapui.setup {
      -- Set icons to characters that are more likely to work in every terminal.
      --    Feel free to remove or use ones that you like more! :)
      --    Don't feel like these are good choices.
      icons = { expanded = '▾', collapsed = '▸', current_frame = '*' },
      controls = {
        icons = {
          pause = '⏸',
          play = '▶',
          step_into = '⏎',
          step_over = '⏭',
          step_out = '⏮',
          step_back = 'b',
          run_last = '▶▶',
          terminate = '⏹',
          disconnect = '⏏',
        },
      },
    }
    -- Change breakpoint icons
    -- vim.api.nvim_set_hl(0, 'DapBreak', { fg = '#e51400' })
    -- vim.api.nvim_set_hl(0, 'DapStop', { fg = '#ffcc00' })
    -- local breakpoint_icons = vim.g.have_nerd_font
    --     and { Breakpoint = '', BreakpointCondition = '', BreakpointRejected = '', LogPoint = '', Stopped = '' }
    --   or { Breakpoint = '●', BreakpointCondition = '⊜', BreakpointRejected = '⊘', LogPoint = '◆', Stopped = '⭔' }
    -- for type, icon in pairs(breakpoint_icons) do
    --   local tp = 'Dap' .. type
    --   local hl = (type == 'Stopped') and 'DapStop' or 'DapBreak'
    --   vim.fn.sign_define(tp, { text = icon, texthl = hl, numhl = hl })
    -- end
    dap.listeners.after.event_initialized['dapui_config'] = dapui.open
    dap.listeners.before.event_terminated['dapui_config'] = dapui.close
    dap.listeners.before.event_exited['dapui_config'] = dapui.close
    -- Install golang specific config
    require('dap-go').setup {
      delve = {
        -- On Windows delve must be run attached or it crashes.
        -- See https://github.com/leoluz/nvim-dap-go/blob/main/README.md#configuring
        detached = vim.fn.has 'win32' == 0,
      },
    }
  end,
 }
--- a/.config/nvim/lua/kickstart/plugins/gitsigns.lua
+++ b/.config/nvim/lua/kickstart/plugins/gitsigns.lua
@@ -1,61 +0,0 @@
 -- Adds git related signs to the gutter, as well as utilities for managing changes
 -- NOTE: gitsigns is already included in init.lua but contains only the base
 -- config. This will add also the recommended keymaps.
 return {
  {
    'lewis6991/gitsigns.nvim',
    opts = {
      on_attach = function(bufnr)
        local gitsigns = require 'gitsigns'
        local function map(mode, l, r, opts)
          opts = opts or {}
          opts.buffer = bufnr
          vim.keymap.set(mode, l, r, opts)
        end
        -- Navigation
        map('n', ']c', function()
          if vim.wo.diff then
            vim.cmd.normal { ']c', bang = true }
          else
            gitsigns.nav_hunk 'next'
          end
        end, { desc = 'Jump to next git [c]hange' })
        map('n', '[c', function()
          if vim.wo.diff then
            vim.cmd.normal { '[c', bang = true }
          else
            gitsigns.nav_hunk 'prev'
          end
        end, { desc = 'Jump to previous git [c]hange' })
        -- Actions
        -- visual mode
        map('v', '<leader>hs', function()
          gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
        end, { desc = 'git [s]tage hunk' })
        map('v', '<leader>hr', function()
          gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
        end, { desc = 'git [r]eset hunk' })
        -- normal mode
        map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
        map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })
        map('n', '<leader>hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' })
        map('n', '<leader>hu', gitsigns.stage_hunk, { desc = 'git [u]ndo stage hunk' })
        map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' })
        map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' })
        map('n', '<leader>hb', gitsigns.blame_line, { desc = 'git [b]lame line' })
        map('n', '<leader>hd', gitsigns.diffthis, { desc = 'git [d]iff against index' })
        map('n', '<leader>hD', function()
          gitsigns.diffthis '@'
        end, { desc = 'git [D]iff against last commit' })
        -- Toggles
        map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' })
        map('n', '<leader>tD', gitsigns.preview_hunk_inline, { desc = '[T]oggle git show [D]eleted' })
      end,
    },
  },
 }
--- a/.config/nvim/lua/kickstart/plugins/indent_line.lua
+++ b/.config/nvim/lua/kickstart/plugins/indent_line.lua
@@ -1,18 +0,0 @@
 vim.api.nvim_create_autocmd('FileType', {
  pattern = 'html',
  callback = function()
    vim.opt_local.tabstop = 2
    vim.opt_local.shiftwidth = 2
    vim.opt_local.expandtab = true
  end,
 })
 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 = {},
  },
 }
--- a/.config/nvim/lua/kickstart/plugins/lint.lua
+++ b/.config/nvim/lua/kickstart/plugins/lint.lua
@@ -1,63 +0,0 @@
 return {
  { -- Linting
    'mfussenegger/nvim-lint',
    event = { 'BufReadPre', 'BufNewFile' },
    config = function()
      local lint = require 'lint'
      lint.linters_by_ft = {
        markdown = { 'markdownlint' },
        javascript = { 'eslint_d' },
        typescript = { 'eslint_d' },
        vue = { 'eslint_d' },
      }
      -- To allow other plugins to add linters to require('lint').linters_by_ft,
      -- instead set linters_by_ft like this:
      -- lint.linters_by_ft = lint.linters_by_ft or {}
      -- lint.linters_by_ft['markdown'] = { 'markdownlint' }
      --
      -- However, note that this will enable a set of default linters,
      -- which will cause errors unless these tools are available:
      -- {
      --   clojure = { "clj-kondo" },
      --   dockerfile = { "hadolint" },
      --   inko = { "inko" },
      --   janet = { "janet" },
      --   json = { "jsonlint" },
      --   markdown = { "vale" },
      --   rst = { "vale" },
      --   ruby = { "ruby" },
      --   terraform = { "tflint" },
      --   text = { "vale" }
      -- }
      --
      -- You can disable the default linters by setting their filetypes to nil:
      -- lint.linters_by_ft['clojure'] = nil
      -- lint.linters_by_ft['dockerfile'] = nil
      -- lint.linters_by_ft['inko'] = nil
      -- lint.linters_by_ft['janet'] = nil
      -- lint.linters_by_ft['json'] = nil
      -- lint.linters_by_ft['markdown'] = nil
      -- lint.linters_by_ft['rst'] = nil
      -- lint.linters_by_ft['ruby'] = nil
      -- lint.linters_by_ft['terraform'] = nil
      -- lint.linters_by_ft['text'] = nil
      -- Create autocommand which carries out the actual linting
      -- on the specified events.
      local lint_augroup = vim.api.nvim_create_augroup('lint', { clear = true })
      vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave' }, {
        group = lint_augroup,
        callback = function()
          -- Only run the linter in buffers that you can modify in order to
          -- avoid superfluous noise, notably within the handy LSP pop-ups that
          -- describe the hovered symbol using Markdown.
          if vim.opt_local.modifiable:get() then
            lint.try_lint()
          end
        end,
      })
    end,
  },
 }
--- a/.config/nvim/lua/kickstart/plugins/neo-tree.lua
+++ b/.config/nvim/lua/kickstart/plugins/neo-tree.lua
@@ -1,33 +0,0 @@
 -- Neo-tree is a Neovim plugin to browse the file system
 -- https://github.com/nvim-neo-tree/neo-tree.nvim
 return {
  'nvim-neo-tree/neo-tree.nvim',
  version = '*',
  dependencies = {
    'nvim-lua/plenary.nvim',
    'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended
    'MunifTanjim/nui.nvim',
  },
  cmd = 'Neotree',
  keys = {
    { '\\', ':Neotree toggle<CR>', desc = 'NeoTree reveal', silent = true },
  },
  opts = {
    event_handlers = {
      {
        event = 'file_open_requested',
        handler = function()
          vim.cmd 'Neotree close'
        end,
      },
    },
    filesystem = {
      window = {
        mappings = {
          ['\\'] = 'close_window',
        },
      },
    },
  },
 }
--- a/.config/nvim/nvim-pack-lock.json
+++ b/.config/nvim/nvim-pack-lock.json
@@ -0,0 +1,96 @@
 {
  "plugins": {
    "catppuccin": {
      "rev": "384f304c8b04664c9e0091fbfb3923c5f97c1bcf",
      "src": "https://github.com/catppuccin/nvim"
    },
    "lazydev.nvim": {
      "rev": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d",
      "src": "https://github.com/folke/lazydev.nvim"
    },
    "mason-lspconfig.nvim": {
      "rev": "a676ab7282da8d651e175118bcf54483ca11e46d",
      "src": "https://github.com/mason-org/mason-lspconfig.nvim"
    },
    "mason-tool-installer.nvim": {
      "rev": "443f1ef8b5e6bf47045cb2217b6f748a223cf7dc",
      "src": "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim"
    },
    "mason.nvim": {
      "rev": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65",
      "src": "https://github.com/mason-org/mason.nvim"
    },
    "mini.completion": {
      "rev": "4f94cafdeef02bf3ef9997cd6862658801caa22c",
      "src": "https://github.com/nvim-mini/mini.completion"
    },
    "mini.cursorword": {
      "rev": "8dcf45bc820f3c5f778960ba55206938246b70b7",
      "src": "https://github.com/nvim-mini/mini.cursorword"
    },
    "mini.hipatterns": {
      "rev": "2c5dce6dc7443de814d16f7470549811ee86e664",
      "src": "https://github.com/nvim-mini/mini.hipatterns"
    },
    "mini.icons": {
      "rev": "5b9076dae1bfbe47ba4a14bc8b967cde0ab5d77e",
      "src": "https://github.com/nvim-mini/mini.icons"
    },
    "mini.notify": {
      "rev": "e506fb6da26c0a31ee6b1d2eb99626cb147f28ca",
      "src": "https://github.com/nvim-mini/mini.notify"
    },
    "mini.nvim": {
      "rev": "9990c41f10f54f29a888d13024c9f765037bde23",
      "src": "https://github.com/nvim-mini/mini.nvim"
    },
    "mini.pairs": {
      "rev": "b7fde3719340946feb75017ef9d75edebdeb0566",
      "src": "https://github.com/nvim-mini/mini.pairs"
    },
    "mini.pick": {
      "rev": "8521fe21df86e08d9e4b3c3f3a7d50e47954e1af",
      "src": "https://github.com/nvim-mini/mini.pick"
    },
    "mini.snippets": {
      "rev": "0d0b435e3f9563965f73703a6a6d17acb432a93c",
      "src": "https://github.com/nvim-mini/mini.snippets"
    },
    "mini.statusline": {
      "rev": "8c3829d4ef02b693f68e43fc131b433f11049b2b",
      "src": "https://github.com/nvim-mini/mini.statusline"
    },
    "mini.tabline": {
      "rev": "d03f10bf562cef57bd9f80f82c54269ff4816a15",
      "src": "https://github.com/nvim-mini/mini.tabline"
    },
    "nvim": {
      "rev": "384f304c8b04664c9e0091fbfb3923c5f97c1bcf",
      "src": "https://github.com/catppuccin/nvim"
    },
    "nvim-lspconfig": {
      "rev": "883c6495b53fccbd35d0938aac8bdf72f6d499c0",
      "src": "https://github.com/neovim/nvim-lspconfig"
    },
    "nvim-treesitter": {
      "rev": "eb1f8e80cb28eb7892f347609e0bdc5eb574b945",
      "src": "https://github.com/nvim-treesitter/nvim-treesitter"
    },
    "oil.nvim": {
      "rev": "0fcc83805ad11cf714a949c98c605ed717e0b83e",
      "src": "https://github.com/stevearc/oil.nvim"
    },
    "plenary.nvim": {
      "rev": "b9fd5226c2f76c951fc8ed5923d85e4de065e509",
      "src": "https://github.com/nvim-lua/plenary.nvim"
    },
    "todo-comments.nvim": {
      "rev": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668",
      "src": "https://github.com/folke/todo-comments.nvim"
    },
    "which-key.nvim": {
      "rev": "3aab2147e74890957785941f0c1ad87d0a44c15a",
      "src": "https://github.com/folke/which-key.nvim"
    }
  }
 }
--- a/.config/rofi/themes/catppuccin-default.rasi
+++ b/.config/rofi/themes/catppuccin-default.rasi
@@ -8,7 +8,7 @@
  alternate-urgent-background: @lightbg;
  lightbg:                     @mantle;
  background-color:            transparent;
-  border-color:                @foreground;
+  border-color:                @green;
  normal-background:           @background;
  selected-urgent-background:  @red;
  alternate-active-background: @lightbg;
@@ -20,9 +20,9 @@
  background:                  @base;
  selected-active-background:  @blue;
  active-background:           @background;
-  selected-normal-background:  @lightfg;
+  selected-normal-background:  @green;
  alternate-normal-background: @lightbg;
-  foreground:                  @text;
+  foreground:                  @green;
  selected-urgent-foreground:  @background;
  normal-foreground:           @foreground;
  alternate-urgent-foreground: @red;
--- a/.config/sway/input
+++ b/.config/sway/input
@@ -8,7 +8,7 @@ input "*" xkb_options caps:backspace
 ## Set colemak layout on surface laptop
 input 1118:2478:Microsoft_Surface_045E:09AE_Keyboard xkb_layout colemak-se
 ## Set colemak layout on printer desktop
-input 9494:26:CM_Storm_Keyboard_--_QuickFire_XT xkb_layout colemak-se
+#input 9494:26:CM_Storm_Keyboard_--_QuickFire_XT xkb_layout colemak-se
 ## Remove pointer acceleration
 input "type:pointer" {
    accel_profile "flat"
--- a/.config/yadm/bootstrap##distro.arch
+++ b/.config/yadm/bootstrap##distro.arch
@@ -3,11 +3,10 @@
 set -e
-sudo pacman -Suy archlinux-keyring
+sudo pacman -Suy --noconfirm archlinux-keyring
-sudo pacman -Suy
+sudo pacman -Suy --noconfirm
-sudo pacman -S \
+sudo pacman -Sy --noconfirm \
  neovim \
  fd \
  tmux \
  nvm \
@@ -16,7 +15,17 @@ sudo pacman -S \
  alacritty \
  rofi \
  ttf-jetbrains-mono-nerd \
-  less
+  less \
  waybar \
  cifs-utils \
  nautilus \
  bitwarden-cli \
  jq \
  bob
 bob install nightly
 bob use nightly
 vim --version
 if [ ! -d /home/wholteza/repos/yay ]; then
 	cd ~
@@ -27,10 +36,13 @@ if [ ! -d /home/wholteza/repos/yay ]; then
 	makepkg -si
 fi
-yay -S \
+yay -S --noconfirm \
  fnm \
  oh-my-posh
 export PATH=/home/$USER/.fnm:$PATH
 eval "$(fnm env --use-on-cd --version-file-strategy=recursive)"
 fnm install 24
 fnm use 24
--- a/.config/yadm/config
+++ b/.config/yadm/config
@@ -0,0 +1,2 @@
 [pull]
 	rebase = false
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -2,7 +2,7 @@ set -g prefix C-b
 bind C-b send-prefix
 set -g mouse on
-
+set -g base-index 1 # start windows numbering at 1wq
 # List of plugins
 set -g @plugin 'catppuccin/tmux#v2.1.3'
 set -g @catppuccin_flavor 'mocha'
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
  "license": "ISC",
  "dependencies": {
    "@vue/typescript-plugin": "^3.2.2",
    "jiti": "^2.6.1",
    "neovim": "^5.4.0"
  }
 }