Update nvim

nix/flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750275572,
+        "lastModified": 1745810134,
-        "narHash": "sha256-upC/GIlsIgtdtWRGd1obzdXWYQptNkfzZeyAFWgsgf0=",
+        "narHash": "sha256-WfnYH/i7DFzn4SESQfWviXiNUZjohZhzODqLwKYHIPI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0f355844e54e4c70906b1ef5cc35a0047d666c04",
+        "rev": "be7cf1709b469a2a2c62169172a167d1fed3509f",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1749873626,
+        "lastModified": 1745816321,
-        "narHash": "sha256-1Mc/D/1RwwmDKY59f4IpDBgcQttxffm+4o0m67lQ8hc=",
+        "narHash": "sha256-Gyh/fkCDqVNGM0BWvk+4UAS17w2UI6iwnbQQCmc1TDI=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "2f140d6ac8840c6089163fb43ba95220c230f22b",
+        "rev": "4515dacafb0ccd42e5395aacc49fd58a43027e01",
         "type": "github"
       },
       "original": {
@@ -42,11 +42,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1750134718,
+        "lastModified": 1745526057,
-        "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
+        "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
+        "rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
         "type": "github"
       },
       "original": {

nix/flake.nix

@@ -13,7 +13,8 @@
 
   outputs = { self, nix-darwin, nixpkgs, home-manager, ... }:
     let
-      system = "x86_64-darwin";
+      #system = "x86_64-darwin";
+      system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
 
       configuration = { pkgs, ... }: {
@@ -60,6 +61,7 @@
             ./user/task_home.nix
           ];
         };
+
         "martin" = home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
 
@@ -69,6 +71,7 @@
             ./user/task_home.nix
           ];
         };
+
         "pan" = home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
 

nix/user/dev.nix

@@ -7,7 +7,9 @@
     nix-direnv.enable = true;
   };
 
-  home.packages = with pkgs; [
+  programs.ripgrep.enable = true;
-    visidata
+
-  ];
+  # home.packages = with pkgs; [
+  #   harlequin
+  # ];
 }

nix/user/git.nix

@@ -61,19 +61,4 @@
       ".envrc"
     ];
   };
-
-  programs.lazygit = {
-    enable = true;
-    settings = {
-      theme.lightTheme = "true";
-      git = {
-        log = {
-          format = "%C(yellow)%h%Creset %C(bold blue)<%an>%Creset %s %Cgreen(%cr)%Creset";
-          graph = "true";
-        };
-      };
-    };
-  };
-
-  programs.jujutsu.enable = true;
 }

nix/user/nvim.nix

@@ -8,37 +8,26 @@
     vimAlias = true;
 
     plugins = with pkgs.vimPlugins; [
+      aerial-nvim
+      zen-mode-nvim
+      vim-commentary
       vim-repeat
       vim-surround
-      ts-comments-nvim
-      vim-fugitive
-      gitsigns-nvim
       nvim-tree-lua
       targets-vim
-      mini-pairs
+      delimitMate
-      mini-align
+      # vim-startify
-      mini-bracketed
-      mini-splitjoin
-      mini-move
-      mini-ai
-      mini-icons
-      flash-nvim
-      trouble-nvim
-      conform-nvim
-      nvim-lint
-      promise-async
-      nvim-ufo
       vim-windowswap
+      vim-nix
       plenary-nvim
       telescope-nvim
       telescope-fzf-native-nvim
-      telescope-ui-select-nvim
       yanky-nvim
       lualine-nvim
       undotree
-      luasnip
+      vim-vsnip
       nvim-cmp
-      cmp_luasnip
+      cmp-vsnip
       cmp-buffer
       cmp-path
       cmp-cmdline
@@ -50,24 +39,11 @@
       lspkind-nvim
       copilot-lua
       copilot-cmp
-      CopilotChat-nvim
-      bullets-vim
-      nvim-dap
-      nvim-nio
-      nvim-dap-ui
-      nvim-dap-virtual-text
-      nvim-dap-go
-      nvim-dap-python
-      nvim-dap-lldb
-      todo-comments-nvim
-      vim-markdown
-      zen-mode-nvim
-      plantuml-syntax
-      obsidian-nvim
-      render-markdown-nvim
       image-nvim
       img-clip-nvim
-      vim-nix
+      markdown-preview-nvim
+      vim-markdown
+      bullets-vim
       (nvim-treesitter.withPlugins (p: [ p.awk p.bash p.c p.c_sharp p.cpp p.css p.diff p.dockerfile p.doxygen p.git_config p.gitcommit p.go p.gomod p.gosum p.gotmpl p.helm p.haskell p.html p.http p.java p.javascript p.json p.latex p.lua p.markdown p.markdown_inline p.matlab p.nix p.printf p.python p.regex p.rust p.sql p.strace p.supercollider p.svelte p.swift p.terraform p.tmux p.toml p.typescript p.vim p.xml p.yaml p.zig ]))
     ];
 
