Fix import order lazyvim

.gitconfig

@@ -0,0 +1,48 @@
+[include]
+  path = .gitconfig_user
+[column]
+  ui = auto
+[branch]
+  sort = -committerdate
+[tag]
+  sort = version:refname
+[init]
+  defaultBranch = master
+[diff]
+  algorithm = histogram
+  colorMoved = plain
+  mnemonicPrefix = true
+  renames = true
+[push]
+  default = simple
+  autoSetupRemote = true
+  followTags = true
+[fetch]
+  prune = true
+  pruneTags = true
+  all = true
+
+[help]
+  autocorrect = prompt
+[commit]
+  verbose = true
+[rerere]
+  enabled = true
+  autoupdate = true
+[core]
+  excludesfile = ~/.gitignore
+[rebase]
+  autoSquash = true
+  autoStash = true
+  updateRefs = true
+
+# a matter of taste (uncomment if you dare)
+
+[core]
+  # fsmonitor = true
+  # untrackedCache = true
+[merge]
+  # (just 'diff3' if git version < 2.3)
+  conflictstyle = zdiff3 
+[pull]
+  rebase = true

.gitignore

@@ -1 +1,2 @@
 lazy-lock.json
+**nvm**

config/fish/config.fish

@@ -1,5 +1,5 @@
 if test -f /etc/motd
-    cat /ect/motd
+    cat /etc/motd
 end
 
 if status is-interactive
@@ -7,4 +7,6 @@ if status is-interactive
 end
 
 
-export (envsubst < /home/mitch/.config/.env)
+if test -f $HOME/.config/env
+    export (envsubst < $HOME/.config/.env)
+end

config/mpv/input.conf

