added yanky

home/extra/neovim/autocommands.nix

@@ -1,11 +1,5 @@
 {
   programs.nixvim.autoCmd = [
-    # Vertically center document when entering insert mode
-    {
-      event = "InsertEnter";
-      command = "norm zz";
-    }
-
     # Open help in a vertical split
     {
       event = "FileType";
@@ -21,7 +15,7 @@
         "latex"
         "markdown"
       ];
-      command = "setlocal spell spelllang=en,fr";
+      command = "setlocal spell spelllang=en,se";
     }
   ];
 }

home/extra/neovim/keymappings.nix

@@ -17,6 +17,7 @@
           inherit action key;
         })
         {
+          # "<C-c>" = "<cmd> %y+ <CR>";
           "<Space>" = "<NOP>";
 
           # Esc to clear search results
@@ -73,9 +74,18 @@
           "K" = ":m '<-2<CR>gv=gv";
           "J" = ":m '>+1<CR>gv=gv";
         };
+      insert =
+        lib.mapAttrsToList
+        (key: action: {
+          mode = "i";
+          inherit action key;
+        })
+        {
+          "<C-v>" = "<esc>p";
+        };
     in
       config.nixvim.helpers.keymaps.mkKeymaps
       {options.silent = true;}
-      (normal ++ visual);
+      (normal ++ visual ++ insert);
   };
 }

home/extra/neovim/options.nix

@@ -37,10 +37,10 @@
       smartcase = true; # Override the 'ignorecase' option if the search pattern contains upper
       #   case characters
       scrolloff = 8; # Number of screen lines to show around the cursor
-      cursorline = false; # Highlight the screen line of the cursor
+      cursorline = true; # Highlight the screen line of the cursor
       cursorcolumn = false; # Highlight the screen column of the cursor
       signcolumn = "yes"; # Whether to show the signcolumn
-      colorcolumn = "100"; # Columns to highlight
+      colorcolumn = ""; # Columns to highlight
       laststatus = 3; # When to use a status line for the last window
       fileencoding = "utf-8"; # File-content encoding for the current buffer
       termguicolors = true; # Enables 24-bit RGB color in the |TUI|

home/extra/neovim/plugins/conform.nix

