From fc6d55bb469ff492ab8dd2b413280ceaf5b0b457 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Tue, 5 Sep 2023 22:35:03 -0400
Subject: [PATCH] move vim  to new file

---
 modules/cli/default.nix          | 31 +------------------------------
 modules/cli/powerline-chars.json |  5 -----
 modules/cli/powerline.nix        |  7 ++++---
 modules/vim.nix                  | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 38 deletions(-)
 delete mode 100644 modules/cli/powerline-chars.json
 create mode 100644 modules/vim.nix

diff --git a/modules/cli/default.nix b/modules/cli/default.nix
index 35a82bf..9cac963 100644
--- a/modules/cli/default.nix
+++ b/modules/cli/default.nix
@@ -1,8 +1,4 @@
-{ config, pkgs, lib, ... }:
-let
-  pl = lib.importJSON ./powerline-chars.json;
-
-in
+{ config, lib, pkgs, ... }:
 {
   imports = [
     ./kubernetes.nix
@@ -147,29 +143,4 @@ in
       "nix-prefetch-github"
       "nix-shell"
     ];
-
-  programs.neovim = {
-    enable = true;
-    viAlias = true;
-    vimAlias = true;
-    defaultEditor = true;
-    configure = {
-      packages.sconfig.start = with pkgs.vimPlugins; [
-        vim-gitgutter
-        vim-nix
-      ];
-      customRC = ''
-        set mouse=
-        set encoding=utf-8
-        scriptencoding utf-8
-        set list nowrap scrolloff=9 updatetime=300 number
-        highlight GitGutterAdd    ctermfg=10
-        highlight GitGutterChange ctermfg=11
-        highlight GitGutterDelete ctermfg=9
-        let g:gitgutter_sign_removed = '${pl.lower_left_triangle}'
-        let g:gitgutter_sign_removed_first_line = '${pl.upper_left_triangle}'
-        let g:gitgutter_sign_modified_removed = '~~'
-      '';
-    };
-  };
 }
diff --git a/modules/cli/powerline-chars.json b/modules/cli/powerline-chars.json
deleted file mode 100644
index 5cfb1ef..0000000
--- a/modules/cli/powerline-chars.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"left_hard_divider": "\uE0B0",
-	"lower_left_triangle": "\uE0B8",
-	"upper_left_triangle": "\uE0BC"
-}
diff --git a/modules/cli/powerline.nix b/modules/cli/powerline.nix
index 4333726..c38935e 100644
--- a/modules/cli/powerline.nix
+++ b/modules/cli/powerline.nix
@@ -1,6 +1,7 @@
 { config, lib, pkgs, ... }:
 let
-  pl = lib.importJSON ./powerline-chars.json;
+  left_hard_divider = builtins.fromJSON '' "\uE0B0" '';
+  upper_left_triangle = builtins.fromJSON '' "\uE0BC" '';
 
   theme = {
     BoldForeground = true;
@@ -14,11 +15,11 @@ let
     Content = "$";
     Foreground = 231;
     Background = 102;
-    Separator = pl.left_hard_divider;
+    Separator = left_hard_divider;
   }];
 
   plconfig = builtins.toFile "powerline-config.json" (builtins.toJSON {
-    modes.patched.Separator = pl.upper_left_triangle;
+    modes.patched.Separator = upper_left_triangle;
   });
 
   args = [
diff --git a/modules/vim.nix b/modules/vim.nix
new file mode 100644
index 0000000..74610d4
--- /dev/null
+++ b/modules/vim.nix
@@ -0,0 +1,32 @@
+{ config, lib, pkgs, ... }:
+let
+  lower_left_triangle = builtins.fromJSON '' "\uE0B8" '';
+  upper_left_triangle = builtins.fromJSON '' "\uE0BC" '';
+
+in
+{
+  programs.neovim = {
+    enable = true;
+    viAlias = true;
+    vimAlias = true;
+    defaultEditor = true;
+    configure = {
+      packages.sconfig.start = with pkgs.vimPlugins; [
+        vim-gitgutter
+        vim-nix
+      ];
+      customRC = ''
+        set mouse=
+        set encoding=utf-8
+        scriptencoding utf-8
+        set list nowrap scrolloff=9 updatetime=300 number
+        highlight GitGutterAdd    ctermfg=10
+        highlight GitGutterChange ctermfg=11
+        highlight GitGutterDelete ctermfg=9
+        let g:gitgutter_sign_removed = '${lower_left_triangle}'
+        let g:gitgutter_sign_removed_first_line = '${upper_left_triangle}'
+        let g:gitgutter_sign_modified_removed = '~~'
+      '';
+    };
+  };
+}