leftover removed

autoload/neoformat/formatters/qml.vim

@@ -0,0 +1,14 @@
+function! neoformat#formatters#qml#enabled() abort
+    return ['qmlformat']
+endfunction
+
+function! neoformat#formatters#qml#qmlformat() abort
+    return {
+        \ 'exe': '/usr/lib/qt6/bin/qmlformat',
+    \ 'args': ['-t', '-n', '--objects-spacing', '--functions-spacing', '-i'],
+    \ 'replace': 1,
+        \ 'stderr': 1,
+        \ 'stdin': 0
+        \ }
+endfunction
+

init.lua

@@ -4,10 +4,6 @@ require "config.lazy"
 require "mappings"
 require "autocmd"
 vim.cmd "source ~/.config/nvim/suda.vim"
-local time = tonumber(os.date "%H")
+-- local time = tonumber(os.date "%H")
 
-vim.filetype.add {
+vim.cmd [[colorscheme catppuccin-mocha]]
-    pattern = {[".*/hypr/.*%.conf"] = "hyprlang", [".*/uwsm/env.*"] = "zsh"}
-}
-
-vim.cmd [[colorscheme catppuccin-macchiato]]

lua/autocmd.lua

@@ -1 +1,17 @@
 local autocmd = vim.api.nvim_create_autocmd
+local augroup = vim.api.nvim_create_augroup
+
+local neoformat_group = augroup("NeoformatOnSave", { clear = true })
+
+autocmd("BufWritePost", {
+    group = neoformat_group,
+    callback = function()
+        if vim.bo.buftype ~= "" or vim.bo.modifiable == false or vim.bo.readonly then
+            return
+        end
+        if vim.fn.exists ":Neoformat" ~= 2 then
+            return
+        end
+        vim.cmd "silent! Neoformat"
+    end,
+})

lua/config/gitsigns.lua

@@ -0,0 +1,49 @@
+require("gitsigns").setup {
+    signs = {
+        add = { text = "┃" },
+        change = { text = "┃" },
+        delete = { text = "_" },
+        topdelete = { text = "‾" },
+        changedelete = { text = "~" },
+        untracked = { text = "┆" },
+    },
+    signs_staged = {
+        add = { text = "┃" },
+        change = { text = "┃" },
+        delete = { text = "_" },
+        topdelete = { text = "‾" },
+        changedelete = { text = "~" },
+        untracked = { text = "┆" },
+    },
+    signs_staged_enable = true,
+    signcolumn = true,
+    numhl = false,
+    linehl = false,
+    word_diff = false,
+    watch_gitdir = {
+        follow_files = true,
+    },
+    auto_attach = true,
+    attach_to_untracked = false,
+    current_line_blame = false,
+    current_line_blame_opts = {
+        virt_text = true,
+        virt_text_pos = "eol",
+        delay = 1000,
+        ignore_whitespace = false,
+        virt_text_priority = 100,
+        use_focus = true,
+    },
+    current_line_blame_formatter = "<author>, <author_time:%R> - <summary>",
+    blame_formatter = nil,
+    sign_priority = 6,
+    update_debounce = 100,
+    status_formatter = nil,
+    max_file_length = 40000,
+    preview_config = {
+        style = "minimal",
+        relative = "cursor",
+        row = 0,
+        col = 1,
+    },
+}

lua/config/lspconfig.lua

@@ -3,8 +3,10 @@ local cmp_cap = require("config.cmp").capabilities
 local servers = {
     "zls",
     "ts_ls",
+    "eslint",
     "yamlls",
     "vimls",
+    "ruff",
     "pyright",
     "denols",
     "lua_ls",
@@ -17,13 +19,12 @@ local servers = {
     "nginx_language_server",
     "docker_compose_language_service",
     "dockerls",
-    "rust_analyzer",
     "html",
     "cssls",
     "tailwindcss",
     "jdtls",
-    "odinls",
     "powershell_es",
+    "rust_analyzer",
 }
 
 for _, server in ipairs(servers) do
@@ -32,3 +33,28 @@ for _, server in ipairs(servers) do
     })
     vim.lsp.enable(server)
 end
+
+vim.lsp.config("powershell_es", {
+    capabilities = cmp_cap,
+    bundle_path = "/opt/powershell-editor-services",
+})
+
+vim.lsp.config("rust_analyzer", {
+    capabilities = cmp_cap,
+    settings = {
+        ["rust-analyzer"] = {
+            check = {
+                command = "clippy",
+                trigger = "onType",
+            },
+        },
+    },
+})
+
+vim.lsp.config("eslint", {
+    settings = {
+        experimental = {
+            useFlatConfig = true,
+        },
+    },
+})

lua/config/neoformat.vim

@@ -0,0 +1,11 @@
+let g:neoformat_enabled_yaml = ['prettierd']
+
+let g:neoformat_ps1_psscriptanalyzer = {
+    \ 'exe': 'pwsh',
+    \ 'args': ['-NoProfile', '-Command',
+    \           '"Import-Module (Resolve-Path \"/opt/powershell-editor-services/PSScriptAnalyzer/*/PSScriptAnalyzer.psd1\" | Select-Object -ExpandProperty Path); Invoke-Formatter -ScriptDefinition (\$input | Out-String)"'],
+    \ 'stdin': 1,
+    \ }
+let g:neoformat_enabled_ps1 = ['psscriptanalyzer']
+
+let g:neoformat_enabled_qml = ['qmlformat']