@@ -1,5 +1,5 @@
 {
-  plugins.conform-nvim = {
+  programs.nixvim.plugins.conform-nvim = {
     enable = true;
     formatOnSave = {
       lspFallback = true;

home/extra/neovim/plugins/default.nix

@@ -1,5 +1,4 @@
-{pkgs, ...}:
+{pkgs, ...}: {
-{
   imports = [
     ./barbar.nix
     ./comment.nix
@@ -17,10 +16,10 @@
     ./vimtex.nix
     ./nonels.nix
     ./conform.nix
+    ./yanky.nix
   ];
 
   programs.nixvim = {
-
     extraPlugins = [pkgs.vimPlugins.gruvbox-material];
     colorscheme = "gruvbox-material";
 

home/extra/neovim/plugins/lsp.nix

@@ -22,59 +22,63 @@
           };
         };
 
-    # Language server
+        # Language server
-      servers = {
+        servers = {
-        # Average webdev LSPs
+          # Average webdev LSPs
-        tsserver.enable = false; # TS/JS
+          cssls.enable = true; # CSS
-        cssls.enable = true; # CSS
+          tailwindcss.enable = true; # TailwindCSS
-        tailwindcss.enable = true; # TailwindCSS
+          html.enable = true; # HTML
-        html.enable = true; # HTML
+          astro.enable = true; # AstroJS
-        astro.enable = true; # AstroJS
+          phpactor.enable = true; # PHP
-        phpactor.enable = true; # PHP
+          svelte.enable = false; # Svelte
-        svelte.enable = false; # Svelte
+          vuels.enable = false; # Vue
-        vuels.enable = false; # Vue
 
-        # Python
+          # Python
-        pyright.enable = true;
+          pyright.enable = true;
 
-        # Markdown
+          # Markdown
-        marksman.enable = true;
+          marksman.enable = true;
 
-        # Nix
+          # Nix
-        nil-ls.enable = true;
+          nil-ls.enable = true;
 
-        # Docker
+          # Docker
-        dockerls.enable = true;
+          dockerls.enable = true;
 
-        # Bash
+          # Bash
-        bashls.enable = true;
+          bashls.enable = true;
 
-        # C/C++
+          # C/C++
-        clangd.enable = true;
+          clangd.enable = true;
 
-        # C#
+          # C#
-        csharp-ls.enable = true;
+          csharp-ls.enable = true;
 
-        # Lua
+          # Lua
-        lua-ls = {
+          lua-ls = {
-          enable = true;
+            enable = true;
-          settings.telemetry.enable = false;
+            settings.telemetry.enable = false;
-        };
+            settings.diagnostics = {
-
+              globals = ["vim"];
-        # Rust
+            };
-        rust-analyzer = {
+          };
-          enable = true;
+          tsserver = {
-          installRustc = true;
+            enable = false; # TS/JS
-          installCargo = true;
+          };
-          settings = {
+          # Rust
-            checkOnSave = true;
+          rust-analyzer = {
-            check = {
+            enable = true;
-              command = "clippy";
+            installRustc = true;
+            installCargo = true;
+            settings = {
+              checkOnSave = true;
+              check = {
+                command = "clippy";
+              };
             };
           };
         };
       };
     };
-    };
+  };
-};
 }

home/extra/neovim/plugins/lualine.nix

@@ -1,6 +1,7 @@
 {
   programs.nixvim.plugins.lualine = {
     enable = true;
+    theme = "gruvbox-material";
 
     globalstatus = true;
 

home/extra/neovim/plugins/nonels.nix

@@ -1,46 +1,44 @@
 {
-
+  programs.nixvim.plugins.none-ls = {
-programs.nixvim.plugins.none-ls = {
+    enable = true;
-      enable = true;
+    settings = {
-      settings = {
+      cmd = ["bash -c nvim"];
-        cmd = ["bash -c nvim"];
+      debug = true;
-        debug = true;
+    };
+    sources = {
+      code_actions = {
+        statix.enable = true;
+        gitsigns.enable = true;
       };
-      sources = {
+      diagnostics = {
-        code_actions = {
+        statix.enable = true;
-          statix.enable = true;
+        deadnix.enable = true;
-          gitsigns.enable = true;
+        pylint.enable = true;
+        checkstyle.enable = true;
+      };
+      formatting = {
+        alejandra.enable = true;
+        stylua.enable = true;
+        shfmt.enable = true;
+        nixpkgs_fmt.enable = true;
+        google_java_format.enable = false;
+        prettier = {
+          enable = true;
+          disableTsServerFormatter = true;
         };
-        diagnostics = {
+        black = {
-          statix.enable = true;
+          enable = true;
-          deadnix.enable = true;
+          withArgs = ''
-          pylint.enable = true;
+            {
-          checkstyle.enable = true;
+              extra_args = { "--fast" },
-        };
+            }
-        formatting = {
+          '';
-          alejandra.enable = true;
-          stylua.enable = true;
-          shfmt.enable = true;
-          nixpkgs_fmt.enable = true;
-          google_java_format.enable = false;
-          prettier = {
-            enable = true;
-            disableTsServerFormatter = true;
-          };
-          black = {
-            enable = true;
-            withArgs = ''
-              {
-                extra_args = { "--fast" },
-              }
-            '';
-
-          };
-        };
-        completion = {
-          luasnip.enable = true;
-          spell.enable = true;
         };
       };
+      completion = {
+        luasnip.enable = true;
+        spell.enable = true;
+      };
     };
-    }
+  };
+}

home/extra/neovim/plugins/yanky.nix

@@ -0,0 +1,5 @@
+{
+  programs.nixvim.plugins.yanky = {
+    enable = true;
+  };
+}