@@ -0,0 +1,231 @@
+# mpv keybindings
+#
+# Location of user-defined bindings: ~/.config/mpv/input.conf
+#
+# Lines starting with # are comments. Use SHARP to assign the # key.
+# Copy this file and uncomment and edit the bindings you want to change.
+#
+# List of commands and further details: DOCS/man/input.rst
+# List of special keys: --input-keylist
+# Keybindings testing mode: mpv --input-test --force-window --idle
+#
+# Use 'ignore' to unbind a key fully (e.g. 'ctrl+a ignore').
+#
+# Strings need to be quoted and escaped:
+#   KEY show-text "This is a single backslash: \\ and a quote: \" !"
+#
+# You can use modifier-key combinations like Shift+Left or Ctrl+Alt+x with
+# the modifiers Shift, Ctrl, Alt and Meta (may not work on the terminal).
+#
+# The default keybindings are hardcoded into the mpv binary.
+# You can disable them completely with: --no-input-default-bindings
+
+# Developer note:
+# On compilation, this file is baked into the mpv binary, and all lines are
+# uncommented (unless '#' is followed by a space) - thus this file defines the
+# default key bindings.
+WHEEL_UP seek 10
+WHEEL_DOWN seek -10
+
+# If this is enabled, treat all the following bindings as default.
+#default-bindings start
+
+#MBTN_LEFT     ignore              # don't do anything
+#MBTN_LEFT_DBL cycle fullscreen    # toggle fullscreen
+#MBTN_RIGHT    cycle pause         # toggle pause/playback mode
+#MBTN_BACK     playlist-prev       # skip to the previous file
+#MBTN_FORWARD  playlist-next       # skip to the next file
+
+# Mouse wheels, touchpad or other input devices that have axes
+# if the input devices supports precise scrolling it will also scale the
+# numeric value accordingly
+#WHEEL_UP      add volume 2
+#WHEEL_DOWN    add volume -2
+#WHEEL_LEFT    seek -10         # seek 10 seconds backward
+#WHEEL_RIGHT   seek 10          # seek 10 seconds forward
+
+## Seek units are in seconds, but note that these are limited by keyframes
+#RIGHT seek  5                          # seek 5 seconds forward
+#LEFT  seek -5                          # seek 5 seconds backward
+#UP    seek  60                         # seek 1 minute forward
+#DOWN  seek -60                         # seek 1 minute backward
+# Do smaller, always exact (non-keyframe-limited), seeks with shift.
+# Don't show them on the OSD (no-osd).
+#Shift+RIGHT no-osd seek  1 exact       # seek exactly 1 second forward
+#Shift+LEFT  no-osd seek -1 exact       # seek exactly 1 second backward
+#Shift+UP    no-osd seek  5 exact       # seek exactly 5 seconds forward
+#Shift+DOWN  no-osd seek -5 exact       # seek exactly 5 seconds backward
+#Ctrl+LEFT   no-osd sub-seek -1         # seek to the previous subtitle
+#Ctrl+RIGHT  no-osd sub-seek  1         # seek to the next subtitle
+#Ctrl+Shift+LEFT sub-step -1            # change subtitle timing such that the previous subtitle is displayed
+#Ctrl+Shift+RIGHT sub-step 1            # change subtitle timing such that the next subtitle is displayed
+#Alt+left  add video-pan-x  0.1         # move the video right
+#Alt+right add video-pan-x -0.1         # move the video left
+#Alt+up    add video-pan-y  0.1         # move the video down
+#Alt+down  add video-pan-y -0.1         # move the video up
+#Alt++     add video-zoom   0.1         # zoom in
+#ZOOMIN    add video-zoom   0.1         # zoom in
+#Alt+-     add video-zoom  -0.1         # zoom out
+#ZOOMOUT   add video-zoom  -0.1         # zoom out
+#Ctrl+WHEEL_UP   add video-zoom  0.1    # zoom in
+#Ctrl+WHEEL_DOWN add video-zoom -0.1    # zoom out
+#Alt+BS set video-zoom 0; set panscan 0; set video-pan-x 0; set video-pan-y 0 # reset zoom and pan settings
+#PGUP add chapter 1                     # seek to the next chapter
+#PGDWN add chapter -1                   # seek to the previous chapter
+#Shift+PGUP seek 600                    # seek 10 minutes forward
+#Shift+PGDWN seek -600                  # seek 10 minutes backward
+#[ multiply speed 1/1.1                 # decrease the playback speed
+#] multiply speed 1.1                   # increase the playback speed
+#{ multiply speed 0.5                   # halve the playback speed
+#} multiply speed 2.0                   # double the playback speed
+#BS set speed 1.0                       # reset the speed to normal
+#Shift+BS revert-seek                   # undo the previous (or marked) seek
+#Shift+Ctrl+BS revert-seek mark         # mark the position for revert-seek
+#q quit
+#Q quit-watch-later                     # exit and remember the playback position
+#q {encode} quit 4
+#ESC set fullscreen no                  # leave fullscreen
+#ESC {encode} quit 4
+#p cycle pause                          # toggle pause/playback mode
+#. frame-step                           # advance one frame and pause
+#, frame-back-step                      # go back by one frame and pause
+#SPACE cycle pause                      # toggle pause/playback mode
+#> playlist-next                        # skip to the next file
+#ENTER playlist-next                    # skip to the next file
+#< playlist-prev                        # skip to the previous file
+#O no-osd cycle-values osd-level 3 1    # toggle displaying the OSD on user interaction or always
+#o show-progress                        # show playback progress
+#P show-progress                        # show playback progress
+#i script-binding stats/display-stats   # display information and statistics
+#I script-binding stats/display-stats-toggle # toggle displaying information and statistics
+#` script-binding console/enable        # open the console
+#z add sub-delay -0.1                   # shift subtitles 100 ms earlier
+#Z add sub-delay +0.1                   # delay subtitles by 100 ms
+#x add sub-delay +0.1                   # delay subtitles by 100 ms
+#ctrl++ add audio-delay 0.100           # change audio/video sync by delaying the audio
+#ctrl+- add audio-delay -0.100          # change audio/video sync by shifting the audio earlier
+#Shift+g add sub-scale +0.1             # increase the subtitle font size
+#Shift+f add sub-scale -0.1             # decrease the subtitle font size
+#9 add volume -2
+#/ add volume -2
+#0 add volume 2
+#* add volume 2
+#m cycle mute                           # toggle mute
+#1 add contrast -1
+#2 add contrast 1
+#3 add brightness -1
+#4 add brightness 1
+#5 add gamma -1
+#6 add gamma 1
+#7 add saturation -1
+#8 add saturation 1
+#Alt+0 set window-scale 0.5             # halve the window size
+#Alt+1 set window-scale 1.0             # reset the window size
+#Alt+2 set window-scale 2.0             # double the window size
+#b cycle deband                         # toggle the debanding filter
+#d cycle deinterlace                    # cycle the deinterlacing filter
+#r add sub-pos -1                       # move subtitles up
+#R add sub-pos +1                       # move subtitles down
+#t add sub-pos +1                       # move subtitles down
+#v cycle sub-visibility                 # hide or show the subtitles
+#Alt+v cycle secondary-sub-visibility   # hide or show the secondary subtitles
+#V cycle sub-ass-vsfilter-aspect-compat # toggle stretching SSA/ASS subtitles with anamorphic videos to match the historical renderer
+#u cycle-values sub-ass-override "force" "scale" # toggle overriding SSA/ASS subtitle styles with the normal styles
+#j cycle sub                            # switch subtitle track
+#J cycle sub down                       # switch subtitle track backwards
+#SHARP cycle audio                      # switch audio track
+#_ cycle video                          # switch video track
+#T cycle ontop                          # toggle placing the video on top of other windows
+#f cycle fullscreen                     # toggle fullscreen
+#s screenshot                           # take a screenshot of the video in its original resolution with subtitles
+#S screenshot video                     # take a screenshot of the video in its original resolution without subtitles
+#Ctrl+s screenshot window               # take a screenshot of the window with OSD and subtitles
+#Alt+s screenshot each-frame            # automatically screenshot every frame; issue this command again to stop taking screenshots
+#w add panscan -0.1                     # decrease panscan
+#W add panscan +0.1                     # shrink black bars by cropping the video
+#e add panscan +0.1                     # shrink black bars by cropping the video
+#A cycle-values video-aspect-override "16:9" "4:3" "2.35:1" "-1" # cycle the video aspect ratio ("-1" is the container aspect)
+#POWER quit
+#PLAY cycle pause                       # toggle pause/playback mode
+#PAUSE cycle pause                      # toggle pause/playback mode
+#PLAYPAUSE cycle pause                  # toggle pause/playback mode
+#PLAYONLY set pause no                  # unpause
+#PAUSEONLY set pause yes                # pause
+#STOP quit
+#FORWARD seek 60                        # seek 1 minute forward
+#REWIND seek -60                        # seek 1 minute backward
+#NEXT playlist-next                     # skip to the next file
+#PREV playlist-prev                     # skip to the previous file
+#VOLUME_UP add volume 2
+#VOLUME_DOWN add volume -2
+#MUTE cycle mute                        # toggle mute
+#CLOSE_WIN quit
+#CLOSE_WIN {encode} quit 4
+#ctrl+w quit
+#E cycle edition                        # switch edition
+#l ab-loop                              # set/clear A-B loop points
+#L cycle-values loop-file "inf" "no"    # toggle infinite looping
+#ctrl+c quit 4
+#DEL script-binding osc/visibility      # cycle OSC visibility between never, auto (mouse-move) and always
+#ctrl+h cycle-values hwdec "auto-safe" "no"  # toggle hardware decoding
+#F8 show-text ${playlist}               # show the playlist
+#F9 show-text ${track-list}             # show the list of video, audio and sub tracks
+#g ignore
+#g-p script-binding select/select-playlist
+#g-s script-binding select/select-sid
+#g-S script-binding select/select-secondary-sid
+#g-a script-binding select/select-aid
+#g-v script-binding select/select-vid
+#g-t script-binding select/select-track
+#g-c script-binding select/select-chapter
+#g-l script-binding select/select-subtitle-line
+#g-d script-binding select/select-audio-device
+#g-b script-binding select/select-binding
+#g-r script-binding select/show-properties
+
+#Alt+KP1 add video-rotate -1 # rotate video counterclockwise by 1 degree
+#Alt+KP5 set video-rotate  0 # reset rotation
+#Alt+KP3 add video-rotate  1 # rotate video clockwise by 1 degree
+
+#KP1 add video-zoom    -0.01 # zoom out video
+#KP2 add video-scale-y -0.01 # scale down video vertically
+#KP4 add video-scale-x -0.01 # scale down video horizontally
+#KP5 set video-scale-x  1.00; set video-scale-y 1; set video-zoom 0 # reset video scale
+#KP6 add video-scale-x  0.01 # scale up video horizontally
+#KP8 add video-scale-y  0.01 # scale up video vertically
+#KP9 add video-zoom     0.01 # zoom in video
+
+#Ctrl+KP1 add video-pan-x -0.01; add video-pan-y  0.01 # move video left and down
+#Ctrl+KP2 add video-pan-y  0.01                        # move video down
+#Ctrl+KP3 add video-pan-x  0.01; add video-pan-y  0.01 # move video right and down
+#Ctrl+KP4 add video-pan-x -0.01                        # move video left
+#Ctrl+KP5 set video-pan-x  0.00; set video-pan-y  0.00 # reset video position
+#Ctrl+KP6 add video-pan-x  0.01                        # move video right
+#Ctrl+KP7 add video-pan-x -0.01; add video-pan-y -0.01 # move video left and up
+#Ctrl+KP8 add video-pan-y -0.01                        # move video up
+#Ctrl+KP9 add video-pan-x  0.01; add video-pan-y -0.01 # move video right and up
+
+#Ctrl+KP_END   add video-align-x -0.01; add video-align-y  0.01 # align video left and down
+#Ctrl+KP_DOWN  add video-align-y  0.01                          # align video down
+#Ctrl+KP_PGDWN add video-align-x  0.01; add video-align-y  0.01 # align video right and down
+#Ctrl+KP_LEFT  add video-align-x -0.01                          # align video left
+#Ctrl+KP_BEGIN set video-align-x  0.00; set video-align-y  0.00 # reset video alignment
+#Ctrl+KP_RIGHT add video-align-x  0.01                          # align video right
+#Ctrl+KP_HOME  add video-align-x -0.01; add video-align-y -0.01 # align video left and up
+#Ctrl+KP_UP    add video-align-y -0.01                          # align video up
+#Ctrl+KP_PGUP  add video-align-x  0.01; add video-align-y -0.01 # align video right and up
+
+#
+# Legacy bindings (may or may not be removed in the future)
+#
+#! add chapter -1                       # seek to the previous chapter
+#@ add chapter 1                        # seek to the next chapter
+
+#
+# Not assigned by default
+# (not an exhaustive list of unbound commands)
+#
+
+# ? cycle sub-forced-events-only        # display only DVD/PGS forced subtitle events
+# ? stop                                # stop playback (quit or enter idle mode)
+

