From 3bad68566be634b79cefe91d9667c380d63c09f5 Mon Sep 17 00:00:00 2001
From: Daniel Winkler <daniel.winkler@s.wu.ac.at>
Date: Fri, 30 Jan 2026 16:05:54 +1100
Subject: [PATCH] small refactor

---
 flake.lock                       | 17 -------------
 flake.nix                        | 42 ++++++++++++++++++--------------
 modules/module/settings/core.nix |  8 +++---
 3 files changed, 28 insertions(+), 39 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9e005fb..b952666 100644
--- a/flake.lock
+++ b/flake.lock
@@ -52,22 +52,6 @@
         "type": "github"
       }
     },
-    "plugins-cmp-r": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1764700377,
-        "narHash": "sha256-xb7VFWM/BKAkN7fg62y8n618t2qkQjdYbPwhBhLJwtk=",
-        "owner": "R-nvim",
-        "repo": "cmp-r",
-        "rev": "70bfe8f4c062acc10266e24825439c009a0b1b89",
-        "type": "github"
-      },
-      "original": {
-        "owner": "R-nvim",
-        "repo": "cmp-r",
-        "type": "github"
-      }
-    },
     "plugins-r": {
       "flake": false,
       "locked": {
@@ -101,7 +85,6 @@
         "fran": "fran",
         "nixpkgs": "nixpkgs",
         "plugins-cmp-pandoc-references": "plugins-cmp-pandoc-references",
-        "plugins-cmp-r": "plugins-cmp-r",
         "plugins-r": "plugins-r",
         "rixpkgs": "rixpkgs",
         "wrappers": "wrappers"
diff --git a/flake.nix b/flake.nix
index 3b60fc3..bb95698 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,24 +50,30 @@
           r = true;
         };
 
-        settings.lang_packages = {
-          python = with pkgs.python3Packages; [
-            duckdb
-            polars
-          ];
+        settings = {
+          lang_packages = {
+            python = with pkgs.python3Packages; [
+              duckdb
+              polars
+            ];
 
-          r = with pkgs.rpkgs.rPackages; [
-            arrow
-            broom
-            data_table
-            duckdb
-            janitor
-            styler
-            tidyverse
-          ];
+            r = with pkgs.rpkgs.rPackages; [
+              arrow
+              broom
+              data_table
+              duckdb
+              janitor
+              styler
+              tidyverse
+            ];
 
-          julia = ["DataFramesMeta" "QuackIO"];
+            julia = ["DataFramesMeta" "QuackIO"];
+          };
+          colorscheme = "cyberdream";
+          background = "dark";
+          wrapRc = true;
         };
+          binName = "vv";
       };
 
     systems = [
@@ -144,7 +150,7 @@
         nvimPkg = wrapperSettings pkgs;
       in {
         default = pkgs.mkShell {
-          name = "n";
+          name = "vShell";
           packages = [nvimPkg];
           nativeBuildInputs = with pkgs; [] ++ (pkgs.lib.optionals self.wrappers.default.cats.optional [devenv]);
           inputsFrom = [];
@@ -186,12 +192,12 @@
     );
 
     nixosModules.default = wrappers.lib.mkInstallModule {
-      name = "n";
+      name = "vModule";
       value = module;
     };
 
     homeModules.default = wrappers.lib.mkInstallModule {
-      name = "n";
+      name = "vModule";
       value = module;
       loc = ["home" "packages"];
     };
diff --git a/modules/module/settings/core.nix b/modules/module/settings/core.nix
index c00fca4..1f9039f 100644
--- a/modules/module/settings/core.nix
+++ b/modules/module/settings/core.nix
@@ -8,18 +8,18 @@
   config.settings.config_directory = ../../..;
 
   # Default colorscheme and background
-  config.settings.colorscheme = "kanagawa";
-  config.settings.background = "dark";
+  config.settings.colorscheme = lib.mkDefault "kanagawa";
+  config.settings.background = lib.mkDefault "dark";
 
   # Enable RC wrapping (allows neovim to find the config)
-  config.settings.wrapRc = true;
+  config.settings.wrapRc = lib.mkDefault true;
 
   # Lua packages available to neovim (for :lua require())
   config.settings.nvim_lua_env = lp:
     lib.optionals (config.cats.general or false) [ lp.tiktoken_core ];
 
   # Binary name for the wrapper
-  config.binName = "n";
+  config.binName = lib.mkDefault "n";
 
   # Prevent neovim from loading system-wide config
   config.settings.block_normal_config = true;