From 8467b9b336bd74685361355acc74a802b8bc01f6 Mon Sep 17 00:00:00 2001
From: Bit Borealis <theotheroracle@disroot.org>
Date: Wed, 2 Aug 2023 20:04:27 +0000
Subject: [PATCH] cleanup and fixing edit command

---
 home.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/home.nix b/home.nix
index 297bc9b..58c3368 100644
--- a/home.nix
+++ b/home.nix
@@ -63,11 +63,6 @@ with import ./modules/neovim-config.nix { inherit pkgs lib fromGitHub; };
 	};
 
 	home.sessionVariables = {
-  		# system configuration
-		VISUAL = "neovide --nofork";
-		NEOVIDE_MULTIGRID = 1;
-		ZELLIJ_AUTO_EXIT = "true";
-
 		# fish config
 		fish_greeting = "✨ heya ${config.home.username}, welcome to $(hostnamectl --pretty) ~";
 	};
@@ -140,12 +135,10 @@ with import ./modules/neovim-config.nix { inherit pkgs lib fromGitHub; };
 		};
 		"org/gnome/mutter".center-new-windows = true;
 		"org/gnome/desktop/sound".allow-volume-above-100-percent = true;
-		"org/gnome/settings-daemon/plugins/media-keys".custom-keybindings
-		= [
-		"/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
+		"org/gnome/settings-daemon/plugins/media-keys".custom-keybindings = [
+			"/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
 		];
-		"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" 
-		= {
+		"org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
 			binding = "<Super>t";
 			command = "wezterm";
 			name = "Wezterm";
@@ -159,9 +152,7 @@ with import ./modules/neovim-config.nix { inherit pkgs lib fromGitHub; };
 	programs.home-manager.enable = true;
 	programs.zellij = {
 		enable = true;
-#		enableFishIntegration = true;
 		settings = {
-			default_layout = "compact";
 			ui = {
 				pane_frames = {
 					hide_session_name = true;
@@ -173,6 +164,7 @@ with import ./modules/neovim-config.nix { inherit pkgs lib fromGitHub; };
 	programs.zoxide = {
 		enable = true;
 		enableFishIntegration = true;
+		options = [ "--cmd cd" ];
 	};
 	programs.git = {
 		enable = true;
@@ -288,7 +280,7 @@ end
 '';
 			edit = ''
 if test $XDG_SESSION_TYPE != tty
-	neovide $argv #should be fixed later to use VISUAL somehow, reference funced
+	$VISUAL $argv #should be fixed later to use VISUAL somehow, reference funced
 else
 	$EDITOR $argv
 end
@@ -315,6 +307,7 @@ fish_add_path ~/.local/bin/scripts
 fish_add_path ~/.local/share/cargo/bin
 fish_add_path /var/lib/flatpak/exports/bin
 fish_vi_key_bindings
+set -gx VISUAL neovide --nofork --multigrid
 '';
 	};
 	programs.password-store = {