16 files changed, 22 insertions, 18 deletions
diff --git a/modules/development/nixvim/colorscheme.nix b/modules/development/nixvim/colorscheme.nix
index ba81634..ce2e7cc 100644
--- a/modules/development/nixvim/colorscheme.nix
+++ b/modules/development/nixvim/colorscheme.nix
@@ -2,7 +2,7 @@
 
 # Colorscheme - Base16 theme configuration for nixvim
 {
-  config.programs.nixvim.colorschemes.base16 = lib.mkIf config.programs.nixvim.enable {
+  config.programs.nixvim.colorschemes.base16 = lib.mkIf config.development.nixvim.enable {
     enable = true;
     colorscheme = with config.scheme.withHashtag; {
       base00 = base00;
diff --git a/modules/development/nixvim/default.nix b/modules/development/nixvim/default.nix
index c7978d4..6cd0957 100644
--- a/modules/development/nixvim/default.nix
+++ b/modules/development/nixvim/default.nix
@@ -8,8 +8,13 @@
     ./plugins
   ];
 
-  config = {
+  options.development.nixvim = {
+    enable = lib.mkEnableOption "Enables nixvim.";
+  };
+
+  config = lib.mkIf config.development.nixvim.enable {
     programs.nixvim = {
+      enable = true;
       defaultEditor = true;
       opts = {
         number = true;
@@ -79,14 +84,13 @@
           update_in_insert = false;
           float = {
             border = "rounded";
-            source = true; # Show which LSP the diagnostic is from
+            source = true;
             header = "";
             prefix = "";
           };
         };
       };
 
-      # Show diagnostics float on cursor hold
       autoCmd = [
         {
           event = [ "CursorHold" ];
diff --git a/modules/development/nixvim/keymaps.nix b/modules/development/nixvim/keymaps.nix
index 4e4b35a..941e902 100644
--- a/modules/development/nixvim/keymaps.nix
+++ b/modules/development/nixvim/keymaps.nix
@@ -2,7 +2,7 @@
 
 # Keymaps - Keyboard shortcut configuration for nixvim
 {
-  config.programs.nixvim.keymaps = lib.mkIf config.programs.nixvim.enable [
+  config.programs.nixvim.keymaps = lib.mkIf config.development.nixvim.enable [
     {
       key = "<c-h>";
       action = "<c-w>h";
diff --git a/modules/development/nixvim/plugins/cmp.nix b/modules/development/nixvim/plugins/cmp.nix
index 683e0d3..0bf8601 100644
--- a/modules/development/nixvim/plugins/cmp.nix
+++ b/modules/development/nixvim/plugins/cmp.nix
@@ -2,7 +2,7 @@
 
 # Cmp - Completion plugin (nvim-cmp) for auto-completion
 {
-  config.programs.nixvim.plugins.cmp = lib.mkIf config.programs.nixvim.enable {
+  config.programs.nixvim.plugins.cmp = lib.mkIf config.development.nixvim.enable {
     enable = true;
     autoEnableSources = true;
     settings = {
diff --git a/modules/development/nixvim/plugins/comment.nix b/modules/development/nixvim/plugins/comment.nix
index cc1b9cb..a14bd10 100644
--- a/modules/development/nixvim/plugins/comment.nix
+++ b/modules/development/nixvim/plugins/comment.nix
@@ -2,7 +2,7 @@
 
 # Comment - Comment toggling plugin (comment.nvim)
 {
-  config.programs.nixvim.plugins.comment = lib.mkIf config.programs.nixvim.enable {
+  config.programs.nixvim.plugins.comment = lib.mkIf config.development.nixvim.enable {
     enable = true;
     settings = {
       toggler = {
diff --git a/modules/development/nixvim/plugins/gitsigns.nix b/modules/development/nixvim/plugins/gitsigns.nix
index ea99eba..a737238 100644
--- a/modules/development/nixvim/plugins/gitsigns.nix
+++ b/modules/development/nixvim/plugins/gitsigns.nix
@@ -2,7 +2,7 @@
 
 # Gitsigns - Git status in the sign column (gitsigns.nvim)
 {
-  config.programs.nixvim.plugins.gitsigns = lib.mkIf config.programs.nixvim.enable {
+  config.programs.nixvim.plugins.gitsigns = lib.mkIf config.development.nixvim.enable {
     enable = true;
   };
 }
diff --git a/modules/development/nixvim/plugins/indent-blankline.nix b/modules/development/nixvim/plugins/indent-blankline.nix
index eb2674a..38e6a91 100644
--- a/modules/development/nixvim/plugins/indent-blankline.nix
+++ b/modules/development/nixvim/plugins/indent-blankline.nix
@@ -2,7 +2,7 @@
 
 # Indent-blankline - Visual indentation guides (indent-blankline.nvim)
 {
-  config.programs.nixvim.plugins.indent-blankline = lib.mkIf config.programs.nixvim.enable {
+  config.programs.nixvim.plugins.indent-blankline = lib.mkIf config.development.nixvim.enable {
     enable = true;
     settings = {
       indent = {
diff --git a/modules/development/nixvim/plugins/lsp.nix b/modules/development/nixvim/plugins/lsp.nix
index 7fc3ddd..cac48a2 100644
--- a/modules/development/nixvim/plugins/lsp.nix
+++ b/modules/development/nixvim/plugins/lsp.nix
@@ -2,7 +2,7 @@
 
 # LSP - Language Server Protocol configuration (nvim-lspconfig)
 {
-  config.programs.nixvim.plugins.lsp = lib.mkIf config.programs.nixvim.enable {
+  config.programs.nixvim.plugins.lsp = lib.mkIf config.development.nixvim.enable {
     enable = true;
     inlayHints = true;
     autoLoad = true;
diff --git a/modules/development/nixvim/plugins/lualine.nix b/modules/development/nixvim/plugins/lualine.nix
index 72f34be..b621b7c 100644
--- a/modules/development/nixvim/plugins/lualine.nix
+++ b/modules/development/nixvim/plugins/lualine.nix
@@ -2,7 +2,7 @@
 
 # Lualine - Statusline configuration (lualine.nvim)
 {
-  config.programs.nixvim.plugins.lualine = lib.mkIf config.programs.nixvim.enable {
+  config.programs.nixvim.plugins.lualine = lib.mkIf config.development.nixvim.enable {
     enable = true;
     settings = {
       options = {
diff --git a/modules/development/nixvim/plugins/luasnip.nix b/modules/development/nixvim/plugins/luasnip.nix
index 60571e9..6c48c8b 100644
--- a/modules/development/nixvim/plugins/luasnip.nix
+++ b/modules/development/nixvim/plugins/luasnip.nix
@@ -2,7 +2,7 @@
 
 # Luasnip - Snippet engine for Neovim (Lua-based)
 {
-  config.programs.nixvim.plugins.luasnip = lib.mkIf config.programs.nixvim.enable {
+  config.programs.nixvim.plugins.luasnip = lib.mkIf config.development.nixvim.enable {
     enable = true;
   };
 }
diff --git a/modules/development/nixvim/plugins/noice.nix b/modules/development/nixvim/plugins/noice.nix
index d466506..ddbe6c8 100644
--- a/modules/development/nixvim/plugins/noice.nix
+++ b/modules/development/nixvim/plugins/noice.nix
@@ -2,7 +2,7 @@
 
 # Noice - Modern UI for Neovim (cmdline, popupmenu, messages)
 {
-  config.programs.nixvim.plugins.noice = lib.mkIf config.programs.nixvim.enable {
+  config.programs.nixvim.plugins.noice = lib.mkIf config.development.nixvim.enable {
     enable = true;
   };
 }
diff --git a/modules/development/nixvim/plugins/nvim-tree.nix b/modules/development/nixvim/plugins/nvim-tree.nix
index 2ad6570..4eeb8c6 100644
--- a/modules/development/nixvim/plugins/nvim-tree.nix
+++ b/modules/development/nixvim/plugins/nvim-tree.nix
@@ -2,7 +2,7 @@
 
 # Nvim-tree - File explorer sidebar (nvim-tree.lua)
 {
-  config.programs.nixvim.plugins.nvim-tree = lib.mkIf config.programs.nixvim.enable {
+  config.programs.nixvim.plugins.nvim-tree = lib.mkIf config.development.nixvim.enable {
     enable = true;
     settings = {
       filters = {
diff --git a/modules/development/nixvim/plugins/telescope.nix b/modules/development/nixvim/plugins/telescope.nix
index b9678fc..cd8c001 100644
--- a/modules/development/nixvim/plugins/telescope.nix
+++ b/modules/development/nixvim/plugins/telescope.nix
@@ -2,7 +2,7 @@
 
 # Telescope - Fuzzy finder
 {
-  config.programs.nixvim.plugins.telescope = lib.mkIf config.programs.nixvim.enable {
+  config.programs.nixvim.plugins.telescope = lib.mkIf config.development.nixvim.enable {
     enable = true;
     extensions = {
       fzf-native.enable = true; # faster fuzzy sorting
diff --git a/modules/development/nixvim/plugins/treesitter.nix b/modules/development/nixvim/plugins/treesitter.nix
index 035ac7a..c983832 100644
--- a/modules/development/nixvim/plugins/treesitter.nix
+++ b/modules/development/nixvim/plugins/treesitter.nix
@@ -2,7 +2,7 @@
 
 # Treesitter - Syntax highlighting and parsing (nvim-treesitter)
 {
-  config.programs.nixvim.plugins.treesitter = lib.mkIf config.programs.nixvim.enable {
+  config.programs.nixvim.plugins.treesitter = lib.mkIf config.development.nixvim.enable {
     enable = true;
     folding = {
       enable = true;
diff --git a/modules/development/nixvim/plugins/web-devicons.nix b/modules/development/nixvim/plugins/web-devicons.nix
index 3c6ad86..6366af9 100644
--- a/modules/development/nixvim/plugins/web-devicons.nix
+++ b/modules/development/nixvim/plugins/web-devicons.nix
@@ -2,7 +2,7 @@
 
 # Web-devicons - File icons for various file types (nvim-web-devicons)
 {
-  config.programs.nixvim.plugins.web-devicons = lib.mkIf config.programs.nixvim.enable {
+  config.programs.nixvim.plugins.web-devicons = lib.mkIf config.development.nixvim.enable {
     enable = true;
   };
 }
diff --git a/modules/development/nixvim/plugins/which-key.nix b/modules/development/nixvim/plugins/which-key.nix
index 18018e7..67f2427 100644
--- a/modules/development/nixvim/plugins/which-key.nix
+++ b/modules/development/nixvim/plugins/which-key.nix
@@ -2,7 +2,7 @@
 
 # Which-key - Popup for keybindings (which-key.nvim)
 {
-  config.programs.nixvim.plugins.which-key = lib.mkIf config.programs.nixvim.enable {
+  config.programs.nixvim.plugins.which-key = lib.mkIf config.development.nixvim.enable {
     enable = true;
     settings = {
       plugins = {