Merge branch 'master' of https://git.roodletoof.org/roodletoof/dotfiles

nvim/.config/nvim/init.lua

@@ -47,6 +47,7 @@ vim.cmd [=[
     nnoremap ,x <C-x>
     nnoremap ,rl :checktime<CR>
     nnoremap ,m :wa<CR>:make<CR>
+    inoremap <c-k> <c-x>
 
     nnoremap ,cD :call setqflist(filter(getqflist(), 'v:val != getqflist()[getqflist({"idx": 0}).idx - 1]'))<CR>
 
@@ -303,6 +304,7 @@ do
         gcc={'*.c'},
         ['g++']={'*.cpp'},
         cargo={'Cargo.toml'},
+        zig={'*.zig'}
     }
 
     ---@param dir string?
@@ -402,7 +404,6 @@ require'lazy'.setup{ --{{{1
         ---@module 'oil'
         ---@type oil.SetupOpts
         opts = {},
-        dependencies = { { 'echasnovski/mini.icons', opts = {} } },
         lazy = false,
         config = function ()
             require('oil').setup({
@@ -574,12 +575,13 @@ require'lazy'.setup{ --{{{1
             require'mini.align'.setup()
         end,
     },
-    { 'miikanissi/modus-themes.nvim', --{{{2
+    { 'sainnhe/everforest', --{{{2
         lazy = false,
         priority = 1000,
         config = function()
             vim.o.termguicolors = true
-            vim.cmd.colorscheme('modus_vivendi')
+            vim.g.everforest_enable_italic = true
+            vim.cmd.colorscheme('everforest')
         end,
     },
     { 'folke/lazydev.nvim', --{{{2
@@ -674,6 +676,18 @@ require'lazy'.setup{ --{{{1
                 }
             }
 
+            do -- turtle config
+                local turtle_server = vim.fn.exepath("turtle-language-server")
+                local node = vim.fn.exepath("node")
+                if turtle_server ~= "" and node ~= "" then
+                    vim.lsp.config['turtle-language-server'] = {
+                        cmd={ node, turtle_server, '--stdio' },
+                        filetypes = { 'turtle', 'ttl' },
+                    }
+                    vim.lsp.enable('turtle-language-server')
+                end
+            end
+
             vim.lsp.enable('gdscript')
             vim.lsp.config('hls', {
                 filetypes = { 'haskell', 'lhaskell', 'cabal' },
@@ -854,7 +868,6 @@ require'lazy'.setup{ --{{{1
         dependencies = {
             'nvim-lua/plenary.nvim',
             'nvim-telescope/telescope-ui-select.nvim',
-            'kyazdani42/nvim-web-devicons',
         },
         config = function()
             local actions = require'telescope.actions'