@@ -79,7 +55,6 @@
       (lib.strings.fileContents ../../nvim/base.lua)
       (lib.strings.fileContents ../../nvim/keymaps.lua)
       (lib.strings.fileContents ../../nvim/plugins.lua)
-      (lib.strings.fileContents ../../nvim/filetype.lua)
     ];
   };
 

nix/user/sh.nix

@@ -46,21 +46,10 @@
       };
     };
 
-    initContent = ''
+    initExtra = ''
       HISTCONTROL='erasedups:ignoreboth'
       HISTIGNORE='&:[ ]*:exit:ls:bg:fg:history:clear'
       unsetopt beep
-
-      if [[ "$(uname -s)" == "Darwin" ]]; then
-        export RUSTUP_HOME="$HOME/.rustup"
-        export CARGO_HOME="$HOME/.cargo"
-        [ -f "$CARGO_HOME/env" ] && . "$CARGO_HOME/env"
-      fi;
-      if [[ "$(uname -r)" == *Microsoft* ]]; then
-        if command -v tmuxp &> /dev/null && [ -z "$TMUX" ]; then
-          tmuxp load --yes misc
-        fi
-      fi; 
     '';
   };
 
@@ -71,6 +60,7 @@
 
   programs.lsd = {
     enable = true;
+    # enableAliases = true;
     enableZshIntegration = true;
   };
 
@@ -84,18 +74,13 @@
 
   programs.bat.enable = true;
   programs.ripgrep.enable = true;
-  programs.btop.enable = true;
-  programs.ranger.enable = true;
 
   home.packages = with pkgs; [
     fd
     du-dust
     glow
     ripgrep-all
-    viddy
+    (python3.withPackages (ps: [ ps.llm ps.llm-gemini]))
-    duf
-    (python3.withPackages(ps: [ ps.llm ps.llm-gemini ]))
-    #nerdfonts
   ];
 
   home.sessionVariables = lib.mkMerge [ {
@@ -103,15 +88,8 @@
     }
   ];
 
-  home.shellAliases = lib.mkMerge [
+  home.shellAliases = lib.mkMerge [ {
-    {
-      lst = "lsd --tree";
-    }
-
-    # This is the correct way to use lib.mkIf within lib.mkMerge
-    # (lib.mkIf pkgs.stdenv.targetPlatform.isWindows {
-    (lib.mkIf (lib.strings.hasSuffix "windows" pkgs.system) {
       open = "explorer.exe .";
-    })
+    }
   ];
 }

nix/user/tmux.nix

@@ -25,12 +25,6 @@
       bind % split-window -h -c "#{pane_current_path}"
       bind c new-window -a -c "#{pane_current_path}"
 
-      bind C-s display-popup -E "zsh ~/bin/tmuxp_selector.sh"
-      bind C-g display-popup -E -d "#{pane_current_path}" -xC -yC -w 95% -h 95% "lazygit"
-      bind C-t display-popup -E -xC -yC -w 95% -h 95% "tasksquire"
-      bind C-n display-popup -E -xC -yC -w 95% -h 95% "vim /mnt/c/Users/marti/Documents/notes/Work/quick_notes.md"
-      bind C-m display-popup -E -xC -yC -w 95% -h 95% "vim /mnt/c/Users/marti/Documents/notes/Work/mbpr.md"
-
       #######################################
       # status line
       #######################################

nvim/base.lua

@@ -7,8 +7,8 @@ vim.g.loaded_netrwPlugin = 1
 vim.opt.mouse = 'a'
 vim.opt.history = 1000
 vim.opt.ruler = true
+vim.opt.ruler = true
 vim.opt.number = true
-vim.opt.relativenumber = true
 vim.opt.showcmd = true
 vim.opt.ttimeoutlen = 100
 vim.opt.backspace = 'indent,eol,start'
@@ -26,8 +26,7 @@ vim.opt.smartcase = true
 vim.opt.hidden = true
 vim.opt.splitright = true
 vim.opt.splitbelow = true
-vim.opt.swapfile = true
+vim.opt.swapfile = false
-vim.opt.directory= '~/.cache/nvim/swap//,$TEMP//,/tmp//'
 vim.opt.wildmode = 'longest,list'
 vim.opt.wildignore = vim.opt.wildignore + 'main,*.o,*.d,*.aux,*.bbl,*.lof,*.loa,*.blg,*.fdb_latexmk,*.fls,*.tdo,*.pdf,*.pyc'
 vim.opt.spell = false
@@ -38,7 +37,7 @@ vim.opt.lazyredraw = true
 vim.opt.listchars = 'eol:¬,tab:▸ ,trail:·'
 vim.opt.fillchars = 'vert:|,fold: '
 vim.opt.list = true
