migrate astronvim conf to astronvim v4

.dotter/global.toml

@@ -3,7 +3,8 @@ fish = "~/.config/fish/"
 kermit = "~/.config/kermit.conf"
 utils = "~/.local/bin/dotutils/"
 ideavim = "~/.ideavimrc"
-astrovim = "~/.config/nvim/lua/user/"
+'astronvim/plugins' = "~/.config/nvim/lua/plugins/"
+'astronvim/community.lua' = "~/.config/nvim/lua/community.lua"
 vimrc = "~/.vimrc"
 halig = "~/.config/halig"
 k9smocha = "~/.config/k9s/skins/mocha.yaml"
@@ -20,4 +21,3 @@ continue = "~/.continue"
 mangohud = "~/.config/MangoHud/MangoHud.conf"
 gamemode = "~/.config/gamemode.ini"
 helldivers2 = "~/.local/share/Steam/steamapps/compatdata/553850/pfx/drive_c/users/steamuser/AppData/Roaming/Arrowhead/Helldivers2/user_settings.config"
-'freetds.conf' = '/etc/freetds//freetds.conf'

astronvim/community.lua

@@ -0,0 +1,32 @@
+return {
+    "AstroNvim/astrocommunity",
+    { import = "astrocommunity.colorscheme.catppuccin"},
+    { import = "astrocommunity.bars-and-lines.smartcolumn-nvim" },
+    { import = "astrocommunity.editing-support.auto-save-nvim" },
+    { import = "astrocommunity.editing-support.nvim-devdocs" },
+    { import = "astrocommunity.diagnostics.lsp_lines-nvim" },
+    { import = "astrocommunity.quickfix.nvim-bqf" },
+    { import = "astrocommunity.code-runner.compiler-nvim" },
+    { import = "astrocommunity.bars-and-lines.vim-illuminate" },
+    { import = "astrocommunity.bars-and-lines.lualine-nvim" },
+    { import = "astrocommunity.git.blame-nvim" },
+    { import = "astrocommunity.indent.indent-blankline-nvim" },
+    { import = "astrocommunity.indent.mini-indentscope" },
+    { import = "astrocommunity.lsp.lsp-signature-nvim" },
+    { import = "astrocommunity.markdown-and-latex.glow-nvim" },
+    { import = "astrocommunity.pack.ansible" },
+    { import = "astrocommunity.pack.bash" },
+    { import = "astrocommunity.pack.docker" },
+    { import = "astrocommunity.pack.go" },
+    { import = "astrocommunity.pack.html-css" },
+    { import = "astrocommunity.pack.json" },
+    { import = "astrocommunity.pack.lua" },
+    { import = "astrocommunity.pack.markdown" },
+    { import = "astrocommunity.pack.python-ruff" },
+    { import = "astrocommunity.pack.terraform" },
+    { import = "astrocommunity.pack.toml" },
+    { import = "astrocommunity.pack.yaml" },
+    { import = "astrocommunity.scrolling.cinnamon-nvim" },
+    { import = "astrocommunity.split-and-window.minimap-vim" },
+    { import = "astrocommunity.workflow.hardtime-nvim" },
+}

astronvim/plugins/astrocore.lua

@@ -0,0 +1,40 @@
+---@type LazySpec
+return {
+    "AstroNvim/astrocore",
+    ---@type AstroCoreOpts
+    opts = {
+        features = {
+            large_buf = { size = 1024 * 500, lines = 10000 },
+            autopairs = true,
+            cmp = true,
+            diagnostics_mode = 3,
+            highlighturl = true,
+            notifications = true,
+        },
+        diagnostics = {
+            virtual_text = true,
+            underline = true,
+        },
+        options = {
+            opt = {
+                conceallevel = 2,
+                relativenumber = true,
+                list = true,
+                listchars = { tab = "│→", extends = "⟩", precedes = "⟨", trail = "·", nbsp = "␣" },
+                showbreak = "↪ ",
+                wrap = true,
+                laststatus = 3,
+                splitkeep = "screen",
+            },
+            g = {
+                icons_enabled = true,
+                mapleader = " ",
+                autoformat_enabled = true,
+                cmp_enabled = true,
+                autopairs_enabled = true,
+                diagnostics_enabled = true,
+                status_diagnostics_enabled = true,
+            },
+        },
+    },
+}

astronvim/plugins/astrolsp.lua

@@ -0,0 +1,24 @@
+---@type LazySpec
+return {
+    "AstroNvim/astrolsp",
+    ---@type AstroLSPOpts
+    opts = {
+        features = {
+            autoformat = true,
+            codelens = true,
+            semantic_tokens = true,
+        },
+        formatting = {
+            format_on_save = {
+                enabled = true,
+            },
+            timeout_ms = 1000, -- default format timeout
+
+        },
+        servers = {
+            "ruff",
+            "lua_ls",
+        },
+
+    },
+}

astronvim/plugins/astroui.lua