config/nvim/lazyvim.json

@@ -2,8 +2,9 @@
   "extras": [
 
   ],
+  "install_version": 7,
   "news": {
-    "NEWS.md": "6077"
+    "NEWS.md": "10960"
   },
-  "version": 6
+  "version": 8
 }

config/nvim/lua/config/lazy.lua

@@ -11,11 +11,19 @@ require("lazy").setup({
   spec = {
     -- add LazyVim and import its plugins
     { "LazyVim/LazyVim", import = "lazyvim.plugins" },
-    -- import any extras modules here
+
-    -- { import = "lazyvim.plugins.extras.lang.typescript" },
+    { import = "lazyvim.plugins.extras.lang.json" },
-    -- { import = "lazyvim.plugins.extras.lang.json" },
+    { import = "lazyvim.plugins.extras.lang.markdown" },
-    -- { import = "lazyvim.plugins.extras.ui.mini-animate" },
+    { import = "lazyvim.plugins.extras.lang.toml" },
-    -- import/override with your plugins
+    { import = "lazyvim.plugins.extras.lang.sql" },
+    { import = "lazyvim.plugins.extras.lang.typescript" },
+    { import = "lazyvim.plugins.extras.lang.vue" },
+    { import = "lazyvim.plugins.extras.lang.yaml" },
+    { import = "lazyvim.plugins.extras.lang.tailwind" },
+    { import = "lazyvim.plugins.extras.lang.omnisharp" },
+    { import = "lazyvim.plugins.extras.lang.docker" },
+    { import = "lazyvim.plugins.extras.coding.mini-surround" },
+    { import = "lazyvim.plugins.extras.util.mini-hipatterns" },
     { import = "plugins" },
   },
   defaults = {

config/nvim/lua/config/options.lua

@@ -8,3 +8,4 @@ local opt = vim.opt
 
 opt.mouse = "a"
 opt.termguicolors = true
+vim.g.snacks_animate = false

config/nvim/lua/plugins/example.lua

@@ -1,238 +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
-      {
-        "<leader>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", "<leader>co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" })
-          vim.keymap.set("n", "<leader>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<string, fun(server:string, opts:_.lspconfig.options):boolean?>
-      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",
-      },
-    },
-  },
-
-  -- Use <tab> for completion and snippets (supertab)
-  {
-    "hrsh7th/nvim-cmp",
-    dependencies = {
-      "hrsh7th/cmp-emoji",
-    },
-    ---@param opts cmp.ConfigSchema
-    opts = function(_, opts)
-      local has_words_before = function()
-        unpack = unpack or table.unpack
-        local line, col = unpack(vim.api.nvim_win_get_cursor(0))
-        return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
-      end
-
-      local cmp = require("cmp")
-
-      opts.mapping = vim.tbl_extend("force", opts.mapping, {
-        ["<Tab>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_next_item()
-          elseif vim.snippet.active({ direction = 1 }) then
-            vim.schedule(function()
-              vim.snippet.jump(1)
-            end)
-          elseif has_words_before() then
-            cmp.complete()
-          else
-            fallback()
-          end
-        end, { "i", "s" }),
-        ["<S-Tab>"] = cmp.mapping(function(fallback)
-          if cmp.visible() then
-            cmp.select_prev_item()
-          elseif vim.snippet.active({ direction = -1 }) then
-            vim.schedule(function()
-              vim.snippet.jump(-1)
-            end)
-          else
-            fallback()
-          end
-        end, { "i", "s" }),
-      })
-    end,
-  },
-}

