From 39c3ac0ef8da6f27c8f6ea24e1b32d607fb8e298 Mon Sep 17 00:00:00 2001
From: Mirza <21687187+arunoruto@users.noreply.github.com>
Date: Sun, 15 Dec 2024 21:10:13 +0100
Subject: [PATCH] Add vim to sys package

---
 flake.nix                                    | 2 +-
 modules/home-manager/environment.nix         | 4 +++-
 modules/home-manager/server/programs/git.nix | 1 +
 modules/nixos/environment/packages.nix       | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index ea6abc7..7caac45 100644
--- a/flake.nix
+++ b/flake.nix
@@ -129,7 +129,7 @@
         "yoruichi" = "mirza"; # Crappy AMD Mini PC
         "shinji" = "mirza"; # M720q Mini PC
         "kenpachi" = "mirza"; # S740 Mini PC
-        "narouter" = "mirza"; # Firewall
+        # "narouter" = "mirza"; # Firewall
         "aizen" = "mirza";
         # Work
         "kyuubi" = "mar"; # Crappy Work PC
diff --git a/modules/home-manager/environment.nix b/modules/home-manager/environment.nix
index cb180e0..f49f5ca 100644
--- a/modules/home-manager/environment.nix
+++ b/modules/home-manager/environment.nix
@@ -8,9 +8,11 @@
   options.environment.enable = lib.mkEnableOption "Set env vars for user";
 
   config = lib.mkIf config.environment.enable {
-    home.sessionVariables = {
+    home.sessionVariables = rec {
       # EDITOR = "nvim";
       EDITOR = "hx";
+      GET_EDITOR = EDITOR;
+      VISUAL = EDITOR;
       BROWSER = "zen";
       WINIT_UNIX_BACKEND = "x11";
       FLAKE = "/home/${user}/.config/flake";
diff --git a/modules/home-manager/server/programs/git.nix b/modules/home-manager/server/programs/git.nix
index 9219eba..2f38242 100644
--- a/modules/home-manager/server/programs/git.nix
+++ b/modules/home-manager/server/programs/git.nix
@@ -33,6 +33,7 @@ in
       };
       extraConfig =
         {
+          core.editor = "hx";
           pull.rebase = true;
           init.defaultBranch = "main";
           credential = {
diff --git a/modules/nixos/environment/packages.nix b/modules/nixos/environment/packages.nix
index a6d109f..0830e50 100644
--- a/modules/nixos/environment/packages.nix
+++ b/modules/nixos/environment/packages.nix
@@ -23,6 +23,7 @@
     dust
     riffdiff
     # unstable.ventoy
+    vim
     wget
   ];
 }