From 60418048408df3a42bff7b1dfbc5df9f4d909ab7 Mon Sep 17 00:00:00 2001
From: The Hive <theotheroracle@disroot.org>
Date: Mon, 24 Jul 2023 05:34:37 +0000
Subject: [PATCH] major updates

---
 home.nix | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 73 insertions(+), 5 deletions(-)

diff --git a/home.nix b/home.nix
index f7f249c..7a4e03f 100644
--- a/home.nix
+++ b/home.nix
@@ -21,10 +21,8 @@
 		bat
 		diceware
 		pwgen
-		kitty
 		git
 		srain
-		neovim
 		neovide
 		schildichat-desktop
 		dino
@@ -39,6 +37,7 @@
 		tdesktop
 		ripgrep
 		tmate
+		comic-mono
 		btop
 		firefox
 		apostrophe
@@ -48,14 +47,15 @@
 		wl-clipboard
 		adw-gtk3
 	# some bullshit to get gnome apps to install withotu a prefix
-	] ++ (with pkgs.gnome; with pkgs.gnomeExtensions; [
+	] ++ ( with pkgs.gnome;  [
 		gnome-boxes
 		gnome-tweaks
 		dconf-editor
+	] ++ ( with pkgs.gnomeExtensions; [
 		night-theme-switcher
 		rounded-window-corners
 		appindicator
-	]);
+	]));
 
 
 	# Home Manager is pretty good at managing dotfiles. The primary way to manage
@@ -75,7 +75,9 @@
 
 	home.sessionVariables = {
   		# system configuration
-		EDITOR = "nvim";
+#		EDITOR = "nvim";
+		VISUAL = "neovide --nofork";
+		NEOVIDE_MULTIGRID = 1;
 
 		# fish config
 		fish_greeting = "✨️ heya ${config.home.username}, welcome to $(hostname) ~";
@@ -83,6 +85,18 @@
 
 	# configure programs
 	programs.home-manager.enable = true;
+	programs.neovim = {
+		enable = true;
+		defaultEditor = true;
+		viAlias = true;
+		vimAlias = true;
+		vimdiffAlias = true;
+		withNodeJs = true;
+
+		coc = {
+			enable = true;
+		};
+	};
 	programs.fish = {
 		enable = true;
 		shellAbbrs = {
@@ -94,6 +108,34 @@
 			nxu = "sudo nixos-rebuild boot --upgrade";
 			nxc = "sudo nix-collect-garbage -d";
 		};
+		shellAliases = {
+			aria = "aria2c -c -k1M -x10";
+			dw = "diceware -n 6 -d -";
+		};
+		functions = {
+			edit = ''
+if test $XDG_SESSION_TYPE != tty
+	$VISUAL $argv
+else
+	$EDITOR $argv
+end
+'';
+			fish_prompt = ''
+set -l last_status $status
+prompt_login
+echo -n ' : '
+set_color $fish_color_cwd
+echo -n (prompt_pwd)
+set_color normal
+fish_vcs_prompt '|%s'
+echo " ඞ"
+if not test $last_status -eq 0
+    set_color $fish_color_error
+end
+echo -n "> "
+set_color normal
+'';
+		};
 		interactiveShellInit = ''
 fish_add_path ~/.local/bin
 fish_add_path ~/.local/bin/scripts
@@ -110,6 +152,32 @@ fish_vi_key_bindings
 			PASSWORD_STORE_CLIP_TIME = "60";
 		};
 	};
+	programs.kitty = {
+		enable = true;
+		shellIntegration.enableFishIntegration = true;
+		theme = "Catppuccin-Mocha";
+		settings = {
+			tab_bar_style = "powerline";
+			tab_powerline_style = "round";
+			hide_window_decorations = true;
+			tab_bar_edge = "top";
+			remember_window_size = false;
+			initial_window_widthc = 216;
+			initial_window_heightc = 168;
+			allow_remote_control = true;
+			shell = "fish";
+			editor = "nvim";
+			font_family = "Comic Mono";
+			font_size = 13;
+		};
+	};
 	programs.browserpass.enable = true;
 	programs.gpg.enable = true;
+
+	# themeing
+	qt = {
+		enable = true;
+		platformTheme = "gnome";
+		style.name = "adwaita";
+	};
 }