Merge pull request #37 from NotAShelf/fixHomeManager

Fix home manager

docs/custom-configs.adoc

@@ -18,7 +18,10 @@ The following is an example of a barebones vim configuration with the default th
 [source,nix]
 ----
 {
-  inputs.neovim-flake.url = "github:jordanisaacs/neovim-flake";
+  inputs.neovim-flake = {
+    url = "github:notashelf/neovim-flake";
+    inputs.nixpkgs.follows = "nixpkgs";
+  };
 
   outputs = {nixpkgs, neovim-flake, ...}: let
     system = "x86_64-linux";
@@ -27,7 +30,9 @@ The following is an example of a barebones vim configuration with the default th
       # Add any custom options (and feel free to upstream them!)
       # options = ...
 
-      config.vim.theme.enable = true;
+      config.vim = {
+        theme.enable = true;
+      };
     };
 
     customNeovim = neovim-flake.lib.neovimConfiguration {

docs/home-manager.adoc

@@ -19,7 +19,7 @@ Followed by importing the HM module.
 [source,nix]
 ----
 {
-  imports = [ neovim-flake.nixosModules.hm-module ];
+  imports = [ neovim-flake.homeManagerModules.default ];
 }
 ----
 
@@ -29,7 +29,9 @@ Then we should be able to use the given module. E.g.
 ----
 {
   programs.neovim-flake = {
+
     enable = true;
+    # your settings need to go into the settings attrset
     settings = {
       vim.viAlias = false;
       vim.vimAlias = true;

flake.lock

@@ -3,11 +3,11 @@
     "alpha-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1677868849,
+        "lastModified": 1679422215,
-        "narHash": "sha256-230AM1W6S1zKhDsVACR3Zsw3WWo6X6OEXN6ur77kehs=",
+        "narHash": "sha256-jNJ/0ueUXgArpWHypIkNA4hKrwYjthva7gK9JuE4VWM=",
         "owner": "goolord",
         "repo": "alpha-nvim",
-        "rev": "4b0ba68022d8612b04b26844f1ce5e708c0d23b0",
+        "rev": "dafa11a6218c2296df044e00f88d9187222ba6b0",
         "type": "github"
       },
       "original": {
@@ -35,11 +35,11 @@
     "catppuccin": {
       "flake": false,
       "locked": {
-        "lastModified": 1677749356,
+        "lastModified": 1679888068,
-        "narHash": "sha256-AjXzNow5v/xFS+L6OfHbid1yPq8GbmNS0Nn0gILRnDI=",
+        "narHash": "sha256-UrHoESRYwALPo6LFFocEIM0CZa740tjxjvmYES7O5Rw=",
         "owner": "catppuccin",
         "repo": "nvim",
-        "rev": "e406cf07a1573c77ab83e142cc0d8c9d798d5c81",
+        "rev": "73587f9c454da81679202f1668c30fea6cdafd5e",
         "type": "github"
       },
       "original": {
@@ -147,11 +147,11 @@
     "cmp-treesitter": {
       "flake": false,
       "locked": {
-        "lastModified": 1666995820,
+        "lastModified": 1679830722,
-        "narHash": "sha256-+dOqV9QqN+s1no8vfL6DNeFBc2dYyduQqAH5zVwm3Rw=",
+        "narHash": "sha256-t1xEQn6NXcNG215ldm0ivKZdgaoGFwDiZUb8ROBeZHU=",
         "owner": "ray-x",
         "repo": "cmp-treesitter",
-        "rev": "b40178b780d547bcf131c684bc5fd41af17d05f2",
+        "rev": "c8e3a74b51597d69d240085a258636972ce98e15",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
     "colorizer": {
       "flake": false,
       "locked": {
-        "lastModified": 1677805707,
+        "lastModified": 1680271664,
-        "narHash": "sha256-OhZbK5igSDBS6Vk5qgW478M6ZXev+HECNT09NVTuBQg=",
+        "narHash": "sha256-UQwIf96eG79iEBDhQvfjByrAc+LXyKiT4EVrPe1+YmY=",
         "owner": "uga-rosa",
         "repo": "ccc.nvim",
-        "rev": "e66fd3a18eff0c9c4c772a5e5fd9ad68753c6d8e",
+        "rev": "3e07b8ffc9dab162cd2940e75601da75ed0cebbe",
         "type": "github"
       },
       "original": {
@@ -211,11 +211,11 @@
     "comment-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1676528587,
+        "lastModified": 1678452935,
-        "narHash": "sha256-SwN67ILsNJk0bNkcfQFiipAULaDxTfnCDHSC/+XKeLA=",
+        "narHash": "sha256-mVJJJ9fUJYgVyGZnW8e6P5QWB0K8nuhTwSWzlBvxv2M=",
         "owner": "numToStr",
         "repo": "Comment.nvim",
-        "rev": "6821b3ae27a57f1f3cf8ed030e4a55d70d0c4e43",
+        "rev": "8d3aa5c22c2d45e788c7a5fe13ad77368b783c20",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
     "copilot-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1677479736,
+        "lastModified": 1680027228,
-        "narHash": "sha256-n/SCrzzzL5WUHJk0sCXbgGusk/dQuy8DI9Pqdh+lVeQ=",
+        "narHash": "sha256-3u+2azMRm24mp5iOrxwYg9QrM2xJHnSjGsldIDRS6HQ=",
         "owner": "zbirenbaum",
         "repo": "copilot.lua",
-        "rev": "b41d4c9c7d4f5e0272bcf94061b88e244904c56f",
+        "rev": "f0b41fb89ef2ed7ab4e8cd5208a30755aa638fc4",
         "type": "github"
       },
       "original": {
@@ -243,11 +243,11 @@
     "crates-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1677075483,
+        "lastModified": 1680384424,
-        "narHash": "sha256-xarbPUL3yFMOn5Bse+syw1vLxqA/krS3tbuu/baup/k=",
+        "narHash": "sha256-0fgC3wEMc2fmxHPLHyt0UTdpvuAOkdhdfEDWJ6qA9Q0=",
         "owner": "Saecki",
         "repo": "crates.nvim",
-        "rev": "c33aae75745877ee1ef16f5781478f4f2f120623",
+        "rev": "097da7b79246247b8e660815c12908706031e09a",
         "type": "github"
       },
       "original": {
@@ -259,11 +259,11 @@
     "dashboard-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1677759071,
+        "lastModified": 1680074354,
-        "narHash": "sha256-FaiDd0IldvMVBD/oO+g1ti6jzhZ2UmnYnM2dA18Jo8E=",
+        "narHash": "sha256-V16XxNlFBGFtKsquqPy44+IFWiBZcs3OY/6SF+7bdrA=",
         "owner": "glepnir",
         "repo": "dashboard-nvim",
-        "rev": "42213650c278d007dd198a1d115394e85b406188",
+        "rev": "4c2b038c5cfa70f90506f1551e5fd2d040174e08",
         "type": "github"
       },
       "original": {
@@ -275,11 +275,11 @@
     "diffview-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1677593773,
+        "lastModified": 1680290718,
-        "narHash": "sha256-CMURShXn0RjZW3dc96o1usaLwWC+gOPAkIn3D9YPyBg=",
+        "narHash": "sha256-t4YC8xAjRA+6p7IPM71lL5wWY0pAwTqL7vom3cDSV44=",
         "owner": "sindrets",
         "repo": "diffview.nvim",
-        "rev": "009beb8054e510e7e2df122ee3ddb2b46bef542b",
+        "rev": "932d10de327bccdedee439d9d55f4d857caa334e",
         "type": "github"
       },
       "original": {
@@ -324,11 +324,11 @@
     "fidget-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1676661245,
+        "lastModified": 1679938700,
-        "narHash": "sha256-f49AwromG0rHZ5i1q4i6GJgLNtusa8QpciljL0dgSJo=",
+        "narHash": "sha256-rmJgfrEr/PYBq0S7j3tzRZvxi7PMMaAo0k528miXOQc=",
         "owner": "j-hui",
         "repo": "fidget.nvim",
-        "rev": "688b4fec4517650e29c3e63cfbb6e498b3112ba1",
+        "rev": "0ba1e16d07627532b6cae915cc992ecac249fb97",
         "type": "github"
       },
       "original": {
@@ -374,11 +374,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1677714448,
+        "lastModified": 1679737941,
-        "narHash": "sha256-Hq8qLs8xFu28aDjytfxjdC96bZ6pds21Yy09mSC156I=",
+        "narHash": "sha256-srSD9CwsVPnUMsIZ7Kt/UegkKUEBcTyU1Rev7mO45S0=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "dc531e3a9ce757041e1afaff8ee932725ca60002",
+        "rev": "3502ee99d6dade045bdeaf7b0cd8ec703484c25c",
         "type": "github"
       },
       "original": {
@@ -389,11 +389,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1676283394,
+        "lastModified": 1678901627,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
         "type": "github"
       },
       "original": {
@@ -435,11 +435,11 @@
     "gesture-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1677239871,
+        "lastModified": 1680321931,
-        "narHash": "sha256-hc0nFK7cC4A8kttQ4BrSDzeFlQyHUHWOo0MgT7ayoJU=",
+        "narHash": "sha256-WXH71e+9MLbylq1StuwWQX61brYtS4Kx10OGWlfi/FY=",
         "owner": "notomo",
         "repo": "gesture.nvim",
-        "rev": "b1024dbe2ee4dd5f7bc6293e3d6f2898e793594c",
+        "rev": "5fa0d76b890717081786c74b4824546052e14671",
         "type": "github"
       },
       "original": {
@@ -451,11 +451,11 @@
     "gitsigns-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1677707536,
+        "lastModified": 1680209380,
-        "narHash": "sha256-Ny2kW4FpA5reDmvJkXaezRi2BlIaTiIZYFuTuunFJh8=",
+        "narHash": "sha256-IoWMURofYoLSy9QVE3m1gAcj2s7iRA30gOts47J3rcU=",
         "owner": "lewis6991",
         "repo": "gitsigns.nvim",
-        "rev": "3b6c0a6412b31b91eb26bb8f712562cf7bb1d3be",
+        "rev": "f412f51d0eaf0905a2759c8087090071689bb8fb",
         "type": "github"
       },
       "original": {
@@ -467,11 +467,11 @@
     "glow-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1677812369,
+        "lastModified": 1679769779,
-        "narHash": "sha256-fIV2hfuoeQrzJjqrYO69k+utu5/YhlqqeestGc/l8n0=",
+        "narHash": "sha256-kPM5c7iQ19cxVt5t/nk+svTsk814PBPsnYWAd2yhlas=",
         "owner": "ellisonleao",
         "repo": "glow.nvim",
-        "rev": "5a8ccfb1876b1b2e29ea32c63221be6df45870d1",
+        "rev": "a3f24fdaa71d2c25a2b88026032b34f5b6a6e215",
         "type": "github"
       },
       "original": {
@@ -531,11 +531,11 @@
     "lsp-signature": {
       "flake": false,
       "locked": {
-        "lastModified": 1675379662,
+        "lastModified": 1679524823,
-        "narHash": "sha256-g5bAumjFvA0MBPNKWqOxk5OsaR4KEe5CEsiNN5YbIQU=",
+        "narHash": "sha256-krQ0ihqbrsG4u8HdYlgaq0fOyIIDX4KDdffMRaJKQ78=",
         "owner": "ray-x",
         "repo": "lsp_signature.nvim",
-        "rev": "6f6252f63b0baf0f2224c4caea33819a27f3f550",
+        "rev": "1882019270be445a8cad4353f1530574f2b2d02d",
         "type": "github"
       },
       "original": {
@@ -579,11 +579,11 @@
     "lualine": {
       "flake": false,
       "locked": {
-        "lastModified": 1676394253,
+        "lastModified": 1680275227,
-        "narHash": "sha256-mItWWRqWj9a/JaW8sccnGBijBsvvnh/b4q/S60UwYwc=",
+        "narHash": "sha256-bZSt9rBaeO5CjExu9Si3Ch/k0H/mzBE89KeeTCg4AbU=",
         "owner": "hoob3rt",
         "repo": "lualine.nvim",
-        "rev": "e99d733e0213ceb8f548ae6551b04ae32e590c80",
+        "rev": "9170434aa100f3967b43d5d34bb9adc56fae1986",
         "type": "github"
       },
       "original": {
@@ -595,11 +595,11 @@
     "mind-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1674572816,
+        "lastModified": 1679526071,
-        "narHash": "sha256-yLf/2NvPT0RtFh6+0W32Uaj3Tjs52oyZSb8Jq3INZI4=",
+        "narHash": "sha256-JIhAhQYGLLRucwlhzfckQYU5qjqbHtNH52JlGS5a79w=",
         "owner": "phaazon",
         "repo": "mind.nvim",
-        "rev": "e59c52758c399caceb549c698cfa2d65e6bbb9f9",
+        "rev": "002137dd7cf97865ebd01b6a260209d2daf2da66",
         "type": "github"
       },
       "original": {
@@ -611,11 +611,11 @@
     "minimap-vim": {
       "flake": false,
       "locked": {
-        "lastModified": 1666947112,
+        "lastModified": 1680280122,
-        "narHash": "sha256-xKQfCh3R4MdHolRocZS0IC/OADZd8aVRQLlC0ErWSkc=",
+        "narHash": "sha256-xrKkVTVVna9wc38K/CGCnQmWrofUAYJ0f92NR/ycfZ4=",
         "owner": "wfxr",
         "repo": "minimap.vim",
-        "rev": "2b0151d7302f87f90c4664d119518dda73cc4633",
+        "rev": "15dce1b667d4df0eec715798ab94c0850316e8a3",
         "type": "github"
       },
       "original": {
@@ -655,11 +655,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1677910793,
+        "lastModified": 1680310604,
-        "narHash": "sha256-xjlzJzPVUFJ2Jq7wXnGzhcP9y7gIdm64mdj8N5+XNGM=",
+        "narHash": "sha256-2jop/z79HYhmV/hrdGvhjfTMouvzQvNRgFTkPhwWVcg=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "de14f2c928f913d4fb617d693024eec5cf2223ec",
+        "rev": "75e1b1d5c934aa3a12693a7df58795563fb7877e",
         "type": "github"
       },
       "original": {
@@ -678,11 +678,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1677917632,
+        "lastModified": 1680336751,
-        "narHash": "sha256-NwjqAYbhHlTNfvTBfLV1lfHiVnnzuRBTHF9VtCj6rG8=",
+        "narHash": "sha256-otSdFRXsNyPYOsbo+49vN4UGwZrVoLDrEp0EkyVJ/rY=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "8066172d476a51da5a437ed512bbd0b9ddf0fdc7",
+        "rev": "d56f32281f4d6d74ce925a99946713dc6b5a0e30",
         "type": "github"
       },
       "original": {
@@ -702,11 +702,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1677868216,
+        "lastModified": 1680185050,
-        "narHash": "sha256-689PNrU+2O/xUV+UMAjiqGNTpRf2ZC99DnfPVeTdQvw=",
+        "narHash": "sha256-MtyaP3j1yxwrqPFUsLD0qFyyH7d/h0D/whfErxS2UFM=",
         "owner": "oxalica",
         "repo": "nil",
-        "rev": "0f918f956fefee72eff801cdcfc0c7cce5be586a",
+        "rev": "0718fca59b82e53aef07699db7e1bbd86ba8dacf",
         "type": "github"
       },
       "original": {
@@ -717,11 +717,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1677852945,
+        "lastModified": 1680273054,
-        "narHash": "sha256-liiVJjkBTuBTAkRW3hrI8MbPD2ImYzwUpa7kvteiKhM=",
+        "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f5ffd5787786dde3a8bf648c7a1b5f78c4e01abb",
+        "rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3",
         "type": "github"
       },
       "original": {
@@ -734,11 +734,11 @@
     "nixpkgs-lib": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1677407201,
+        "lastModified": 1678375444,
-        "narHash": "sha256-3blwdI9o1BAprkvlByHvtEm5HAIRn/XPjtcfiunpY7s=",
+        "narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7f5639fa3b68054ca0b062866dc62b22c3f11505",
+        "rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e",
         "type": "github"
       },
       "original": {
@@ -800,11 +800,11 @@
     "nmd": {
       "flake": false,
       "locked": {
-        "lastModified": 1675884907,
+        "lastModified": 1680213367,
-        "narHash": "sha256-IyLmIotAp7g6sxjeKx6gl52KQ/Xi6wyyHFhd/AWuM5o=",
+        "narHash": "sha256-NbSXxpFAK5IMcsQTK0vSGy099HExx3SEagqW4Lpc+X8=",
         "owner": "rycee",
         "repo": "nmd",
-        "rev": "fa87e124c83ba343f88607b7348a4bd8a0ad061c",
+        "rev": "abb15317ebd17e5a0a7dd105e2ce52f2700185a8",
         "type": "gitlab"
       },
       "original": {
@@ -816,11 +816,11 @@
     "noice-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1677882849,
+        "lastModified": 1679827108,
-        "narHash": "sha256-3XQklNVwwzkrQtaKw8U8iXnNcDMiuEvXtceE2ACY6wc=",
+        "narHash": "sha256-05/yAwaoz7mAAKXP1CsRXUoqsTW/z1wAT0OodiYJw6M=",
         "owner": "folke",
         "repo": "noice.nvim",
-        "rev": "c22651651da01239fc4afac4cdb7261797d5f02e",
+        "rev": "1da4edfba3e9278e98fc9723d7235d9ab3889744",
         "type": "github"
       },
       "original": {
@@ -832,11 +832,11 @@
     "nui-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1677566469,
+        "lastModified": 1680113440,
-        "narHash": "sha256-xHpNGJ8ikTMiWHAtqaZg5IVKSngH/k0LN7WaOHl2iz8=",
+        "narHash": "sha256-pDroyXtkrBGbEZs0mcf+96ba72c0leNMW0AlM50RDJ8=",
         "owner": "MunifTanjim",
         "repo": "nui.nvim",
-        "rev": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be",
+        "rev": "4eaec2ac66af2ca6ddddd3f665ad0909b90ae36a",
         "type": "github"
       },
       "original": {
@@ -848,11 +848,11 @@
     "null-ls": {
       "flake": false,
       "locked": {
-        "lastModified": 1676936752,
+        "lastModified": 1680311856,
-        "narHash": "sha256-uGyXBh1SpNpOkUlZpQ0RWRTMW6x3uhg4x07hmjkpSro=",
+        "narHash": "sha256-JViLNL2LLzm+ZQYnR4HF3e2mBa7AbDK7jWn4ZhjKYbY=",
         "owner": "jose-elias-alvarez",
         "repo": "null-ls.nvim",
-        "rev": "689cdd78f70af20a37b5309ebc287ac645ae4f76",
+        "rev": "defa0518762abb32279d601443344fb9773f9330",
         "type": "github"
       },
       "original": {
@@ -864,11 +864,11 @@
     "nvim-autopairs": {
       "flake": false,
       "locked": {
-        "lastModified": 1677712006,
+        "lastModified": 1679861399,
-        "narHash": "sha256-TruglMs8Rl6og2F8HANlB1V73QXmORLyUifCkJ6HPBU=",
+        "narHash": "sha256-G5D07KozNj48CxzcMevf1+ZqJEMXQql7VfWUseg6Rzc=",
         "owner": "windwp",
         "repo": "nvim-autopairs",
-        "rev": "ab49517cfd1765b3f3de52c1f0fda6190b44e27b",
+        "rev": "0fd6519d44eac3a6736aafdb3fe9da916c3701d4",
         "type": "github"
       },
       "original": {
@@ -897,11 +897,11 @@
     "nvim-cmp": {
       "flake": false,
       "locked": {
-        "lastModified": 1677479977,
+        "lastModified": 1679026924,
-        "narHash": "sha256-cFX19DqWSwkki8TDfEBca1EV81PIPTx92rCpNUslaL8=",
+        "narHash": "sha256-CoHGIiZrhRAHZ/Er0JSQMapI7jwllNF5OysLlx2QEik=",
         "owner": "hrsh7th",
         "repo": "nvim-cmp",
-        "rev": "01f697a68905f9dcae70960a9eb013695a17f9a2",
+        "rev": "777450fd0ae289463a14481673e26246b5e38bf2",
         "type": "github"
       },
       "original": {
@@ -977,11 +977,11 @@
     "nvim-lspconfig": {
       "flake": false,
       "locked": {
-        "lastModified": 1677827056,
+        "lastModified": 1680376121,
-        "narHash": "sha256-iO9Y25/2RaqMScCXA5P6vj/fSgmsrSN5HSPjBlUkHmE=",
+        "narHash": "sha256-iEBGdENh3qXKHpRCqApG2JfJwXOsInivO0dUGton+I4=",
         "owner": "neovim",
         "repo": "nvim-lspconfig",
-        "rev": "e0926b6abc84578f44fb8917d61cdee22188639e",
+        "rev": "8cbfc30c4b238cc2465ff256803f7747376f046a",
         "type": "github"
       },
       "original": {
@@ -1009,11 +1009,11 @@
     "nvim-notify": {
       "flake": false,
       "locked": {
-        "lastModified": 1677922748,
+        "lastModified": 1679522899,
-        "narHash": "sha256-3E9FN+dAKswzLTX6PYJIj30MWxd3estsZORBEf2Csn0=",
+        "narHash": "sha256-xkDr0tASezDmnxyLb7JvzCjE/HPv4ckqiJsBmaSR+Fs=",
         "owner": "rcarriga",
         "repo": "nvim-notify",
-        "rev": "281e4d793c550c866bea3fb85d39de1f0188fb50",
+        "rev": "50d037041ada0895aeba4c0215cde6d11b7729c4",
         "type": "github"
       },
       "original": {
@@ -1025,11 +1025,11 @@
     "nvim-session-manager": {
       "flake": false,
       "locked": {
-        "lastModified": 1675414961,
+        "lastModified": 1680110654,
-        "narHash": "sha256-dHFhZtBvU6sc6XR49oL3TW0sUwAOwLf4S5q+m8u76c8=",
+        "narHash": "sha256-w0tPefWblZJpLC560saBz9eRuSvbAkoSnq36Zdyjnm8=",
         "owner": "Shatur",
         "repo": "neovim-session-manager",
-        "rev": "e7a2cbf56b5fd3a223f2774b535499fc62eca6ef",
+        "rev": "d1883f30921193f3cff4537e27514e454e0331e9",
         "type": "github"
       },
       "original": {
@@ -1041,11 +1041,11 @@
     "nvim-tree-lua": {
       "flake": false,
       "locked": {
-        "lastModified": 1677902521,
+        "lastModified": 1679961168,
-        "narHash": "sha256-POU6+SwyYJRLQKjvft3S6a3U25aUmNlGm+pynFnD9jQ=",
+        "narHash": "sha256-9e5kBw9cZX08uQAfFb/YP17a1biDR8PNg617PhkKJhk=",
         "owner": "nvim-tree",
         "repo": "nvim-tree.lua",
-        "rev": "1b453441f4b1a501a6251db4138cf67172d0d5d2",
+        "rev": "45400cd7e02027937cd5e49845545e606ecf5a1f",
         "type": "github"
       },
       "original": {
@@ -1073,11 +1073,11 @@
     "nvim-ts-autotag": {
       "flake": false,
       "locked": {
-        "lastModified": 1660219579,
+        "lastModified": 1679019585,
-        "narHash": "sha256-ltGiYNXWpWSI5RrWTVR+k6SZjcZbsHtH5m9uHTMKnzM=",
+        "narHash": "sha256-XNR09azYMviWt8aU8XuhS7q+AT5xRBK+FkeejlAAshg=",
         "owner": "windwp",
         "repo": "nvim-ts-autotag",
-        "rev": "fdefe46c6807441460f11f11a167a2baf8e4534b",
+        "rev": "25698e4033cd6cd3745454bfc837dd670eba0480",
         "type": "github"
       },
       "original": {
@@ -1089,11 +1089,11 @@
     "nvim-web-devicons": {
       "flake": false,
       "locked": {
-        "lastModified": 1677896805,
+        "lastModified": 1680259444,
-        "narHash": "sha256-aLxgt3tV0RN1+s1gFmPyXX6z0+6Waw1jA5n10B7TW/4=",
+        "narHash": "sha256-KY0L9j7zKSXgVLUqoda3btiQ6r1h/gckJGpma4CXqUM=",
         "owner": "kyazdani42",
         "repo": "nvim-web-devicons",
-        "rev": "c3c1dc4e36969370ff589b7025df8ec2e5c881a2",
+        "rev": "d92b3f4275f4774c0cb23b8b094a41d1dbb3e78c",
         "type": "github"
       },
       "original": {
@@ -1105,11 +1105,11 @@
     "obsidian-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1676575215,
+        "lastModified": 1680287173,
-        "narHash": "sha256-r7Wr16SuVa1HqGrUWnRc3tjKGTBRiLbrV+iED8p7G+o=",
+        "narHash": "sha256-OV3s/0qZi29GH1tWqjQjbBWMHkOJfmTujjMO18/rKg8=",
         "owner": "epwalsh",
         "repo": "obsidian.nvim",
-        "rev": "5ecf680cf8fc49c6881126f4242a496d79c6f6f7",
+        "rev": "e1c4658cc6530a8d2f393451f68bd9e6366173b9",
         "type": "github"
       },
       "original": {
@@ -1121,11 +1121,11 @@
     "onedark": {
       "flake": false,
       "locked": {
-        "lastModified": 1676397581,
+        "lastModified": 1679504944,
-        "narHash": "sha256-x3Tx0Spbm95M71sBvm2sVCyCIkeRSfvlC/TKcBMIwg4=",
+        "narHash": "sha256-vwrffcwutr1HKKcNz2hGEO46EIJS1Fug17VCuWRNu/o=",
         "owner": "navarasu",
         "repo": "onedark.nvim",
-        "rev": "1fe908fb4acdcee26573e9ccde0de94ec77e5e84",
+        "rev": "dd640f6cfb0e370cfd3db389f04b172508848bd3",
         "type": "github"
       },
       "original": {
@@ -1137,11 +1137,11 @@
     "orgmode-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1676102032,
+        "lastModified": 1680214315,
-        "narHash": "sha256-rSesMpucbNdlGVVjN5JKR9ZjfvFRxm1HqT6B5ls7KrU=",
+        "narHash": "sha256-jveJ1ffvv4pkfog1t98yPvTiltTv8Li89gEDbBnz8K0=",
         "owner": "nvim-orgmode",
         "repo": "orgmode",
-        "rev": "313ce5a04e7fc3d677ad906a94fc49c1f54d1572",
+        "rev": "070f7588629b956bba17d9892e6fa15bf19a2260",
         "type": "github"
       },
       "original": {
@@ -1185,11 +1185,11 @@
     "registers": {
       "flake": false,
       "locked": {
-        "lastModified": 1676623826,
+        "lastModified": 1678110851,
-        "narHash": "sha256-wU5WD9se2rvEap/hRki7AM2T0XyTDooER3o1RlSAGRg=",
+        "narHash": "sha256-JxOtdChh4V/SfBQNVDoHdWvH49nfDhlokS/7vWQWryI=",
         "owner": "tversteeg",
         "repo": "registers.nvim",
-        "rev": "2d08fffeb8533d3678bd796010c13c7fa2534263",
+        "rev": "0a461e635403065b3f9a525bd77eff30759cfba0",
         "type": "github"
       },
       "original": {
@@ -1313,11 +1313,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1677638104,
+        "lastModified": 1678415622,
-        "narHash": "sha256-vbdOoDYnQ1QYSchMb3fYGCLYeta3XwmGvMrlXchST5s=",
+        "narHash": "sha256-tems1jHETCYEen8QrW61yVVX0F4zOGy4ImB43iDc7bY=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "f388187efb41ce4195b2f4de0b6bb463d3cd0a76",
+        "rev": "9f687941160108f89dd8bd2c650d32c15a35c7c7",
         "type": "github"
       },
       "original": {
@@ -1345,11 +1345,11 @@
     "scrollbar-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1676328140,
+        "lastModified": 1679265551,
-        "narHash": "sha256-ZTU8+OPROdtkov75rvFpd3RuZ98PN1wiA7UOyPUqmw8=",
+        "narHash": "sha256-NdrWWiumuDM2RJKmVIGjnknUmcqIc/jOzfYKgPCxO9k=",
         "owner": "petertriho",
         "repo": "nvim-scrollbar",
-        "rev": "75210c554e935740448cfb532d8a671ae544bb1b",
+        "rev": "f85b29805cf917f9b1d5ff0c9a52c5b1bdca5943",
         "type": "github"
       },
       "original": {
@@ -1361,11 +1361,11 @@
     "sqls-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1657291129,
+        "lastModified": 1678906855,
-        "narHash": "sha256-tatUEAI8EVXDYQPAAZ5+38YOPWb8Ei9VHCzHp+AyRjc=",
+        "narHash": "sha256-YOCnl7pYF9gZpx6/+eeSpsv4c/TtCgUmKwPuV4k33U0=",
         "owner": "nanotee",
         "repo": "sqls.nvim",
-        "rev": "a0048b7018c99b68456f91b4aa42ce288f0c0774",
+        "rev": "bb70de250433ca5f6f7b617a9b3f5ab02eccf861",
         "type": "github"
       },
       "original": {
@@ -1410,11 +1410,11 @@
     "telescope": {
       "flake": false,
       "locked": {
-        "lastModified": 1677414372,
+        "lastModified": 1679492995,
-        "narHash": "sha256-QmyVJ/LZFtb/qqD5Q5fHsqAGgqaOT9XkVoLyOcqM14w=",
+        "narHash": "sha256-Kyw9ryb8YgAKFWLac9yl/fD3nNcu7mv7xzuNU6pDMkU=",
         "owner": "nvim-telescope",
         "repo": "telescope.nvim",
-        "rev": "a3f17d3baf70df58b9d3544ea30abe52a7a832c2",
+        "rev": "942fe5faef47b21241e970551eba407bc10d9547",
         "type": "github"
       },
       "original": {
@@ -1467,11 +1467,11 @@
     "todo-comments": {
       "flake": false,
       "locked": {
-        "lastModified": 1674503659,
+        "lastModified": 1680261407,
-        "narHash": "sha256-2BV8ahB5iZmEh5N/JFqMdz4CqVXAIdmxE7rNC1+igsw=",
+        "narHash": "sha256-Z4jaklYoU4TU/3UuK1krImqMzU6sNxJM/XWPCnNBuwo=",
         "owner": "folke",
         "repo": "todo-comments.nvim",
-        "rev": "74c7d28cb50b0713c881ef69bcb6cdd77d8907d1",
+        "rev": "8febc60a76feefd8203077ef78b6a262ea1a41f9",
         "type": "github"
       },
       "original": {
@@ -1483,11 +1483,11 @@
     "toggleterm-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1677405147,
+        "lastModified": 1680290314,
-        "narHash": "sha256-CB/X+Y0kdHn4rMiwGrMr9GqyD5hhqcFFvC3zV1gmI7w=",
+        "narHash": "sha256-862KtB9oqktx/mPI0wSauF7eJIJogqgG6wTTYlCSo9U=",
         "owner": "akinsho",
         "repo": "toggleterm.nvim",
-        "rev": "31d38d11390bcd35a568fcc65a79b7d6ec89de62",
+        "rev": "b86982429325112d2b20c6d0cc7a5c4b182ab705",
         "type": "github"
       },
       "original": {
@@ -1499,11 +1499,11 @@
     "tokyonight": {
       "flake": false,
       "locked": {
-        "lastModified": 1677914756,
+        "lastModified": 1679554571,
-        "narHash": "sha256-vHvCb3Bp6uZ4OnqXjEuNOroG+5V2ZhnMYawY4O6YK3s=",
+        "narHash": "sha256-M1fX5o8w6MbDX46HiN1Nw9xjG4Z79zraPKi0VUpyyVU=",
         "owner": "folke",
         "repo": "tokyonight.nvim",
-        "rev": "a0d5034fd6c26d997cd050a2f7d7083a20d2c94b",
+        "rev": "1b0c88094548a62641ece1e668fa9a234e1c539e",
         "type": "github"
       },
       "original": {
@@ -1515,11 +1515,11 @@
     "trouble": {
       "flake": false,
       "locked": {
-        "lastModified": 1677584608,
+        "lastModified": 1679827111,
-        "narHash": "sha256-5ZclnMkYOOD9l1zu5VF/WBV9po356PdTC7iX3EBC2mw=",
+        "narHash": "sha256-uw/wfMKoFN2sHw/99ZcqGKJ3jQVP9pkDHqDaXaYn3CA=",
         "owner": "folke",
         "repo": "trouble.nvim",
-        "rev": "67337644e38144b444d026b0df2dc5fa0038930f",
+        "rev": "2ae7237c2917d661f458443c9a88680f8ca2d7b2",
         "type": "github"
       },
       "original": {
@@ -1626,11 +1626,11 @@
     "vim-vsnip": {
       "flake": false,
       "locked": {
-        "lastModified": 1671546474,
+        "lastModified": 1678609126,
-        "narHash": "sha256-vFYn5fAM7AAuvTI5behiYM08sV2qQyV7zZ++jgpZfSc=",
+        "narHash": "sha256-ehPnvGle7YrECn76YlSY/2V7Zeq56JGlmZPlwgz2FdE=",
         "owner": "hrsh7th",
         "repo": "vim-vsnip",
-        "rev": "8dde8c0ef10bb1afdbb301e2bd7eb1c153dd558e",
+        "rev": "7753ba9c10429c29d25abfd11b4c60b76718c438",
         "type": "github"
       },
       "original": {
@@ -1659,11 +1659,11 @@
     "which-key": {
       "flake": false,
       "locked": {
-        "lastModified": 1677739890,
+        "lastModified": 1679827118,
-        "narHash": "sha256-4VY9sOKZe2w6cOrYINJIvwDDXx1zkj1xCgHnceSxyZU=",
+        "narHash": "sha256-R52U1Aa30KgNyyTxN3ZiWaoh86/Vsj5kmUmCCos5DjE=",
         "owner": "folke",
         "repo": "which-key.nvim",
-        "rev": "fb027738340502b556c3f43051f113bcaa7e8e63",
+        "rev": "4b73390eec680b4c061ea175eb32c0ff3412271d",
         "type": "github"
       },
       "original": {
@@ -1679,11 +1679,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1677808960,
+        "lastModified": 1680308637,
-        "narHash": "sha256-1bVHRbhHT8Ynfnynd6ZY7hwMeatEV50lAB1/2uB+P48=",
+        "narHash": "sha256-gas/Oo1hYbYOHzr1TBoHGH1mEzMMlPIdosb3yt573c0=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "128492d8bc5c171bc4b21196a40ff80858f1ac66",
+        "rev": "0d01cdde8c66b2b49cb30f8b52f11237b1ae5f6f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -3,7 +3,7 @@
   outputs = {
     nixpkgs,
     flake-parts,
-    zig,
+    self,
     ...
   } @ inputs:
     flake-parts.lib.mkFlake {inherit inputs;} {
@@ -33,13 +33,27 @@
           inherit (import ./extra.nix inputs) neovimConfiguration;
         };
 
+        /*
         nixosModules.default = {
-          imports = [./lib/hm-module.nix];
+          home-manager.sharedModules = [
+            ./lib/module
+          ];
           nixpkgs.overlays = [
             inputs.tidalcycles.overlays.default
             inputs.self.overlays.default
           ];
         };
+        */
+
+        homeManagerModules = {
+          neovim-flake = {
+            imports = [
+              (import ./lib/module self.packages inputs)
+            ];
+          };
+
+          default = self.homeManagerModules.neovim-flake;
+        };
       };
 
       perSystem = {

flake/overlays.nix

@@ -1,20 +1,15 @@
 {inputs, ...}: let
   inherit (import ../extra.nix inputs) neovimConfiguration mainConfig;
 
-  tidalConfig = {
-    config.vim.tidal.enable = true;
-  };
-
   buildPkg = pkgs: modules:
-    (neovimConfiguration {
+    (neovimConfiguration {inherit pkgs modules;})
-      inherit pkgs modules;
-    })
     .neovim;
 
   nixConfig = mainConfig false;
   maximalConfig = mainConfig true;
+  tidalConfig = {config.vim.tidal.enable = true;};
 in {
-  flake.overlays.default = final: prev: {
+  flake.overlays.default = _final: prev: {
     inherit neovimConfiguration;
     neovim-nix = buildPkg prev [nixConfig];
     neovim-maximal = buildPkg prev [maximalConfig];

flake/packages.nix

@@ -3,15 +3,14 @@
     system,
     config,
     pkgs,
-    lib,
     ...
-  }: {
+  }: let
-    packages = let
+    docs = import ../docs {
-      docs = import ../docs {
+      inherit pkgs;
-        inherit pkgs;
+      nmdSrc = inputs.nmd;
-        nmdSrc = inputs.nmd;
+    };
-      };
+  in {
-    in
+    packages =
       {
         # Documentation
         docs = docs.manual.html;

lib/assertions.nix

@@ -0,0 +1,22 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.vim;
+in {
+  assertions = mkMerge [
+    {
+      assertion = cfg.kommentary.enable;
+      message = "Kommentary has been deprecated in favor";
+    }
+    mkIf
+    (config.programs.neovim-flake.enable)
+    {
+      assertion = !config.programs.neovim.enable;
+      message = "You cannot use neovim-flake together with vanilla neovim.";
+    }
+  ];
+}

lib/dag.nix

@@ -77,7 +77,7 @@ in {
   topoSort = dag: let
     dagBefore = dag: name:
       builtins.attrNames
-      (filterAttrs (n: v: builtins.elem name v.before) dag);
+      (filterAttrs (_n: v: builtins.elem name v.before) dag);
     normalizedDag =
       mapAttrs (n: v: {
         name = n;

lib/default.nix

@@ -1,5 +1,9 @@
 {lib}: {
   dag = import ./dag.nix {inherit lib;};
   booleans = import ./booleans.nix {inherit lib;};
-  types = import ./types.nix {inherit lib;};
+  types = import ./types {inherit lib;};
+
+  imports = [
+    ./assertions.nix
+  ];
 }

lib/hm-module.nix

@@ -1,44 +0,0 @@
-# Home Manager module
-{
-  config,
-  pkgs,
-  lib ? pkgs.lib,
-  ...
-}: let
-  cfg = config.programs.neovim-flake;
-  set = pkgs.neovim-maximal {mainConfig = cfg.settings;};
-in
-  with lib; {
-    meta.maintainers = [maintainers.notashelf];
-
-    options.programs.neovim-flake = {
-      enable = mkEnableOption "A NeoVim IDE with a focus on configurability and extensibility.";
-
-      settings = mkOption {
-        type = types.attrsOf types.anything;
-        default = {};
-        example = literalExpression ''
-          {
-            vim.viAlias = false;
-            vim.vimAlias = true;
-            vim.lsp = {
-              enable = true;
-              formatOnSave = true;
-              lightbulb.enable = true;
-              lspsaga.enable = false;
-              nvimCodeActionMenu.enable = true;
-              trouble.enable = true;
-              lspSignature.enable = true;
-              rust.enable = false;
-              nix = true;
-            };
-          }
-        '';
-        description = "Attribute set of neoflake preferences.";
-      };
-    };
-
-    config = mkIf cfg.enable {
-      home.packages = [set.neovim];
-    };
-  }

lib/module/default.nix

@@ -0,0 +1,49 @@
+# Home Manager module
+packages: inputs: {
+  pkgs,
+  config,
+  lib ? pkgs.lib,
+  self,
+  ...
+}:
+with lib; let
+  cfg = config.programs.neovim-flake;
+  inherit (import ../../extra.nix inputs) neovimConfiguration;
+  set = neovimConfiguration {
+    inherit pkgs;
+    modules = [cfg.settings];
+  };
+in {
+  meta.maintainers = [maintainers.notashelf];
+
+  options.programs.neovim-flake = {
+    enable = mkEnableOption "A NeoVim IDE with a focus on configurability and extensibility.";
+
+    settings = mkOption {
+      type = types.attrsOf types.anything;
+      default = {};
+      example = literalExpression ''
+        {
+          vim.viAlias = false;
+          vim.vimAlias = true;
+          vim.lsp = {
+            enable = true;
+            formatOnSave = true;
+            lightbulb.enable = true;
+            lspsaga.enable = false;
+            nvimCodeActionMenu.enable = true;
+            trouble.enable = true;
+            lspSignature.enable = true;
+            rust.enable = false;
+            nix = true;
+          };
+        }
+      '';
+      description = "Attribute set of neoflake preferences.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = [set.neovim];
+  };
+}

lib/types.nix

@@ -1,7 +0,0 @@
-{lib}: let
-  typesDag = import ./types-dag.nix {inherit lib;};
-  typesPlugin = import ./types-plugin.nix {inherit lib;};
-in {
-  inherit (typesDag) dagOf;
-  inherit (typesPlugin) pluginsOpt;
-}

lib/types/default.nix

@@ -0,0 +1,7 @@
+{lib}: let
+  typesDag = import ./dag.nix {inherit lib;};
+  typesPlugin = import ./plugins.nix {inherit lib;};
+in {
+  inherit (typesDag) dagOf;
+  inherit (typesPlugin) pluginsOpt;
+}

modules/assistant/copilot/copilot.nix

@@ -5,9 +5,7 @@
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.assistant.copilot;
-in {
   options.vim.assistant.copilot = {
     enable = mkEnableOption "Enable GitHub Copilot";
 

modules/assistant/tabnine/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/assistant/tabnine/tabnine.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.assistant.tabnine;
-in {
   options.vim.assistant.tabnine = {
     enable = mkEnableOption "Enable TabNine assistant";
 

modules/autopairs/nvim-autopairs/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   config,
   ...

modules/autopairs/nvim-autopairs/nvim-autopairs.nix

@@ -1,19 +1,16 @@
 {
-  pkgs,
   lib,
   config,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.autopairs;
-in {
   options.vim = {
     autopairs = {
       enable = mkOption {
         type = types.bool;
         default = false;
-        description = "enable autopairs";
+        description = "Enable autopairs";
       };
 
       type = mkOption {

modules/basic/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   config,
   ...

modules/basic/module.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   lib,
   config,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim;
-in {
   options.vim = {
     debugMode = {
       enable = mkEnableOption "Enable debug mode";

modules/comments/comment-nvim/comment-nvim.nix

@@ -1,14 +1,11 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.comments.comment-nvim;
-in {
   options.vim.comments.comment-nvim = {
-    enable = mkEnableOption "comment-nvim";
+    enable = mkEnableOption "Enable comment-nvim";
   };
 }

modules/comments/comment-nvim/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/comments/kommentary.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...
@@ -9,7 +8,7 @@ with builtins; let
   cfg = config.vim.comments.kommentary;
 in {
   options.vim.comments.kommentary = {
-    enable = mkEnableOption "kommentary";
+    enable = mkEnableOption "Enable kommentary";
   };
 
   config = mkIf cfg.enable {

modules/completion/nvim-cmp/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   config,
   ...

modules/completion/nvim-cmp/nvim-cmp.nix

@@ -1,19 +1,16 @@
 {
-  pkgs,
   lib,
   config,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.autocomplete;
-in {
   options.vim = {
     autocomplete = {
       enable = mkOption {
         type = types.bool;
         default = false;
-        description = "enable autocomplete";
+        description = "Enable autocomplete via nvim-cmp";
       };
 
       type = mkOption {

modules/core/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 with lib;
@@ -135,7 +134,7 @@ in {
           else (toJSON val)
         );
 
-    filterNonNull = mappings: filterAttrs (name: value: value != null) mappings;
+    filterNonNull = mappings: filterAttrs (_name: value: value != null) mappings;
     globalsScript =
       mapAttrsFlatten (name: value: "let g:${name}=${valToVim value}")
       (filterNonNull cfg.globals);

modules/dashboard/alpha/alpha.nix

@@ -1,14 +1,11 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.dashboard.alpha;
-in {
   options.vim.dashboard.alpha = {
-    enable = mkEnableOption "alpha";
+    enable = mkEnableOption "Enable alpha.nvim";
   };
 }

modules/dashboard/alpha/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/dashboard/dashboard-nvim/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...
@@ -14,8 +13,7 @@ in {
     ];
 
     vim.luaConfigRC.dashboard-nvim = nvim.dag.entryAnywhere ''
-      require("dashboard").setup{
+      require("dashboard").setup{}
-      }
     '';
   };
 }

modules/dashboard/dashboard-nvim/dashboard-nvim.nix

@@ -1,14 +1,11 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.dashboard.dashboard-nvim;
-in {
   options.vim.dashboard.dashboard-nvim = {
-    enable = mkEnableOption "dashboard-nvim";
+    enable = mkEnableOption "Enable dashboard.nvim";
   };
 }

modules/dashboard/default.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  pkgs,
-  config,
-  lib,
-  ...
-}: {
   imports = [
     ./alpha
     ./dashboard-nvim

modules/dashboard/startify/startify.nix

@@ -1,20 +1,12 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with builtins;
-with lib; let
+with lib; {
-  cfg = config.vim.dashboard.startify;
-
-  mkVimBool = val:
-    if val
-    then "1"
-    else "0";
-in {
   options.vim.dashboard.startify = {
-    enable = mkEnableOption "Enable startify";
+    enable = mkEnableOption "Enable vim-startify";
 
     bookmarks = mkOption {
       default = [];

modules/filetree/nvimtree-lua/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/filetree/nvimtree-lua/nvimtree-lua.nix

@@ -5,9 +5,7 @@
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.filetree.nvimTreeLua;
-in {
   options.vim.filetree.nvimTreeLua = {
     enable = mkOption {
       type = types.bool;

modules/git/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/git/default.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  pkgs,
-  config,
-  lib,
-  ...
-}: {
   imports = [
     ./config.nix
     ./git.nix

modules/git/git.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...
@@ -22,48 +21,41 @@ in {
 
   config =
     mkIf cfg.enable
-    (
+    {
-      let
+      vim.startPlugins =
-        mkVimBool = val:
+        if (cfg.gitsigns.enable)
-          if val
+        then ["gitsigns-nvim"]
-          then "1"
+        else [];
-          else "0";
-      in {
-        vim.startPlugins =
-          if (cfg.gitsigns.enable)
-          then ["gitsigns-nvim"]
-          else [];
 
-        vim.luaConfigRC.gitsigns = mkIf (cfg.gitsigns.enable) (nvim.dag.entryAnywhere ''
+      vim.luaConfigRC.gitsigns = mkIf (cfg.gitsigns.enable) (nvim.dag.entryAnywhere ''
-          -- GitSigns setup
+        -- GitSigns setup
-          require('gitsigns').setup {
+        require('gitsigns').setup {
-            keymaps = {
+          keymaps = {
-              noremap = true,
+            noremap = true,
 
-              ['n <leader>gn'] = { expr = true, "&diff ? \'\' : '<cmd>Gitsigns next_hunk<CR>'"},
+            ['n <leader>gn'] = { expr = true, "&diff ? \'\' : '<cmd>Gitsigns next_hunk<CR>'"},
-              ['n <leader>gp'] = { expr = true, "&diff ? \'\' : '<cmd>Gitsigns prev_hunk<CR>'"},
+            ['n <leader>gp'] = { expr = true, "&diff ? \'\' : '<cmd>Gitsigns prev_hunk<CR>'"},
 
-              ['n <leader>gs'] = '<cmd>Gitsigns stage_hunk<CR>',
+            ['n <leader>gs'] = '<cmd>Gitsigns stage_hunk<CR>',
-              ['v <leader>gs'] = ':Gitsigns stage_hunk<CR>',
+            ['v <leader>gs'] = ':Gitsigns stage_hunk<CR>',
-              ['n <leader>gu'] = '<cmd>Gitsigns undo_stage_hunk<CR>',
+            ['n <leader>gu'] = '<cmd>Gitsigns undo_stage_hunk<CR>',
-              ['n <leader>gr'] = '<cmd>Gitsigns reset_hunk<CR>',
+            ['n <leader>gr'] = '<cmd>Gitsigns reset_hunk<CR>',
-              ['v <leader>gr'] = ':Gitsigns reset_hunk<CR>',
+            ['v <leader>gr'] = ':Gitsigns reset_hunk<CR>',
-              ['n <leader>gR'] = '<cmd>Gitsigns reset_buffer<CR>',
+            ['n <leader>gR'] = '<cmd>Gitsigns reset_buffer<CR>',
-              ['n <leader>gp'] = '<cmd>Gitsigns preview_hunk<CR>',
+            ['n <leader>gp'] = '<cmd>Gitsigns preview_hunk<CR>',
-              ['n <leader>gb'] = '<cmd>lua require"gitsigns".blame_line{full=true}<CR>',
+            ['n <leader>gb'] = '<cmd>lua require"gitsigns".blame_line{full=true}<CR>',
-              ['n <leader>gS'] = '<cmd>Gitsigns stage_buffer<CR>',
+            ['n <leader>gS'] = '<cmd>Gitsigns stage_buffer<CR>',
-              ['n <leader>gU'] = '<cmd>Gitsigns reset_buffer_index<CR>',
+            ['n <leader>gU'] = '<cmd>Gitsigns reset_buffer_index<CR>',
-              ['n <leader>gts'] = ':Gitsigns toggle_signs<CR>',
+            ['n <leader>gts'] = ':Gitsigns toggle_signs<CR>',
-              ['n <leader>gtn'] = ':Gitsigns toggle_numhl<CR>',
+            ['n <leader>gtn'] = ':Gitsigns toggle_numhl<CR>',
-              ['n <leader>gtl'] = ':Gitsigns toggle_linehl<CR>',
+            ['n <leader>gtl'] = ':Gitsigns toggle_linehl<CR>',
-              ['n <leader>gtw'] = ':Gitsigns toggle_word_diff<CR>',
+            ['n <leader>gtw'] = ':Gitsigns toggle_word_diff<CR>',
 
-              -- Text objects
+            -- Text objects
-              ['o ih'] = ':<C-U>Gitsigns select_hunk<CR>',
+            ['o ih'] = ':<C-U>Gitsigns select_hunk<CR>',
-              ['x ih'] = ':<C-U>Gitsigns select_hunk<CR>'
+            ['x ih'] = ':<C-U>Gitsigns select_hunk<CR>'
-            },
+          },
-          }
+        }
-        '');
+      '');
-      }
+    };
-    );
 }

modules/lsp/default.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
   imports = [
     # nvim lsp support
     ./config.nix

modules/lsp/lightbulb/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/lsp/lightbulb/lightbulb.nix

@@ -1,16 +1,13 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.lsp;
-in {
   options.vim.lsp = {
     lightbulb = {
-      enable = mkEnableOption "lightbulb for code actions. Requires emoji font";
+      enable = mkEnableOption "Lightbulb for code actions. Requires an emoji font";
     };
   };
 }

modules/lsp/lsp-signature/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/lsp/lsp-signature/lsp-signature.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.lsp;
-in {
   options.vim.lsp = {
     lspSignature = {
       enable = mkEnableOption "lsp signature viewer";

modules/lsp/lspsaga/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/lsp/lspsaga/lspsaga.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/lsp/module.nix

@@ -9,7 +9,7 @@ with builtins; let
   cfg = config.vim.lsp;
 in {
   options.vim.lsp = {
-    enable = mkEnableOption "neovim lsp support";
+    enable = mkEnableOption "Enable neovim lsp support. Requires language specific LSPs to be anabled to take effect";
     formatOnSave = mkEnableOption "Format on save";
     nix = {
       enable = mkEnableOption "Nix LSP";
@@ -45,7 +45,7 @@ in {
             },
           },
         '';
-        description = "options to pass to rust analyzer";
+        description = "Options to pass to rust analyzer";
       };
     };
     python = mkEnableOption "Python LSP";

modules/lsp/nvim-code-action-menu/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/lsp/nvim-code-action-menu/nvim-code-action-menu.nix

@@ -1,16 +1,13 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.lsp;
-in {
   options.vim.lsp = {
     nvimCodeActionMenu = {
-      enable = mkEnableOption "nvim code action menu";
+      enable = mkEnableOption "Enable nvim code action menu";
     };
   };
 }

modules/lsp/trouble/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/lsp/trouble/trouble.nix

@@ -1,16 +1,13 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.lsp;
-in {
   options.vim.lsp = {
     trouble = {
-      enable = mkEnableOption "trouble diagnostics viewer";
+      enable = mkEnableOption "Enable trouble diagnostics viewer";
     };
   };
 }

modules/markdown/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/markdown/default.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
   imports = [
     ./glow
     ./config.nix

modules/markdown/glow/glow.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.markdown.glow;
-in {
   options.vim.markdown.glow = {
     enable = mkOption {
       type = types.bool;

modules/markdown/module.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...
@@ -9,7 +8,7 @@ with builtins; let
   cfg = config.vim.markdown;
 in {
   options.vim.markdown = {
-    enable = mkEnableOption "markdown tools and plugins";
+    enable = mkEnableOption "Enable markdown tools and plugins";
   };
 
   config = mkIf (cfg.enable) {

modules/minimap/codewindow/codewindow.nix

@@ -1,14 +1,11 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.minimap.codewindow;
-in {
   options.vim.minimap.codewindow = {
-    enable = mkEnableOption "Enable minimap-vim plugin";
+    enable = mkEnableOption "Enable codewindow plugin for minimap view";
   };
 }

modules/minimap/codewindow/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/minimap/default.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  pkgs,
-  lib,
-  config,
-  ...
-}: {
   imports = [
     ./minimap-vim
     ./codewindow

modules/minimap/minimap-vim/minimap-vim.nix

@@ -1,14 +1,11 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.minimap.minimap-vim;
-in {
   options.vim.minimap.minimap-vim = {
-    enable = mkEnableOption "Enable minimap-vim plugin";
+    enable = mkEnableOption "Enable minimap-vim plugin for minimap view";
   };
 }

modules/notes/mind-nvim/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/notes/mind-nvim/mind-nvim.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.notes.mind-nvim;
-in {
   options.vim.notes.mind-nvim = {
     enable = mkEnableOption "The power of trees at your fingertips. ";
   };

modules/notes/obsidian/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/notes/obsidian/obsidian.nix

@@ -1,14 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.notes.obsidian;
-  auto = config.vim.autocomplete;
-in {
   options.vim.notes = {
     obsidian = {
       enable = mkEnableOption "Complementary neovim plugins for Obsidian editor";

modules/notes/orgmode/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/notes/orgmode/orgmode.nix

@@ -1,15 +1,12 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.notes.orgmode;
-in {
   options.vim.notes.orgmode = {
-    enable = mkEnableOption "Neovim plugin for Emac Orgmode. Get the best of both worlds.";
+    enable = mkEnableOption "Enable nvim-orgmode: Neovim plugin for Emac Orgmode. Get the best of both worlds";
     orgAgendaFiles = mkOption {
       type = types.str;
       default = "{'~/Dropbox/org/*', '~/my-orgs/**/*'}";

modules/notes/todo-comments/todo-comments.nix

@@ -1,15 +1,12 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.notes.todo-comments;
-in {
   options.vim.notes.todo-comments = {
-    enable = mkEnableOption "todo-comments";
+    enable = mkEnableOption "Enable todo-comments";
 
     patterns = {
       highlight = mkOption {

modules/notifications/nvim-notify/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/notifications/nvim-notify/nvim-notify.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.notify.nvim-notify;
-in {
   options.vim.notify.nvim-notify = {
     enable = mkEnableOption "Enable nvim-notify plugin";
     stages = mkOption {

modules/rich-presence/presence-nvim/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/rich-presence/presence-nvim/presence-nvim.nix

@@ -1,15 +1,12 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.presence.presence-nvim;
-in {
   options.vim.presence.presence-nvim = {
-    enable = mkEnableOption "Enable presence.nvim plugin";
+    enable = mkEnableOption "Enable presence.nvim plugin for discord rich presence";
 
     image_text = mkOption {
       type = types.str;

modules/session/nvim-session-manager/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/session/nvim-session-manager/nvim-session-manager.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.session.nvim-session-manager;
-in {
   options.vim.session.nvim-session-manager = {
     enable = mkEnableOption "Enable nvim-session-manager";
   };

modules/snippets/vsnip/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/snippets/vsnip/vsnip.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.snippets.vsnip;
-in {
   options.vim.snippets.vsnip = {
     enable = mkEnableOption "Enable vim-vsnip";
   };

modules/statusline/default.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  pkgs,
-  config,
-  lib,
-  ...
-}: {
   imports = [
     ./lualine
   ];

modules/statusline/lualine/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/statusline/lualine/lualine.nix

@@ -1,18 +1,16 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
 with builtins; let
-  cfg = config.vim.statusline.lualine;
   supported_themes = import ./supported_themes.nix;
 in {
   options.vim.statusline.lualine = {
     enable = mkOption {
       type = types.bool;
-      description = "Enable lualine";
+      description = "Enable lualine statusline";
       default = true;
     };
 

modules/tabline/nvim-bufferline/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/tabline/nvim-bufferline/nvim-bufferline.nix

@@ -1,14 +1,11 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.tabline.nvimBufferline;
-in {
   options.vim.tabline.nvimBufferline = {
-    enable = mkEnableOption "nvim-bufferline-lua";
+    enable = mkEnableOption "Enable nvim-bufferline-lua as a bufferline";
   };
 }

modules/terminal/toggleterm/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/terminal/toggleterm/toggleterm.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.terminal.toggleterm;
-in {
   options.vim.terminal.toggleterm = {
     enable = mkEnableOption "Enable toggleterm as a replacement to built-in terminal command";
     direction = mkOption {

modules/theme/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/theme/default.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  pkgs,
-  config,
-  lib,
-  ...
-}: {
   imports = [
     ./theme.nix
     ./config.nix

modules/theme/theme.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...
@@ -13,7 +12,7 @@ in {
   options.vim.theme = {
     enable = mkOption {
       type = types.bool;
-      description = "Enable Theme";
+      description = "Enable theming";
     };
 
     name = mkOption {

modules/tidal/default.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
   imports = [
     ./tidal.nix
     ./config.nix

modules/tidal/tidal.nix

@@ -1,15 +1,12 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.tidal;
-in {
   options.vim.tidal = {
-    enable = mkEnableOption "tidal tools and plugins";
+    enable = mkEnableOption "Enable tidalcycles tools and plugins";
 
     flash = mkOption {
       description = ''When sending a paragraph or a single line, vim-tidal will "flash" the selection for some milliseconds'';

modules/treesitter/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/treesitter/context.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/treesitter/default.nix

@@ -1,9 +1,4 @@
-{
+{...}: {
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
   imports = [
     ./treesitter.nix
     ./context.nix

modules/treesitter/treesitter.nix

@@ -5,26 +5,24 @@
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.treesitter;
-in {
   options.vim.treesitter = {
     enable = mkOption {
       default = false;
       type = types.bool;
-      description = "enable tree-sitter [nvim-treesitter]";
+      description = "Enable tree-sitter [nvim-treesitter]";
     };
 
     fold = mkOption {
       default = false;
       type = types.bool;
-      description = "enable fold with tree-sitter";
+      description = "Enable fold with tree-sitter";
     };
 
     autotagHtml = mkOption {
       default = false;
       type = types.bool;
-      description = "enable autoclose and rename html tag [nvim-ts-autotag]";
+      description = "Enable autoclose and rename html tag [nvim-ts-autotag]";
     };
 
     grammars = mkOption {

modules/ui/noice/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/ui/noice/noice.nix

@@ -1,14 +1,11 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.ui.noice;
-in {
   options.vim.ui.noice = {
-    enable = mkEnableOption "noice-nvim";
+    enable = mkEnableOption "Enable noice-nvim UI modifications";
   };
 }

modules/utility/binds/cheatsheet/cheatsheet.nix

@@ -1,14 +1,11 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.binds.cheatsheet;
-in {
   options.vim.binds.cheatsheet = {
-    enable = mkEnableOption "Searchable cheatsheet for nvim using telescope";
+    enable = mkEnableOption "Enable cheatsheet-nvim: searchable cheatsheet for nvim using telescope";
   };
 }

modules/utility/binds/cheatsheet/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/utility/binds/which-key/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/utility/binds/which-key/which-key.nix

@@ -1,14 +1,11 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.binds.whichKey;
-in {
   options.vim.binds.whichKey = {
-    enable = mkEnableOption "which-key menu";
+    enable = mkEnableOption "Enable which-key keybind menu";
   };
 }

modules/utility/colorizer/colorizer.nix

@@ -1,14 +1,11 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.utility.colorizer;
-in {
   options.vim.utility.colorizer = {
-    enable = mkEnableOption "ccc color picker for neovim";
+    enable = mkEnableOption "Enable ccc color picker for neovim";
   };
 }

modules/utility/colorizer/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/utility/diffview/config.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

modules/utility/diffview/diffview.nix

@@ -1,13 +1,10 @@
 {
-  pkgs,
   config,
   lib,
   ...
 }:
 with lib;
-with builtins; let
+with builtins; {
-  cfg = config.vim.utility.diffview-nvim;
-in {
   options.vim.utility.diffview-nvim = {
     enable = mkEnableOption "Enable diffview-nvim";
   };