From c91e61b56e8c80a53877fea112c5d7d78fd6c1ad Mon Sep 17 00:00:00 2001
From: Sweetbread <sweetbread@coders-squad.com>
Date: Wed, 1 May 2024 15:43:11 +0300
Subject: [PATCH] [pkgs]: Helix

---
 home-manager/modules/bundle.nix       |  1 -
 home-manager/modules/nvim.nix         | 11 -----------
 home-manager/modules/wms/hyprland.nix |  4 ++--
 home-manager/zsh.nix                  |  5 ++---
 nixos/modules/env.nix                 |  2 +-
 nixos/packages.nix                    |  2 +-
 6 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 home-manager/modules/nvim.nix

diff --git a/home-manager/modules/bundle.nix b/home-manager/modules/bundle.nix
index 41a7bd9..46b9836 100644
--- a/home-manager/modules/bundle.nix
+++ b/home-manager/modules/bundle.nix
@@ -5,7 +5,6 @@
     ./htop.nix
     ./alacritty.nix
     ./qt.nix
-    ./nvim.nix
 
     ./wms/hyprland.nix
     ./wms/waybar.nix
diff --git a/home-manager/modules/nvim.nix b/home-manager/modules/nvim.nix
deleted file mode 100644
index 92edfba..0000000
--- a/home-manager/modules/nvim.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs, ... }: {
-  xdg.configFile.nvim = {
-    source = pkgs.fetchFromGitHub {
-      owner = "AstroNvim";
-      repo = "template";
-      rev = "60a8ea905787c27cbd854985e47dc2195e763732";
-      sha256 = "03bxdzs9zjm1xd0aqwsckm1d2hbz8bsfw6ac5fzx319a2hyiwfp9";
-    };
-    recursive = true;
-  };
-}
diff --git a/home-manager/modules/wms/hyprland.nix b/home-manager/modules/wms/hyprland.nix
index 02919dc..206db7f 100644
--- a/home-manager/modules/wms/hyprland.nix
+++ b/home-manager/modules/wms/hyprland.nix
@@ -200,8 +200,8 @@
         # Configuration files
         ''$mainMod ALT, N, exec, alacritty -e sh -c "rb"''
         ''$mainMod ALT, C, exec, alacritty -e sh -c "conf"''
-        ''$mainMod ALT, H, exec, alacritty -e sh -c "nvim ~/nix/home-manager/modules/wms/hyprland.nix"''
-        ''$mainMod ALT, W, exec, alacritty -e sh -c "nvim ~/nix/home-manager/modules/wms/waybar.nix"''
+        ''$mainMod ALT, H, exec, alacritty -e sh -c "$EDITOR ~/nix/home-manager/modules/wms/hyprland.nix"''
+        ''$mainMod ALT, W, exec, alacritty -e sh -c "$EDITOR ~/nix/home-manager/modules/wms/waybar.nix"''
         '', Print, exec, grim -g "$(slurp)" - | swappy -f -''
 
         # Waybar
diff --git a/home-manager/zsh.nix b/home-manager/zsh.nix
index 5e982e9..6c6d912 100644
--- a/home-manager/zsh.nix
+++ b/home-manager/zsh.nix
@@ -16,11 +16,10 @@
 
       hms = "home-manager switch --flake ${flakeDir}";
 
-      conf = "nvim ${flakeDir}/nixos/configuration.nix";
-      pkgs = "nvim ${flakeDir}/nixos/packages.nix";
+      conf = "$EDITOR ${flakeDir}/nixos/configuration.nix";
+      pkgs = "$EDITOR ${flakeDir}/nixos/packages.nix";
 
       ll = "ls -l";
-      v = "nvim";
       se = "sudoedit";
       ff = "fastfetch";
       cat = "bat";
diff --git a/nixos/modules/env.nix b/nixos/modules/env.nix
index 0353b25..5161cf9 100644
--- a/nixos/modules/env.nix
+++ b/nixos/modules/env.nix
@@ -1,6 +1,6 @@
 {
   environment.variables = {
-    EDITOR = "nvim";
+    EDITOR = "hx";
     RANGER_LOAD_DEFAULT_RC = "FALSE";
     QT_QPA_PLATFORMTHEME = "qt5ct";
     GSETTINGS_BACKEND = "keyfile";
diff --git a/nixos/packages.nix b/nixos/packages.nix
index 1c52838..e162364 100644
--- a/nixos/packages.nix
+++ b/nixos/packages.nix
@@ -65,7 +65,7 @@
     tldr
     bat
     xdg-utils
-    neovim
+    helix
 
     # GUI utils
     feh