From 0e2e500739ae65a2d0c0827983a82202169a429c Mon Sep 17 00:00:00 2001
From: genofire <geno+dev@fireorbit.de>
Date: Fri, 13 Jan 2023 22:12:04 +0100
Subject: [PATCH] fix!(backup): try nushell, btop, rustup replace cargo and
 much more tools (like for k8s)

---
 home/README.md        |  5 ++++
 home/default.nix      | 64 +++++++++++++++++++++++++++++++++++++------
 home/desktop-sway.nix | 14 +++++++++-
 home/desktop.nix      | 20 ++++++++++++--
 nixos/default.nix     |  3 ++
 5 files changed, 94 insertions(+), 12 deletions(-)

diff --git a/home/README.md b/home/README.md
index 53ce192..07ca62f 100644
--- a/home/README.md
+++ b/home/README.md
@@ -1,5 +1,10 @@
 # Home-Manager
 
+```bash
+nix-channel --add https://github.com/nix-community/home-manager/archive/master.tar.gz home-manager
+nix-channel --update
+```
+
 Create `~/.config/nixpkgs/home.nix` with:
 ```nix
 {pkgs, ...}:
diff --git a/home/default.nix b/home/default.nix
index 0a6d313..d5f076e 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -15,12 +15,14 @@
 			deepmerge
 			pip
 			passlib # bcrypt
+			pyyaml
 		]))
 		ansible
 		killall
 		tree
 		htop
 		mosh
+		dasel
 		git
 		pre-commit
 		git-lfs
@@ -28,6 +30,7 @@
 		git-annex
 		ghorg
 		tig
+		cocogitto
 		tea
 		glab
 		figlet
@@ -39,19 +42,23 @@
 		liboping # fix it
 		mtr
 		ookla-speedtest
+		hey
 		colordiff
 		direnv
-		# nice prompt together with grml
-		pure-prompt
-		#vimPlugins.nvim-lspconfig
-		#vimPlugins.nerdtree
-		go gcc libcap
+		## nice prompt together with grml
+		# pure-prompt
+		# vimPlugins.nvim-lspconfig
+		# vimPlugins.nerdtree
+		go_1_18 gcc libcap
 		gopls
-		cargo
+		# cargo
+		rustup
 		yarn
 		cmake
 		pwgen
-		gotify-cli
+		hugo
+		asciidoctor-with-extensions
+		# gotify-cli # use ntfy.sh
 		glow
 		imagemagick
 		ffmpeg
@@ -59,12 +66,25 @@
 		terraform
 		tflint
 		kubectl
+		kustomize
 		kubernetes-helm
 		helmfile
-		k9s
+		stern
+		kubeswitch
+		kubespy
+		fluxcd
+		kubeseal
 		# nixopsUnstable
 	];
 
+	home.shellAliases = {
+		k9sctx = "k9s --kubeconfig=$(switch)";
+		k9s = "k9s --headless";
+		kubectx = "export KUBECONFIG=$(switch)";
+	};
+
+	programs.home-manager.enable = true;
+
 	programs.password-store = {
 		enable = true;
 		package = pkgs.pass-wayland.withExtensions (exts: [
@@ -75,6 +95,23 @@
 		};
 	};
 
+	programs.nushell = {
+		enable = true;
+		# envFile.text = ''
+		#  let-env config = {
+		#	  hooks: {
+		#	    pre_prompt: [{
+		#	      code: "
+		#	        let direnv = (direnv export json | from json)
+		#	        let direnv = if ($direnv | length) == 1 { $direnv } else { {} }
+		#	        $direnv | load-env
+		#	      "
+		#	    }]
+		#	  }
+		#	}
+		# '';
+	};
+
 	programs.zsh = {
 		enable = true;
 
@@ -105,6 +142,8 @@
 		};
 	};
 	programs.direnv.enable = true;
+	programs.btop.enable = true;
+	programs.tealdeer.enable = true; # man / tldr ...
 	programs.gitui.enable = true;
 
 	programs.neovim = {
@@ -134,4 +173,13 @@
 			};
 		};
 	};
+
+	programs.k9s = {
+		enable = true;
+		# does not open ERROR with clusters settings
+		#settings.k9s = {
+		#	headless = true;
+		#	logger.fullScreenLogs = true;
+		#};
+	};
 }
diff --git a/home/desktop-sway.nix b/home/desktop-sway.nix
index fde0c66..8e9c374 100644
--- a/home/desktop-sway.nix
+++ b/home/desktop-sway.nix
@@ -124,8 +124,20 @@ in
 						position = "0 0";
 						scale = "1.25";
 					};
+					"Japan Display Inc. 0x364C Unknown" = {
+						position = "0 0";
+						scale = "1.25";
+					};
+					"LG Electronics LG HDR 4K 0x0000655D" = {
+						position = "2400 0";
+						enable = "";
+						scale = "1.0";
+						# disable = true;
+						# resolution = "3840x2160@30Hz";
+						resolution = "3840x2160";
+					};
 					"Goldstar Company Ltd LG HDR 4K 0x0000655D" = {
-						position = "3000 0";
+						position = "2400 0";
 						enable = "";
 						scale = "1.0";
 						# disable = true;
diff --git a/home/desktop.nix b/home/desktop.nix
index c75a523..d3bf861 100644
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -4,6 +4,7 @@
 
  	home.sessionVariables = {
 		BROWSER = "firefox";
+		NIXOS_OZONE_WL = "1";
 	};
 
 	fonts.fontconfig.enable = true;
@@ -24,7 +25,7 @@
 		# dbus
 		gcr
 		dconf
-		gotify-desktop
+		# gotify-desktop # use ntfy.sh instatt
 		# apps
 		virt-manager
 		lens
@@ -40,10 +41,19 @@
 		inkscape
 		gimp
 		homebank
-		gramps # ahnen
+		# ahnen
+		(gramps.override {
+			enableOSM = true;
+			enableGraphviz = true;
+			enableGhostscript = true;
+		#	pythonPath = [ pythonPackages.keyring ];
+		})
+		python310Packages.keyring
+		graphviz-nox
 		# - tootle # mastodon
 		# fractal # matrix
-		fluffychat
+		fractal-next
+		# fluffychat
 		cozy # audiobooks
 	];
 	gtk = {
@@ -66,6 +76,9 @@
 	};
 	programs.gpg = {
 		enable = true;
+		scdaemonSettings = {
+			disable-ccid = true;
+		};
 		settings = {
 			keyserver = "hkps://keys.openpgp.org";
 		};
@@ -84,6 +97,7 @@
 	};
 	programs.firefox = {
 		enable = true;
+		# package = pkgs.librewolf;
 		# package = pkgs.firefox-devedition-bin-unwrapped;
 	};
 }
diff --git a/nixos/default.nix b/nixos/default.nix
index e0da466..e1328fa 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -59,12 +59,14 @@
 		home-manager
 		## nice prompt together with grml
 		# pure-prompt
+		nushell
 	];
 	environment.shellAliases = {
 		ip = "ip --color";
 		watch = "watch -c";
 		grep = "grep --color=always --exclude-dir=.git";
 		vim = "hx";
+		k9s = "k9s --headless";
 	};
 	environment.variables.EDITOR = "hx";
 
@@ -80,6 +82,7 @@
 	};
 
 	# zsh
+	# users.defaultUserShell = pkgs.nushell;
 	users.defaultUserShell = pkgs.zsh;
 	programs.zsh = {
 		enable = true;