Clean up the building

home/hosts/jude/default.nix

@@ -3,7 +3,7 @@
 {
 	home.packages = with pkgs; [
 		(mumble.override { pulseSupport = true; })
-		logseq
+		#logseq
 	];
 	greg = {
 		gui = true;

home/modules/baseline/xonsh_footer.xsh

@@ -44,6 +44,10 @@ def _cfetch(args):
     $CIRCLECI_CLI_TOKEN=$(bw get password CircleCI) 
     compass workspace exec bazel run src/go/compass.com/tools/circleci_results_cache/fetch/cmd/fetch:fetch
 
+def _aws_creds(args):
+    $AWS_ACCESS_KEY_ID=$(bw get username "AWS Access Key")
+    $AWS_SECRET_ACCESS_KEY=$(bw get password "AWS Access Key")
+
 def _rebuild(args):
     system = uname()
     if system.sysname == 'Darwin':
@@ -92,6 +96,7 @@ def _bake(args):
         git clone src:greg/copier-templates.git ~/.copier-templates
     copier copy @(str(templates / args[0])) .
 
+aliases['aws_creds'] = _aws_creds
 aliases['glrestart'] = _glrestart
 aliases['bake'] = _bake
 aliases['unlock'] = _unlock

hosts/jude/default.nix

@@ -47,7 +47,6 @@
 		[
 			bind  # For things like nslookup
 			create_ssl
-			darktable
 			distrobox
 			expect
 			gimp
@@ -63,11 +62,8 @@
 			libxml2
 			linode-cli
 			makemkv
-			nix-du
-			nix-tree
 			oathToolkit
 			synology-drive-client
-			terraform
 			usbutils
 			vagrant
 			ventoy

modules/baseline.nix

@@ -36,13 +36,10 @@ in
     # Base packages that need to be in all my hosts
     environment.systemPackages = with pkgs; [
 		agenix
-		android-file-transfer
 		bitwarden-cli
 		bmon
-		configure_aws_creds
 		diffutils
 		git
-		gh
 		gnupatch
 		gregpy
 		findutils
@@ -54,7 +51,6 @@ in
 		nano
 		pciutils
 		pwgen
-		transcrypt
 		unzip
 		wget
 	];

modules/nixos/gnome.nix

@@ -49,9 +49,9 @@ in with lib; {
 
 		# Enable some Gnome plugins that I like
 		environment.systemPackages = with pkgs; [
-			gnome3.adwaita-icon-theme
+			adwaita-icon-theme
-			gnome3.gnome-tweaks
+			gnome-tweaks
-			gnome3.dconf-editor
+			dconf-editor
 			gnomeExtensions.appindicator
 			gnomeExtensions.clipboard-indicator
 			gnomeExtensions.dash-to-dock

overlays/configure_aws_creds.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-let
-	bw = "${pkgs.bitwarden-cli}/bin/bw";
-
-in pkgs.writeShellScriptBin "configure_aws_creds" ''
-set -ex -o pipefail
-
-session="$(${bw} unlock | grep -e '$ export' | awk -F\" '{print $2}')"
-export BW_SESSION="''${session}"
-export AWS_ACCESS_KEY_ID="$(${bw} get username "AWS Access Key")"
-export AWS_SECRET_ACCESS_KEY="$(${bw} get password "AWS Access Key")"
-''

overlays/default.nix

@@ -45,7 +45,6 @@ in rec {
 
 	# My own packages
 	aacs = prev.callPackage ./aacs.nix {};
-	configure_aws_creds = prev.callPackage ./configure_aws_creds.nix {};
 	create_ssl = prev.callPackage ./create_ssl.nix {};
 	enwiki-dump = prev.callPackage ./enwiki-dump.nix {};
 	hms = prev.callPackage ./hms {