From 91012170228909732af9d1b3b6ad15e2f9f7953e Mon Sep 17 00:00:00 2001
From: Caroline Larimore <caroline@larimo.re>
Date: Fri, 7 Feb 2025 05:46:50 -0800
Subject: migration: vim config

---
 roles/home/dev/vim.nix                          | 37 ---------------------
 snowfall/modules/home/suites/common/default.nix |  1 +
 snowfall/modules/home/tools/vim/default.nix     | 44 +++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 37 deletions(-)
 delete mode 100644 roles/home/dev/vim.nix
 create mode 100644 snowfall/modules/home/tools/vim/default.nix

diff --git a/roles/home/dev/vim.nix b/roles/home/dev/vim.nix
deleted file mode 100644
index 3aa68e9..0000000
--- a/roles/home/dev/vim.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ config, lib, ... }:
-
-# Honestly, I'm pretty disappointed with
-#   home-manager's `programs.vim`. It's kinda bad and
-#   won't let me run `highlight` after `colorscheme`
-
-lib.mkIf config.home.roles.dev.enable {
-  home.file.".vim/vimrc".text = ''
-    set number
-    set relativenumber
-
-    set termguicolors
-    set background=dark
-    colorscheme gruvbox
-
-    syntax on
-
-    highlight Normal guibg=#000000
-
-    " Awesome magical color override from
-    " https://gist.github.com/romainl/379904f91fa40533175dfaec4c833f2f
-    augroup MyColors
-      autocmd!
-      autocmd ColorScheme * highlight Normal guibg=#000000
-    augroup END
-  '';
-
-  home.file.".vim/pack/default/start/gruvbox".source = builtins.fetchGit {
-    url = "https://github.com/morhetz/gruvbox.git";
-    rev = "f1ecde848f0cdba877acb0c740320568252cc482";
-  };
-
-  home.file.".vim/pack/all/start/vim-nix".source = builtins.fetchGit {
-    url = "https://github.com/LnL7/vim-nix.git";
-    rev = "e25cd0f2e5922f1f4d3cd969f92e35a9a327ffb0";
-  };
-}
diff --git a/snowfall/modules/home/suites/common/default.nix b/snowfall/modules/home/suites/common/default.nix
index c4620ee..c40f903 100644
--- a/snowfall/modules/home/suites/common/default.nix
+++ b/snowfall/modules/home/suites/common/default.nix
@@ -10,6 +10,7 @@ in {
   config = mkIf cfg.enable {
     cxl = {
       tools = {
+        vim.enable = true;
         git.enable = true;
       };
     };
diff --git a/snowfall/modules/home/tools/vim/default.nix b/snowfall/modules/home/tools/vim/default.nix
new file mode 100644
index 0000000..e4625a3
--- /dev/null
+++ b/snowfall/modules/home/tools/vim/default.nix
@@ -0,0 +1,44 @@
+{ options, config, lib, namespace, ... }:
+
+with lib; with lib.${namespace}; let
+  cfg = config.${namespace}.tools.vim;
+  theme = config.${namespace}.desktop.theme;
+in {
+  options.${namespace}.tools.vim = with types; {
+    enable = mkEnableOption "vim";
+  };
+
+  config = mkIf cfg.enable {
+    home.file.".vim/vimrc".text = ''
+      set number
+      set relativenumber
+      set showcmd
+
+      set termguicolors
+      set background=dark
+      colorscheme ${theme.name}
+  
+      syntax on
+
+      highlight Normal guibg=#000000
+
+      " Awesome magical color override from
+      " https://gist.github.com/romainl/379904f91fa40533175dfaec4c833f2f
+      augroup MyColors
+        autocmd!
+        autocmd ColorScheme * highlight Normal guibg=#000000
+      augroup END
+    '';
+
+    home.file.".vim/pack/default/start/gruvbox".source = builtins.fetchGit {
+      url = "https://github.com/morhetz/gruvbox.git";
+      rev = "f1ecde848f0cdba877acb0c740320568252cc482";
+    };
+
+    home.file.".vim/pack/all/start/vim-nix".source = builtins.fetchGit {
+      url = "https://github.com/LnL7/vim-nix.git";
+      rev = "e25cd0f2e5922f1f4d3cd969f92e35a9a327ffb0";
+    };
+  };
+}
+
-- 
cgit v1.2.3