lua/config/neorg.lua

@@ -1,5 +0,0 @@
-require("neorg").setup {
-    load = {
-        ["core.defaults"] = {},
-    },
-}

lua/config/render-markdown.lua

@@ -1,55 +1,55 @@
 local opts = {}
 
 opts = {
-  file_types = { "markdown" },
+    file_types = { "markdown" },
-  completions = {
+    completions = {
-    lsp = {
+        lsp = {
-      enabled = true,
+            enabled = true,
+        },
     },
-  },
+    render_modes = true,
-  render_modes = true,
 
-  anti_conceal = {
+    anti_conceal = {
-    enabled = true,
+        enabled = true,
-    above = 1,
+        above = 1,
-    below = 1,
+        below = 1,
-  },
+    },
 
-  code = {
+    code = {
-    enabled = true,
+        enabled = true,
-    render_modes = false,
+        render_modes = false,
-    sign = true,
+        sign = true,
-    conceal_delimiters = true,
+        conceal_delimiters = true,
-    language = true,
+        language = true,
-    position = "left",
+        position = "left",
-    language_icon = true,
+        language_icon = true,
-    language_name = true,
+        language_name = true,
-    language_info = true,
+        language_info = true,
-    language_pad = 0,
+        language_pad = 0,
-    width = "full",
+        width = "full",
-    left_margin = 0,
+        left_margin = 0,
-    left_pad = 2,
+        left_pad = 2,
-    right_pad = 0,
+        right_pad = 0,
-    min_width = 40,
+        min_width = 40,
-    border = "thick",
+        border = "thick",
-    language_border = "█",
+        language_border = "█",
-    language_left = "",
+        language_left = "",
-    language_right = "",
+        language_right = "",
-    above = "▄",
+        above = "▄",
-    below = "▀",
+        below = "▀",
-    inline = true,
+        inline = true,
-    inline_left = "",
+        inline_left = "",
-    inline_right = "",
+        inline_right = "",
-    inline_pad = 0,
+        inline_pad = 0,
-    priority = 140,
+        priority = 140,
-    highlight = "RenderMarkdownCode",
+        highlight = "RenderMarkdownCode",
-    highlight_info = "RenderMarkdownCodeInfo",
+        highlight_info = "RenderMarkdownCodeInfo",
-    highlight_language = nil,
+        highlight_language = nil,
-    highlight_border = "RenderMarkdownCodeBorder",
+        highlight_border = "RenderMarkdownCodeBorder",
-    highlight_fallback = "RenderMarkdownCodeFallback",
+        highlight_fallback = "RenderMarkdownCodeFallback",
-    highlight_inline = "RenderMarkdownCodeInline",
+        highlight_inline = "RenderMarkdownCodeInline",
-    style = "full",
+        style = "full",
-  },
+    },
 }
 
 return opts

lua/config/telescope.lua

@@ -1 +1,14 @@
+if not vim.F then
+    vim.F = {}
+end
+
+if not vim.F.if_nil and not vim.nonnil then
+    vim.F.if_nil = function(value, default)
+        if value == nil then
+            return default
+        end
+        return value
+    end
+end
+
 require("telescope").setup {}

lua/config/undotree.lua

@@ -12,13 +12,13 @@ require("undotree").setup {
     },
     window = { winblend = 30 },
     keymaps = {
-        ["j"] = "move_next",
+        ["move_next"] = "j",
-        ["k"] = "move_prev",
+        ["move_prev"] = "k",
-        ["gj"] = "move2parent",
+        ["move2parent"] = "gj",
-        ["J"] = "move_change_next",
+        ["move_change_next"] = "J",
-        ["K"] = "move_change_prev",
+        ["move_change_prev"] = "K",
-        ["<cr>"] = "action_enter",
+        ["action_enter"] = "<cr>",
-        ["p"] = "enter_diffbuf",
+        ["enter_diffbuf"] = "p",
-        ["q"] = "quit",
+        ["quit"] = "q",
     },
 }

lua/mappings.lua

@@ -8,10 +8,14 @@ end)
 map(
     "n",
     "<leader>ff",
-    "<cmd>lua require'telescope.builtin'.find_files({ find_command = {'rg', '--files', '--hidden', '-g', '!.git' }})<cr>",
+    "<cmd>lua require('telescope.builtin').live_grep({ additional_args = function() return { '--hidden', '-g', '!.git' } end })<cr>",
     default_opts
 )
 
+map("n", "<leader>fn", "<Cmd>Telescope find_files<CR>")
+
+map("n", "<leader>ww", "<Cmd>lua vim.diagnostic.open_float()<CR>")
+
 map({ "n", "v" }, "<leader>ap", require("actions-preview").code_actions)
 
 map("n", "<Tab>", "<Cmd>BufferLineCycleNext<CR>")

lua/options.lua

@@ -1,4 +1,4 @@
-vim.opt.spelllang = { "en_us", "nl"}
+vim.opt.spelllang = { "en_us", "nl" }
 vim.opt.spell = true
 vim.opt.relativenumber = true
 vim.opt.tabstop = 4

lua/plugins/init.lua

@@ -1,4 +1,13 @@
 return {
+    {
+        "mg979/vim-visual-multi",
+    },
+    {
+        "lewis6991/gitsigns.nvim",
+        config = function()
+            require "gitsigns"
+        end,
+    },
     { "vimpostor/vim-tpipeline" },
     {
         "aznhe21/actions-preview.nvim",