config/nvim/lua/plugins/gruvbox.lua

@@ -0,0 +1,3 @@
+return {
+  "ellisonleao/gruvbox.nvim",
+}

config/nvim/lua/plugins/lazyvim-options.lua

@@ -0,0 +1,8 @@
+return {
+  {
+    "LazyVim/LazyVim",
+    opts = {
+      colorscheme = "gruvbox",
+    },
+  },
+}

config/nvim/lua/plugins/lazyvim.lua

@@ -1,24 +0,0 @@
-return {
-  -- add gruvbox
-  { "ellisonleao/gruvbox.nvim" },
-
-  -- Adding extras
-  { import = "lazyvim.plugins.extras.lang.json" },
-  { import = "lazyvim.plugins.extras.lang.markdown" },
-  { import = "lazyvim.plugins.extras.lang.toml" },
-  { import = "lazyvim.plugins.extras.lang.sql" },
-  { import = "lazyvim.plugins.extras.lang.typescript" },
-  { import = "lazyvim.plugins.extras.lang.vue" },
-  { import = "lazyvim.plugins.extras.lang.yaml" },
-  { import = "lazyvim.plugins.extras.lang.tailwind" },
-  { import = "lazyvim.plugins.extras.lang.omnisharp" },
-  { import = "lazyvim.plugins.extras.coding.mini-surround" },
-  { import = "lazyvim.plugins.extras.util.mini-hipatterns" },
-
-  {
-    "LazyVim/LazyVim",
-    opts = {
-      colorscheme = "gruvbox",
-    },
-  },
-}

