Trim down odowork's install.

nix/configuration/hosts/odowork/default.nix

@@ -70,26 +70,21 @@
     me.alacritty.enable = true;
     me.amd_s2idle.enable = true;
     me.ansible.enable = true;
-    me.ares.enable = true;
     me.base.enable = true;
     me.bluetooth.enable = true;
     me.build_in_ram.enable = true;
-    me.chromecast.enable = true;
     me.chromium.enable = true;
     me.d2.enable = true;
     me.direnv.enable = true;
     me.doas.enable = true;
     me.docker.enable = false;
     me.dont_use_substituters.enable = true;
-    me.ecc.enable = false;
     me.emacs_flavor = "full";
-    me.emulate_isa.enable = true;
     me.firefox.enable = true;
     me.firewall.enable = true;
-    me.flux.enable = true;
     me.font.enable = true;
     me.gcloud.enable = true;
-    me.git.config = ../../roles/git/files/gitconfig_home;
+    me.git.config = ../../roles/git/files/gitconfig_work;
     me.git.enable = true;
     me.gnuplot.enable = true;
     me.gpg.enable = true;
@@ -97,8 +92,6 @@
     me.graphics_card_type = "amd";
     me.iso_mount.enable = true;
     me.jujutsu.enable = true;
-    me.kanshi.enable = false;
-    me.kubernetes.enable = true;
     me.latex.enable = true;
     me.launch_keyboard.enable = true;
     me.lvfs.enable = true;
@@ -108,34 +101,22 @@
     me.nix_index.enable = true;
     me.nvme.enable = true;
     me.openpgp_card_tools.enable = true;
-    me.pcsx2.enable = true;
     me.podman.enable = true;
     me.python.enable = true;
-    me.qemu.enable = true;
-    me.recovery.enable = true;
-    me.rpcs3.enable = true;
     me.rust.enable = true;
     me.sequoia.enable = true;
-    me.shadps4.enable = false;
     me.shikane.enable = true;
     me.sops.enable = true;
     me.sound.enable = true;
-    me.spaghettikart.enable = true;
     me.ssh.enable = true;
     me.sshd.enable = true;
-    me.steam.enable = true;
     me.steam_run_free.enable = true;
     me.sway.enable = true;
-    me.tekton.enable = true;
     me.terraform.enable = true;
     me.thunderbolt.enable = true;
     me.user.enable = true;
-    me.uutils.enable = false;
-    me.vnc_client.enable = true;
     me.vscode.enable = true;
-    me.wasm.enable = true;
     me.waybar.enable = true;
-    me.wine.enable = false;
     me.wireguard.activated = [
       "wgh"
     ];
@@ -144,9 +125,5 @@
     me.zfs.enable = true;
     me.zrepl.enable = true;
     me.zsh.enable = true;
-
-    me.sm64ex.enable = true;
-    me.shipwright.enable = true;
-    me.ship2harkinian.enable = true;
   };
 }

nix/configuration/hosts/quark/default.nix

@@ -108,7 +108,7 @@
     me.python.enable = true;
     me.qemu.enable = true;
     me.recovery.enable = true;
-    me.rpcs3.enable = false;
+    me.rpcs3.enable = true;
     me.rust.enable = true;
     me.sequoia.enable = true;
     me.shadps4.enable = false;

nix/configuration/roles/git/files/gitconfig_work

@@ -0,0 +1,58 @@
+[user]
+	email = ThomasA.Alexander@hmhn.org
+	name = Tom Alexander
+	signingkey = 36C99E8B3C39D85F
+[push]
+	default = simple # (default since 2.0)
+[alias]
+	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
+	bh = log --oneline --branches=* --remotes=* --graph --decorate
+	amend = commit --amend --no-edit
+        authorcount = shortlog --summary --numbered --all --no-merges
+[core]
+	excludesfile = ~/.gitignore_global
+[commit]
+	gpgsign = true
+	verbose = true
+[pull]
+	rebase = true
+[log]
+	date = local
+[init]
+	defaultBranch = main
+[diff]
+	tool = meld # Use meld for `git difftool` and `git mergetool`
+	algorithm = histogram
+	colorMoved = plain
+	mnemonicPrefix = true
+	renames = true
+[difftool]
+	prompt = false
+[difftool "meld"]
+	cmd = meld "$LOCAL" "$REMOTE"
+[merge]
+	tool = meld
+	conflictStyle = zdiff3
+[mergetool "meld"]
+        # Make the middle pane start with partially-merged contents:
+	cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
+        # Make the middle pane start without any merge progress:
+	# cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
+[includeIf "gitdir:/bridge/"]
+	path = /bridge/git/machine_setup/ansible/roles/base/files/gitconfig_home
+[includeIf "gitdir:/persist/"]
+	path = /bridge/git/machine_setup/ansible/roles/base/files/gitconfig_home
+[column]
+	ui = auto
+[branch]
+	sort = -committerdate
+[tag]
+	sort = version:refname
+[fetch]
+	prune = true
+	pruneTags = true
+	all = true
+[rebase]
+	autoSquash = true
+	autoStash = true
+	updateRefs = false