treewide: move nvf styling out of module

modules/hm/programs/editors/neovim.nix

@@ -4,13 +4,16 @@
   pkgs,
   osConfig,
   ...
-}: {
+}: let
+  styleCfg = osConfig.local.style;
+in {
   imports = [inputs.nvf.homeManagerModules.default];
 
   config = lib.mkIf osConfig.local.profiles.desktop.enable {
     programs.nvf = {
       enable = true;
-      settings.vim = {
+      settings.vim = lib.mkMerge [
+        {
           viAlias = true;
           vimAlias = true;
           enableLuaLoader = true;
@@ -40,12 +43,6 @@
             };
           };
 
-        theme = lib.mkDefault {
-          enable = true;
-          name = "catppuccin";
-          style = "macchiato";
-        };
-
           ui = {
             noice.enable = true;
           };
@@ -222,7 +219,15 @@
           filetree.neo-tree.enable = true;
 
           telescope.enable = true;
+        }
+        (lib.mkIf styleCfg.enable {
+          theme = {
+            enable = true;
+            name = "base16";
+            base16-colors = styleCfg.scheme.palette;
           };
+        })
+      ];
     };
 
     programs.neovide = {

modules/nix/style/modules/nvf.nix

@@ -1,17 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.local.style;
-in {
-  config.home-manager.sharedModules = lib.mkIf cfg.enable [
-    {
-      programs.nvf.settings.vim.theme = {
-        enable = true;
-        name = "base16";
-        base16-colors = cfg.scheme.palette;
-      };
-    }
-  ];
-}