config/nvim/lua/plugins/telescope-fzf-native.lua

@@ -1,13 +0,0 @@
-return {
-  "telescope.nvim",
-  dependencies = {
-    "nvim-telescope/telescope-fzf-native.nvim",
-    build = "make",
-    config = function()
-      require("telescope").load_extension("fzf")
-    end,
-    cond = function()
-      return vim.fn.executable("make") == 1
-    end,
-  },
-}

config/wezterm/wezterm.lua

@@ -1,8 +1,28 @@
 local wezterm = require("wezterm")
 local config = {}
 local act = wezterm.action
+local os_name = os.getenv("OS")
+<<<<<<< Updated upstream
+||||||| Stash base
+=======
 
+if os_name and os_name:lower():find("windows") then
+	config.default_prog = { "pwsh.exe" }
+else
+	config.default_prog = { "/usr/bin/fish" }
+end
+>>>>>>> Stashed changes
+
+<<<<<<< Updated upstream
+if os_name and os_name:lower():find("windows") then
+	config.default_prog = { "pwsh.exe" }
+else
+	config.default_prog = { "/usr/bin/fish" }
+end
+||||||| Stash base
 config.default_prog = { "/usr/bin/fish" }
+=======
+>>>>>>> Stashed changes
 config.default_cwd = "~"
 config.initial_rows = 36
 config.initial_cols = 132