-vim.opt.laststatus = 3
+vim.opt.laststatus = 2
 vim.opt.scrolloff = 8
 vim.opt.background = 'light'
 vim.opt.wrap = true
@@ -51,7 +50,6 @@ vim.opt.syntax = 'on'
 vim.opt.encoding = 'utf-8'
 vim.opt.completeopt = 'menu,menuone,noselect'
 vim.opt.termguicolors = true
-vim.opt.conceallevel = 1
 
 
 ----------------------------
@@ -84,11 +82,11 @@ vim.api.nvim_create_autocmd({'FocusGained', 'BufEnter', 'CursorMoved', 'CursorMo
    command = 'silent! checktime'
 })
 
--- vim.api.nvim_create_autocmd('BufEnter', {
+vim.api.nvim_create_autocmd('BufEnter', {
---    group = 'VimIntern',
+   group = 'VimIntern',
---    pattern = '*',
+   pattern = '*',
---    command = 'silent! lcd %:p:h'
+   command = 'silent! lcd %:p:h'
--- })
+})
 
 -- Open nvim-tree when starting Neovim in a specific directory or any of its subdirectories
 vim.api.nvim_create_autocmd("VimEnter", {
@@ -133,50 +131,3 @@ vim.api.nvim_create_user_command('TrimWhiteSpace', function()
    vim.cmd('%s/\\s\\+$//e')
 end, {})
 
-local function ToggleDiagnostics()
-  vim.diagnostic.enable(not vim.diagnostic.is_enabled())
-  if vim.diagnostic.is_enabled() then
-    print("Diagnostics enabled")
-  else
-    print("Diagnostics disabled")
-  end
-end
-
-
----------------------------
-------- DIAGNOSTICS -------
----------------------------
-
-vim.diagnostic.config({
-  update_in_insert = true,
-  signs = true,
-  virtual_text = {
-    prefix = '● ',
-    current_line = false,
-    severity = {
-      -- min = vim.diagnostic.severity.INFO,
-      max = vim.diagnostic.severity.INFO,
-    },
-  },
-  virtual_lines = {
-    current_line = false,
-    severity = {
-      min = vim.diagnostic.severity.WARN,
-      -- max = vim.diagnostic.severity.WARN,
-    },
-  },
-  float = {
-    prefix = '',
-    focusable = false,
-    style = "minimal",
-    border = "rounded",
-    source = "always",
-    header = "",
-  },
-})
-
-vim.cmd([[highlight DiagnosticUnderlineError gui=undercurl guifg=Red]])
-vim.cmd([[highlight DiagnosticUnderlineWarn gui=undercurl guifg=Yellow]])
-vim.cmd([[highlight DiagnosticUnderlineInfo gui=undercurl guifg=Blue]])
-vim.cmd([[highlight DiagnosticUnderlineHint gui=undercurl guifg=Cyan]])
-

nvim/filetype.lua

@@ -1,153 +0,0 @@
-local capabilities = require('cmp_nvim_lsp').default_capabilities()
-local lspconfig = require("lspconfig")
-
-vim.api.nvim_create_augroup('FileTypeConfigs', { clear = true })
-
-vim.api.nvim_create_autocmd('FileType', {
-  group = 'FileTypeConfigs',
-  pattern = 'python',
-  callback = function()
-    require('dap-python').setup()
-    -- lspconfig.pyright.setup({ capabilities = capabilities })
-    -- require("conform").setup({
-    --   python = {"black"},
-    -- })
-  end,
-})
-
--- vim.api.nvim_create_autocmd('FileType', {
---   group = 'FileTypeConfigs',
---   pattern = 'go',
---   callback = function()
--- require('dap-python').setup()
--- require('dap-go').setup()
-
-lspconfig.ruff.setup({ capabilities = capabilities })
-lspconfig.gopls.setup({ capabilities = capabilities })
-lspconfig.marksman.setup({ capabilities = capabilities })
-lspconfig.rust_analyzer.setup({
-  capabilities = capabilities,
-  settings = {
-  ["rust-analyzer"] = {
-    checkOnSave = {
-      command = "clippy",
-    },
-  },
-  },
-})
-lspconfig.dockerls.setup({ capabilities = capabilities })
-lspconfig.docker_compose_language_service.setup({ capabilities = capabilities })
-lspconfig.clangd.setup({ capabilities = capabilities })
-lspconfig.sqls.setup({ capabilities = capabilities })
-lspconfig.zls.setup({ capabilities = capabilities })
-lspconfig.omnisharp.setup({ capabilities = capabilities })
-lspconfig.yamlls.setup({ capabilities = capabilities })
-
-require("conform").setup({
-  go = {"gofmt"},
-  python = {"black"},
-  rust = {"rustfmt"},
-})
---   end,
--- })
-
--- vim.api.nvim_create_autocmd('FileType', {
---   group = 'FileTypeConfigs',
---   pattern = 'rust',
---   callback = function()
---     require('dap-python').setup()
---
---     lspconfig.rust_analyzer.setup({
---       capabilities = capabilities,
---       settings = {
---       ["rust-analyzer"] = {
---         checkOnSave = {
---           command = "clippy",
---         },
---       },
---       },
---     })
---
---     require("conform").setup({
---       rust = {"rustfmt"},
---     })
---   end,
--- })
-
--- vim.api.nvim_create_autocmd('FileType', {
---   group = 'FileTypeConfigs',
---   pattern = 'markdown',
---   callback = function()
---     lspconfig.marksman.setup({ capabilities = capabilities })
---   end,
--- })
---
--- vim.api.nvim_create_autocmd('FileType', {
---   group = 'FileTypeConfigs',
---   pattern = 'dockerfile',
---   callback = function()
---     lspconfig.dockerls.setup({ capabilities = capabilities })
---     lspconfig.docker_compose_language_service.setup({ capabilities = capabilities })
---   end,
--- })
---
--- vim.api.nvim_create_autocmd('FileType', {
---   group = 'FileTypeConfigs',
---   pattern = 'cs',
---   callback = function()
---     lspconfig.omnisharp.setup({ capabilities = capabilities })
---   end,
--- })
---
--- vim.api.nvim_create_autocmd('FileType', {
---   group = 'FileTypeConfigs',
---   pattern = 'yaml',
---   callback = function()
---     lspconfig.yamlls.setup({ capabilities = capabilities })
---     lspconfig.docker_compose_language_service.setup({ capabilities = capabilities })
---   end,
--- })
-
--- vim.api.nvim_create_autocmd('FileType', {
---   group = 'FileTypeConfigs',
---   pattern = {'c', 'cpp', 'objc', 'objcpp'},
---   callback = function()
---     lspconfig.clangd.setup({ capabilities = capabilities })
---   end,
--- })
---
--- vim.api.nvim_create_autocmd('FileType', {
---   group = 'FileTypeConfigs',
---   pattern = 'sql',
---   callback = function()
---     lspconfig.sqls.setup({ capabilities = capabilities })
---   end,
--- })
---
--- vim.api.nvim_create_autocmd('FileType', {
---   group = 'FileTypeConfigs',
---   pattern = 'zig',
---   callback = function()
---     lspconfig.zls.setup({ capabilities = capabilities })
---   end,
--- })
---
-local get_datetime = function()
-  return os.date("%Y-%m-%d %H:%M")
-end
-
-local ls = require('luasnip')
-ls.add_snippets("markdown", {
-  ls.snippet("mindful", {
-    -- Inserts the output of the get_datetime function as static text
-    ls.function_node(get_datetime, {}),
-    ls.text_node(" -- "),
-    ls.insert_node(1, "project"),
-    ls.text_node(" -- "),
-    ls.insert_node(2, "mode"),
-    ls.text_node(" -- "),
-    ls.insert_node(3, "description"),
-  }, {
-    descr = "Mindful of distractions",
-  }),
-})

nvim/keymaps.lua

@@ -1,26 +1,15 @@
 vim.g.mapleader = " "
 
 -- Navigation
-vim.keymap.set({'n', 'v'}, 'j', 'gj', {})
+vim.keymap.set('n', 'j', 'gj', {})
-vim.keymap.set({'n', 'v'}, 'k', 'gk', {})
+vim.keymap.set('n', 'k', 'gk', {})
+vim.keymap.set('v', 'j', 'gj', {})
+vim.keymap.set('v', 'k', 'gk', {})
 
-vim.keymap.set('n', '<C-M-h>', '<C-w>h', {})
+vim.keymap.set('n', '<C-h>', '<C-w>h', {})
-vim.keymap.set('n', '<C-M-j>', '<C-w>j', {})
+vim.keymap.set('n', '<C-j>', '<C-w>j', {})
-vim.keymap.set('n', '<C-M-k>', '<C-w>k', {})
+vim.keymap.set('n', '<C-k>', '<C-w>k', {})
-vim.keymap.set('n', '<C-M-l>', '<C-w>l', {})
+vim.keymap.set('n', '<C-l>', '<C-w>l', {})
-vim.keymap.set('t', '<C-M-h>', '<C-\\><C-n><C-w>h', {})
-vim.keymap.set('t', '<C-M-j>', '<C-\\><C-n><C-w>j', {})
-vim.keymap.set('t', '<C-M-k>', '<C-\\><C-n><C-w>k', {})
-vim.keymap.set('t', '<C-M-l>', '<C-\\><C-n><C-w>l', {})
-vim.keymap.set('n', '<leader>zm', '<C-W>_<C-W>|', { noremap = true, silent = true })
-vim.keymap.set('n', '<C-M-Y>', '<C-w>5<', {})
-vim.keymap.set('n', '<C-M-U>', '<C-w>5+', {})
-vim.keymap.set('n', '<C-M-I>', '<C-w>5-', {})
-vim.keymap.set('n', '<C-M-O>', '<C-w>5>', {})
-vim.keymap.set('t', '<C-M-Y>', '<C-\\><C-n><C-w>5<', {})
-vim.keymap.set('t', '<C-M-U>', '<C-\\><C-n><C-w>5+', {})
-vim.keymap.set('t', '<C-M-I>', '<C-\\><C-n><C-w>5-', {})
-vim.keymap.set('t', '<C-M-O>', '<C-\\><C-n><C-w>5>', {})
 
 vim.keymap.set('n', '<leader>s', ':call WindowSwap#EasyWindowSwap()<CR>', {})
 
@@ -37,62 +26,6 @@ vim.keymap.set('n', '<leader>fs', telebuiltin.grep_string, { silent = true })
 vim.keymap.set('n', '<leader>o', telebuiltin.buffers, { silent = true })
 vim.keymap.set('n', '<leader>fh', telebuiltin.help_tags, { silent = true })
 
--- Code
-vim.keymap.set('n', '<leader>cs', '<cmd>Trouble symbols toggle focus=true win.position=right<cr>')
-vim.keymap.set('n', '<leader>cl', '<cmd>Trouble lsp toggle focus=true win.position=right<cr>')
-vim.keymap.set('n', '<leader>cd', '<cmd>Trouble diagnostics toggle focus=true win.position=bottom<cr>')
-vim.keymap.set('n', '<leader>cq', '<cmd>Trouble quickfix toggle focus=true win.position=bottom<cr>')
-vim.keymap.set('n', '<leader>cr', vim.lsp.buf.rename, { desc = 'LSP Rename' })
-vim.keymap.set('n', '<leader>ct', vim.lsp.buf.type_definition, { desc = 'LSP Type Definition' })
-vim.keymap.set('n', '<leader>cF', require("conform").format, { desc = 'LSP Format' })
-vim.keymap.set('n', '<leader>cgi', vim.lsp.buf.implementation, { desc = 'LSP Implementation' })
-vim.keymap.set('n', '<leader>cgd', vim.lsp.buf.definition, { desc = 'LSP Definition' })
-vim.keymap.set('n', '<leader>cgD', vim.lsp.buf.declaration, { desc = 'LSP Declaration' })
-vim.keymap.set('n', '<leader>cwa', vim.lsp.buf.add_workspace_folder, { desc = 'LSP Add Workspace Folder' })
-vim.keymap.set('n', '<leader>cwl', vim.lsp.buf.list_workspace_folders, { desc = 'LSP List Workspace Folders' })
-vim.keymap.set('n', '<leader>cwr', vim.lsp.buf.remove_workspace_folder, { desc = 'LSP Remove Workspace Folder' })
-vim.keymap.set('n', '<leader>cws', vim.lsp.buf.workspace_symbol, { desc = 'LSP Workspace Symbol' })
-vim.keymap.set('n', '<leader>ch', vim.lsp.buf.hover, { desc = 'LSP Hover' })
-vim.keymap.set('n', '<leader>cH', vim.lsp.buf.signature_help, { desc = 'LSP Signature Help' })
-vim.keymap.set({ 'n', 'v' }, '<leader>ca', vim.lsp.buf.code_action, { desc = 'LSP Code Action' })
-vim.keymap.set('n', '<leader>cde', ToggleDiagnostics, { desc = 'Toggle Diagnostics' })
-vim.keymap.set('n', '<leader>cf', 
-  function()
-    local word = vim.fn.expand("<cword>")
-    require('telescope.builtin').live_grep({
-      default_text = word,
-    })
-  end
-)
-vim.keymap.set('v', '<leader>cf', 
-  function()
-    require('telescope.builtin').grep_string()
-  end
-)
-
--- Copilot
-local cop = require('copilot.panel')
-local cos = require('copilot.suggestion')
-
-vim.keymap.set('n', '<leader>ap', cop.toggle)
-vim.keymap.set('n', '<leader>apn', cop.jump_next)
-vim.keymap.set('n', '<leader>app', cop.jump_prev)
-vim.keymap.set('n', '<leader>apr', cop.refresh)
-
--- vim.keymap.set('n', '<leader>as', cos.accept)
--- vim.keymap.set('n', '<leader>ast', cos.toggle_auto_trigger)
--- vim.keymap.set('n', '<leader>asl', cos.accept_word)
--- vim.keymap.set('n', '<leader>asw', cos.accept_line)
--- vim.keymap.set('n', '<leader>asn', cos.next)
--- vim.keymap.set('n', '<leader>asp', cos.prev)
--- vim.keymap.set('n', '<leader>asd', cos.dismiss)
-
-vim.keymap.set('n', '<leader>ac', '<cmd>CopilotChatToggle<cr>')
-vim.keymap.set('n', '<leader>acs', '<cmd>CopilotChatStop<cr>')
-vim.keymap.set('n', '<leader>acr', '<cmd>CopilotChatReset<cr>')
-vim.keymap.set('n', '<leader>acm', '<cmd>CopilotChatModels<cr>')
-vim.keymap.set('n', '<leader>acp', '<cmd>CopilotChatPrompts<cr>')
-
 -- Yanky
 vim.keymap.set({"n","x"}, "p", "<Plug>(YankyPutAfter)")
 vim.keymap.set({"n","x"}, "P", "<Plug>(YankyPutBefore)")
@@ -105,27 +38,5 @@ vim.keymap.set({"n","x"}, "y", "<Plug>(YankyYank)")
 -- Undotree
 vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle)
 
--- DAP
+-- nnoremap <silent> <leader>t :CtrlPBufTagAll<CR>
-vim.keymap.set('n', "<Leader>db", function() require("dap").toggle_breakpoint() end)
+-- nnoremap <silent> <leader>T :TagbarToggle<CR>
-vim.keymap.set('n', "<leader>dB", function() require("dap").set_breakpoint(vim.fn.input('Breakpoint condition: ')) end)
-vim.keymap.set('n', "<leader>dc", function() require("dap").continue() end)
-vim.keymap.set('n', "<leader>da", function() require("dap").continue({ before = get_args }) end)
-vim.keymap.set('n', "<leader>dC", function() require("dap").run_to_cursor() end)
-vim.keymap.set('n', "<leader>dg", function() require("dap").goto_() end)
-vim.keymap.set('n', "<leader>di", function() require("dap").step_into() end)
-vim.keymap.set('n', "<leader>dj", function() require("dap").down() end)
-vim.keymap.set('n', "<leader>dk", function() require("dap").up() end)
-vim.keymap.set('n', "<leader>dl", function() require("dap").run_last() end)
-vim.keymap.set('n', "<leader>do", function() require("dap").step_over() end)
-vim.keymap.set('n', "<leader>dO", function() require("dap").step_out() end)
-vim.keymap.set('n', "<leader>dP", function() require("dap").pause() end)
-vim.keymap.set('n', "<leader>dr", function() require("dap").repl.toggle() end)
-vim.keymap.set('n', "<leader>ds", function() require("dap").session() end)
-vim.keymap.set('n', "<leader>dt", function() require("dap").terminate() end)
-vim.keymap.set('n', "<leader>dw", function() require("dap.ui.widgets").hover() end)
-
-vim.keymap.set('n', "<F5>", function() require("dap").continue() end)
-vim.keymap.set('n', "<F11>", function() require("dap").step_into() end)
-vim.keymap.set('n', "<F10>", function() require("dap").step_over() end)
-vim.keymap.set('n', "<F12>", function() require("dap").step_out() end)
-

nvim/plugins.lua

@@ -1,18 +1,5 @@
--- vim.g.delimitMate_expand_space=1
+vim.g.delimitMate_expand_space=1
--- vim.g.delimitMate_expand_cr = 1
+vim.g.delimitMate_expand_cr = 1
-
-require('mini.pairs').setup()
-require('mini.align').setup()
-require('mini.bracketed').setup()
-require('mini.splitjoin').setup()
-require('mini.move').setup()
-require('mini.move').setup()
-require('flash').setup()
-require('ts-comments').setup()
-
-local function is_wsl_env()
-    return os.getenv("WSL_DISTRO_NAME") ~= nil or os.getenv("WSL_INTEROP") ~= nil
-end
 
 vim.g.tagbar_left=1
 vim.g.tagbar_autoclose=1
@@ -22,12 +9,11 @@ vim.g.windowswap_map_keys=0
 
 local cmp = require('cmp')
 local lspkind = require('lspkind')
-local ls = require('luasnip')
 
 cmp.setup({
   snippet = {
     expand = function(args)
-      ls.lsp_expand(args.body)
+      vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
     end,
   },
 
@@ -36,60 +22,23 @@ cmp.setup({
     documentation = cmp.config.window.bordered(),
   },
 
-  -- mapping = cmp.mapping.preset.insert({
+  mapping = cmp.mapping.preset.insert({
-  --   -- ['<Tab>'] = cmp.mapping.confirm({ select = false }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-  -- }),
-  mapping = {
     ['<C-b>'] = cmp.mapping.scroll_docs(-4),
     ['<C-f>'] = cmp.mapping.scroll_docs(4),
     ['<C-Space>'] = cmp.mapping.complete(),
     ['<C-e>'] = cmp.mapping.abort(),
-    ['<CR>'] = cmp.mapping(function(fallback)
+    ['<Tab>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
-        if cmp.visible() then
+  }),
-          if cmp.get_selected_entry() then
-              if ls.expandable() then
-                  ls.expand()
-              else
-                  cmp.confirm({
-                      select = false,
-                  })
-              end
-          else
-              fallback()
-          end
-        else
-            fallback()
-        end
-    end),
-    ["<Tab>"] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_next_item()
-      elseif ls.locally_jumpable(1) then
-        ls.jump(1)
-      else
-        fallback()
-      end
-    end, { "i", "s" }),
-    ["<S-Tab>"] = cmp.mapping(function(fallback)
-      if cmp.visible() then
-        cmp.select_prev_item()
-      elseif ls.locally_jumpable(-1) then
-        ls.jump(-1)
-      else
-        fallback()
-      end
-    end, { "i", "s" }),
-  },
 
   sources = cmp.config.sources({
-    { name = 'nvim_lsp', priority = 1000 },
+    { name = 'nvim_lsp' },
-    { name = 'buffer', priority = 800, keyword_length = 2 },
+    { name = 'vsnip' },
-    { name = 'copilot', priority = 700 },
+    { name = 'path' },
-    { name = 'path', priority = 600 },
+    { name = 'cmp_yanky' },
-    { name = 'cmp_yanky', priority = 500 },
+    { name = 'git' },
-    { name = 'git', priority = 400 },
+    { name = 'copilot' },
-    { name = 'luasnip', priority = 300 },
+  -- }, {
-    { name = 'nvim_lua', priority = 200 },
+    { name = 'buffer', keyword_length = 2 },
   }),
 
   formatting = {
@@ -139,23 +88,18 @@ cmp.setup.cmdline(':', {
 
 local capabilities = require('cmp_nvim_lsp').default_capabilities()
 local lspconfig = require("lspconfig")
--- lspconfig.svelte.setup({ capabilities = capabilities })
+lspconfig.gopls.setup({ capabilities = capabilities })
--- lspconfig.flow.setup({ capabilities = capabilities })
+lspconfig.svelte.setup({ capabilities = capabilities })
--- lspconfig.nil_ls.setup({ capabilities = capabilities })
+lspconfig.pyright.setup({ capabilities = capabilities })
-
+lspconfig.omnisharp.setup({ capabilities = capabilities })
-capabilities.textDocument.foldingRange = {
+lspconfig.clangd.setup({ capabilities = capabilities })
-    dynamicRegistration = false,
+lspconfig.dockerls.setup({ capabilities = capabilities })
-    lineFoldingOnly = true
+lspconfig.docker_compose_language_service.setup({ capabilities = capabilities })
-}
+lspconfig.flow.setup({ capabilities = capabilities })
-
+lspconfig.marksman.setup({ capabilities = capabilities })
-local language_servers = vim.lsp.get_clients() -- or list servers manually like {'gopls', 'clangd'}
+lspconfig.sqls.setup({ capabilities = capabilities })
-for _, ls in ipairs(language_servers) do
+lspconfig.yamlls.setup({ capabilities = capabilities })
-    require('lspconfig')[ls].setup({
+lspconfig.nil_ls.setup({ capabilities = capabilities })
-        capabilities = capabilities
-        -- you can add other fields for setting up lsp server in this table
-    })
-end
-require('ufo').setup()
 
 require("yanky").setup({
   ring = {
@@ -172,15 +116,6 @@ require("yanky").setup({
   },
 })
 
-require("telescope").setup {
-  extensions = {
-    ["ui-select"] = {
-      require("telescope.themes").get_dropdown {
-      }
-    }
-  }
-}
-require("telescope").load_extension("ui-select")
 require("telescope").load_extension("yank_history")
 
 require'nvim-treesitter.configs'.setup {
@@ -217,7 +152,7 @@ require('lualine').setup({
     },
     ignore_focus = {},
     always_divide_middle = true,
-    globalstatus = true,
+    globalstatus = false,
     refresh = {
       statusline = 1000,
       tabline = 1000,
@@ -252,9 +187,6 @@ require("copilot").setup({
   panel = { enabled = false },
 })
 require("copilot_cmp").setup()
-require("CopilotChat").setup {
-  model = 'claude-3.7-sonnet',
-}
 
 vim.g.bullets_enabled_file_types = {
   'markdown',
@@ -278,188 +210,3 @@ require("nvim-tree").setup({
   --   dotfiles = true,
   -- },
 })
-
-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,  -- Toggle with `:Gitsigns toggle_signs`
-  numhl      = false, -- Toggle with `:Gitsigns toggle_numhl`
-  linehl     = false, -- Toggle with `:Gitsigns toggle_linehl`
-  word_diff  = false, -- Toggle with `:Gitsigns toggle_word_diff`
-  watch_gitdir = {
-    follow_files = true
-  },
-  auto_attach = true,
-  attach_to_untracked = false,
-  current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
-  current_line_blame_opts = {
-    virt_text = true,
-    virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
-    delay = 1000,
-    ignore_whitespace = false,
-    virt_text_priority = 100,
-    use_focus = true,
-  },
-  current_line_blame_formatter = '<author>, <author_time:%R> - <summary>',
-  sign_priority = 6,
-  update_debounce = 100,
-  status_formatter = nil, -- Use default
-  max_file_length = 40000, -- Disable if file is longer than this (in lines)
-  preview_config = {
-    -- Options passed to nvim_open_win
-    style = 'minimal',
-    relative = 'cursor',
-    row = 0,
-    col = 1
-  },
-}
-
-require("conform").setup({
-  formatters_by_ft = {
-    python = {"ruff_fix", "ruff_format", "ruff_organize_imports", lsp_format = "fallback"},
-    rust = {"rustfmt", lsp_format = "fallback"},
-    go = {"gofmt", "goimports", lsp_format = "fallback"},
-    lua = { "stylua", lsp_format = "fallback"},
-  },
-})
-require('lint').linters_by_ft = {
-  markdown = {'vale'},
-}
-require("trouble").setup()
-require("todo-comments").setup()
-
-require("dapui").setup()
-require("nvim-dap-virtual-text").setup()
-
-local dap, dapui = require("dap"), require("dapui")
-dap.listeners.before.attach.dapui_config = function()
-  dapui.open()
-end
-dap.listeners.before.launch.dapui_config = function()
-  dapui.open()
-end
-dap.listeners.before.event_terminated.dapui_config = function()
-  dapui.close()
-end
-dap.listeners.before.event_exited.dapui_config = function()
-  dapui.close()
-end
-
-dap.adapters.codelldb = {
-  type = 'server',
-  port = "${port}",
-  executable = {
-    command = "codelldb",
-    args = {"--port", "${port}"},
-  }
-}
-
-dap.configurations.zig = {
-  {
-    name = "Launch Zig Program",
-    type = "codelldb",
-    request = "launch",
-    program = function()
-      -- Prompts for the executable path when you start debugging
-      return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/zig-out/bin/', 'file')
-    end,
-    cwd = "${workspaceFolder}",
-    stopOnEntry = false,
-  },
-}
-
-if vim.fn.has("mac") then
-  workspaces = {
-    {
-      name = "privat",
-      path = "~/Documents/notes/privat",
-    },
-    {
-      name = "joplin",
-      path = "~/Documents/notes/fromjoplin",
-    },
-  }
-  daily_notes = {
-    folder = "Journal",
-    date_format = "%Y-%m-%d",
-    default_tags = { "journal" },
-    template = "daily.md"
-  }
-end
-
-if is_wsl_env() then
-  workspaces = {
-    {
-      name = "work",
-      path = "/mnt/c/Users/marti/Documents/notes/Work",
-    },
-    {
-      name = "privat",
-      path = "/mnt/c/Users/marti/Documents/notes/privat",
-    },
-  }
-  daily_notes = {}
-end
-
-require("obsidian").setup({
-  workspaces = workspaces,
-  templates = {
-      folder = "_templates",
-      date_format = "%Y-%m-%d %a",
-      time_format = "%H:%M",
-  },
-  ui = {
-  checkboxes = {
-      [" "] = { char = "󰄱", hl_group = "ObsidianTodo" },
-      [">"] = { char = "", hl_group = "ObsidianRightArrow" },
-      ["x"] = { char = "", hl_group = "ObsidianDone" },
-      ["~"] = { char = "󰰱", hl_group = "ObsidianTilde" },
-      ["!"] = { char = "", hl_group = "ObsidianImportant" },
-      ["?"] = { char = "?", hl_group = "ObsidianImportant" }
-    },
-  },
-  disable_frontmatter = false,
-  note_frontmatter_func = function(note)
-    -- Add the title of the note as an alias.
-    if note.title then
-      note:add_alias(note.title)
-    end
-
-    local out = { id = note.id, tags = note.tags }
-
-    if note.metadata ~= nil and not vim.tbl_isempty(note.metadata) then
-      for k, v in pairs(note.metadata) do
-        out[k] = v
-      end
-    end
-
-    return out
-  end,
-  note_path_func = function(spec)
-    local path = spec.dir / spec.title
-    return path:with_suffix(".md")
-  end,
-  daily_notes = daily_notes,
-})
-
-require('render-markdown').setup({
-  enabled = true,
-  file_types = { 'markdown'},
-  completions = { lsp = { enabled = true } },
-  render_modes = { 'n', 'c', 't' },
-})