@@ -0,0 +1,7 @@
+return {
+    "AstroNvim/astroui",
+    ---@type AstroUIOpts
+    opts = {
+        colorscheme = "catppuccin-mocha",
+    },
+}

astronvim/plugins/catppuccin.lua

@@ -0,0 +1,17 @@
+return {
+    "catppuccin",
+    opts = {
+        integrations = {
+            sandwich = false,
+            noice = true,
+            mini = true,
+            leap = true,
+            markdown = true,
+            neotest = true,
+            cmp = true,
+            overseer = true,
+            lsp_trouble = true,
+            rainbow_delimiters = true,
+        },
+    },
+}

astrovim/init.lua

@@ -1,123 +0,0 @@
-return {
-  astrogui = "catppuccin",
-
-  diagnostics = {
-    virtual_text = true,
-    underline = true,
-  },
-
-  lsp = {
-    formatting = {
-      format_on_save = {
-        enabled = true,
-      },
-      timeout_ms = 1000,
-    },
-    servers = {
-      "pyright",
-    },
-  },
-
-  lazy = {
-    defaults = { lazy = true },
-  },
-
-  plugins = {
-    {
-      "AstroNvim/astrocommunity",
-
-      { import = "astrocommunity.colorscheme.catppuccin" },
-      {
-        "catppuccin",
-        opts = {
-          integrations = {
-            sandwich = false,
-            noice = true,
-            mini = true,
-            leap = true,
-            markdown = true,
-            neotest = true,
-            cmp = true,
-            overseer = true,
-            lsp_trouble = true,
-            rainbow_delimiters = true,
-          },
-        },
-      },
-
-      { import = "astrocommunity.bars-and-lines.smartcolumn-nvim" },
-
-      {
-        "m4xshen/smartcolumn.nvim",
-        opts = {
-          colorcolumn = 120,
-          disabled_filetypes = { "help" },
-        },
-      },
-      {
-        "lewis6991/gitsigns.nvim",
-      },
-
-      { import = "astrocommunity.editing-support.auto-save-nvim" },
-      { import = "astrocommunity.editing-support.nvim-devdocs" },
-
-      { import = "astrocommunity.diagnostics.lsp_lines-nvim" },
-
-      { import = "astrocommunity.debugging.nvim-bqf" },
-
-      { import = "astrocommunity.code-runner.compiler-nvim" },
-
-      { import = "astrocommunity.bars-and-lines.vim-illuminate" },
-      { import = "astrocommunity.bars-and-lines.lualine-nvim" },
-
-      { import = "astrocommunity.git.blame-nvim" },
-
-      { import = "astrocommunity.indent.indent-blankline-nvim" },
-      { import = "astrocommunity.indent.mini-indentscope" },
-
-      { import = "astrocommunity.lsp.lsp-signature-nvim" },
-
-      { import = "astrocommunity.markdown-and-latex.glow-nvim" },
-      { import = "astrocommunity.pack.ansible" },
-      { import = "astrocommunity.pack.bash" },
-      { import = "astrocommunity.pack.docker" },
-      { import = "astrocommunity.pack.go" },
-      { import = "astrocommunity.pack.html-css" },
-      { import = "astrocommunity.pack.json" },
-      { import = "astrocommunity.pack.lua" },
-      { import = "astrocommunity.pack.markdown" },
-      --{ import = "astrocommunity.pack.nix" },
-      { import = "astrocommunity.pack.python-ruff" },
-      { import = "astrocommunity.pack.terraform" },
-      { import = "astrocommunity.pack.toml" },
-      { import = "astrocommunity.pack.yaml" },
-
-      { import = "astrocommunity.scrolling.cinnamon-nvim" },
-
-      { import = "astrocommunity.split-and-window.minimap-vim" },
-
-      { import = "astrocommunity.workflow.hardtime-nvim" },
-    },
-  },
-  options = {
-    opt = {
-      conceallevel = 2,
-      relativenumber = true,
-      list = true,
-      listchars = { tab = "│→", extends = "⟩", precedes = "⟨", trail = "·", nbsp = "␣" },
-      showbreak = "↪ ",
-      wrap = true,
-      laststatus = 3,
-      splitkeep = "screen",
-    },
-    g = {
-      icons_enabled = true,
-      mapleader = " ",
-      autoformat_enabled = true,
-      cmp_enabled = true,
-      autopairs_enabled = true,
-      diagnostics_enabled = true,
-      status_diagnostics_enabled = true,
-    },
-  },
-}

fish/conf.d/functions.fish

@@ -60,3 +60,19 @@ function fish_right_prompt
   echo -e -n -s $k8s_color "($k8s_context)"
 end
 
+function g_reset
+  if not set -q argv[1]
+      set argv[1] 1
+  end
+
+  git reset "HEAD~$argv[1]"
+end
+
+function g_undo_reset
+  if not set -q argv[1]
+      set argv[1] 1
+  end
+
+  git reset "HEAD@{$argv[1]}"
+end
+