@@ -18,7 +38,7 @@ config.color_scheme = "Gruvbox Dark (Gogh)"
 config.hide_tab_bar_if_only_one_tab = false
 
 config.window_frame = {
-	font = wezterm.font({ family = "JetBrains Mono", weight = "Bold" }),
+	font = wezterm.font({ family = "Fira Code", weight = "Bold" }),
 	font_size = 10.0,
 }
 

ideavimrc

@@ -0,0 +1,65 @@
+" Base settings
+set scrolloff=10
+set linenumber
+set relativenumber
+set showmode
+set notimeout
+
+set showcmd
+set visualbell
+set clipboard+=unnamed
+
+set hlsearch
+set incsearch
+set ignorecase
+set smartcase
+
+let mapleader = " "
+
+" Plugins
+Plug 'easymotion/vim-easymotion'
+Plug 'preservim/nerdtree'
+Plug 'tpope/vim-surround'
+Plug 'tpope/vim-commentary'
+Plug 'machakann/vim-highlightedyank'
+
+" Action and plugin bindings
+vnoremap < <gv
+vnoremap > >gv
+
+" Map H and L to move between tabs
+nmap H <Action>(NextTab)
+nmap L <Action>(PreviousTab)
+
+nmap s <Plug>(easymotion-s)
+nmap <leader>e <Plug>(NERDtree)
+
+" Code handling (commenting, renaming, refactoring etc)
+" nmap <leader>cc <Action>(CommentByLineComment)
+" nmap <leader>cr <Action>(
+
+" 'GOTO' commands
+nmap <leader>gd <Action>(GotoDeclaration)
+nmap <leader>gy <Action>(GotoTypeDeclaration)
+nmap <leader>gi <Action>(GotoImplementation)
+nmap <leader>gu <Action>(ShowUsages)
+nmap <leader>gt <Action>(GotoTest)
+nmap <leader>gb <Action>(Back)
+nmap <leader>gf <Action>(Forward)
+
+" (open) File management
+nmap <leader>ff <Action>(GotoFile)
+nmap <leader>/ <Action>(FindInPath)
+
+" Buffer (tab) management
+nmap <leader>bd <Action>(CloseContent)
+nmap <leader>br <Action>(CloseAllToTheRight)
+nmap <leader>bl <Action>(CloseAllToTheLeft)
+nmap <leader>bo <Action>(CloseEditorsButActive)
+nmap <leader>bp <Action>(PinActiveTab)
+
+" Project management
+nmap <leader>po <Action>(ProjectViewPopupMenuSettingsGroup)
+
+nmap <leader>vr <Action>(IdeaVim.ReloadVimRc.reload)
+nmap <leader>va <Action>(VimFindActionIdAction)