- added lush for real time editing of themes

- fixed neogen keymap
- changed qwen2.5-codder to llama3 sinec qwen crashes out
- updated flake

config/options.nix

@@ -1,6 +1,6 @@
 { pkgs, ... }: {
-
   colorschemes.oxocarbon.enable = true;
+  #colorscheme = "shades_of_purple";
   colorscheme = "oxocarbon";
 
   opts = {
@@ -10,5 +10,28 @@
 
   # Set <Space> as leader
   globals.mapleader = " ";
+  autoCmd = [
+    # Start aw-watcher-vim on startup
+    {
+      command = ":'";
+      event = [
+        "VimEnter"
+      ];
+    }
+  ];
+  extraPlugins = with pkgs; [
+    {
+      plugin = pkgs.vimUtils.buildVimPlugin {
+        pname = "lush";
+        version = "1.0.0"; # dummy version
+        src = pkgs.fetchFromGitHub {
+          owner = "rktjmp";
+          repo = "lush.nvim";
+          rev = "45a79ec4acb5af783a6a29673a999ce37f00497e";
+          hash = "sha256-meUCXjJ9kHOOpRd4TR2dc7Ai97zOQX35hYFEDZseiSk=";
+        };
+      };
+    }
+  ];
 
 }

config/plugins/ai/default.nix

@@ -15,7 +15,7 @@
                   },
                   schema = {
                       model = {
-                          default = 'qwen2.5-coder:latest',
+                          default = 'llama3:8b',
                           -- default = "llama3.1:8b-instruct-q8_0",
                       },
                       num_ctx = {
@@ -46,4 +46,20 @@
       };
     };
   };
+
+  extraPlugins = with pkgs; [
+    {
+      # Rainbow parentheses
+      plugin = pkgs.vimUtils.buildVimPlugin {
+        pname = "rainbow";
+        version = "1.0.0"; # dummy version
+        src = pkgs.fetchFromGitHub {
+          owner = "luochen1990";
+          repo = "rainbow";
+          rev = "76ca1a20aa42edb5c65c19029968aad4625790dc";
+          hash = "sha256-dBHgAc3dOoeBI/lZzIJgYYTda8ZMvdThixUZebZXRHE=";
+        };
+      };
+    }
+  ];
 }

config/plugins/lsp/default.nix

@@ -6,6 +6,7 @@
   ];
 
   # Autocomplete
+  # TODO "ghost text" auto complete with code companion
   plugins.cmp = {
     enable = true;
     settings = {

config/plugins/lsp/neogen.nix

@@ -2,7 +2,7 @@
 
   plugins.neogen = {
     enable = true;
-    keymaps.generated = "<leader>ag";
+    keymaps.generate = "<leader>ag";
   };
 
 }

flake.lock

@@ -109,11 +109,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733318908,
-        "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=",
+        "lastModified": 1734279981,
+        "narHash": "sha256-NdaCraHPp8iYMWzdXAt5Nv6sA3MUzlCiGiR586TCwo0=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "6f4e2a2112050951a314d2733a994fbab94864c6",
+        "rev": "aa9f40c906904ebd83da78e7f328cd8aeaeae785",
         "type": "github"
       },
       "original": {
@@ -152,11 +152,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733484277,
-        "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
+        "lastModified": 1734093295,
+        "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
+        "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8",
         "type": "github"
       },
       "original": {
@@ -216,11 +216,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1733581040,
-        "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
+        "lastModified": 1734119587,
+        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
+        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
         "type": "github"
       },
       "original": {
@@ -244,11 +244,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1733392399,
-        "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=",
+        "lastModified": 1734119587,
+        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661",
+        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
         "type": "github"
       },
       "original": {
@@ -271,11 +271,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1733780592,
-        "narHash": "sha256-SCEjUwyt6R2+36BS7xQG+rHUrhE8HDpmRwQzKHJkimQ=",
+        "lastModified": 1734346666,
+        "narHash": "sha256-en0654KcOVZj0J3LVUzd/sbNkDSUZTWP2fHlnyfaXnc=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "cf7e026c8c86c5548d270e20c04f456939591219",
+        "rev": "76e9d89d96502a4ee8e1cd74a5b50077cf204134",
         "type": "github"
       },
       "original": {
@@ -294,11 +294,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733411491,
-        "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=",
+        "lastModified": 1733773348,
+        "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe",
+        "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9",
         "type": "github"
       },
       "original": {
@@ -337,11 +337,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733440889,
-        "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=",
+        "lastModified": 1733761991,
+        "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410",
+        "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085",
         "type": "github"
       },
       "original": {