From c0795d3c25ecd55b61dc9aac8e3602a76f0b88bb Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler+pearson@chandlerswift.com>
Date: Fri, 11 Jul 2025 14:29:26 -0500
Subject: [PATCH 1/5] sam: Install extra applications

Mostly copied from oscar's config.
---
 sam/configuration.nix | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/sam/configuration.nix b/sam/configuration.nix
index cfdf69b..83c27bc 100644
--- a/sam/configuration.nix
+++ b/sam/configuration.nix
@@ -69,8 +69,44 @@
   };
   home-manager.users.chandler = { pkgs, ... }: {
     home.packages = with pkgs; [
+      # applications
+      gimp
+      inkscape
       kdePackages.kate
+      libreoffice-qt
+
+      # command line applications
+      iperf
+      units
+
+      # command line utilities
+      alsa-utils
+      dig
+      file
+      ffmpeg
+      git-absorb
       gh
+      imagemagick
+      jujutsu
+      killall
+      pv
+      ripgrep
+      unzip
+      wl-clipboard
+
+      # ✨ AI ✨
+      ollama
+
+      # compilers/language utils
+      cargo
+      rustc
+
+      clang
+
+      go
+      go-tools
+      gopls
+
     ];
 
     programs.bash = {

From 30264133f807dbc297e6efe0a0f78ba1ee873754 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler+pearson@chandlerswift.com>
Date: Fri, 11 Jul 2025 14:30:49 -0500
Subject: [PATCH 2/5] sam: Use correct key for machine-config

---
 sam/configuration.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sam/configuration.nix b/sam/configuration.nix
index 83c27bc..22ad4ae 100644
--- a/sam/configuration.nix
+++ b/sam/configuration.nix
@@ -159,6 +159,10 @@
           condition = "gitdir:/home/chandler/work/github-vue/";
           contents.core.sshCommand = "ssh -i ~/.ssh/github-vue";
         }
+        {
+          condition = "gitdir:/home/chandler/projects/machine-config";
+          contents.core.sshCommand = "ssh -i ~/.ssh/machine-config-deploy-key";
+        }
       ];
       hooks = {
         pre-commit = ../git-pre-commit-hook;

From 5814eaa5f1d350e0c92e1ba1d3a4054f33040092 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler+pearson@chandlerswift.com>
Date: Mon, 14 Jul 2025 12:41:34 -0500
Subject: [PATCH 3/5] sam: Install hyperfine

---
 sam/configuration.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sam/configuration.nix b/sam/configuration.nix
index 22ad4ae..883b76a 100644
--- a/sam/configuration.nix
+++ b/sam/configuration.nix
@@ -86,6 +86,7 @@
       ffmpeg
       git-absorb
       gh
+      hyperfine
       imagemagick
       jujutsu
       killall

From d49871079f97e590b7bd08dda90042e96ca179c1 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler+pearson@chandlerswift.com>
Date: Mon, 14 Jul 2025 12:41:25 -0500
Subject: [PATCH 4/5] sam: Install azure-cli with devops extension

The commented extensions had been installed at one point in the past,
but it's unclear if they're actually things I use, so left out for now.
---
 sam/configuration.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/sam/configuration.nix b/sam/configuration.nix
index 883b76a..7e870a6 100644
--- a/sam/configuration.nix
+++ b/sam/configuration.nix
@@ -76,6 +76,17 @@
       libreoffice-qt
 
       # command line applications
+      (azure-cli.withExtensions [
+        # azure-cli.extensions.automation
+        azure-cli.extensions.azure-devops
+        # azure-cli.extensions.bastion
+        # azure-cli.extensions.fleet
+        # azure-cli.extensions.interactive
+        # azure-cli.extensions.log-analytics
+        # azure-cli.extensions.resource-graph
+        # azure-cli.extensions.serial-console
+        # azure-cli.extensions.ssh
+      ])
       iperf
       units
 

From f908b10435c0ac6a4e78b028fba11d15d49b1046 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler+pearson@chandlerswift.com>
Date: Tue, 15 Jul 2025 17:08:18 -0500
Subject: [PATCH 5/5] sam: Fix includeIf trailing slash

This isn't a new issue; not even to me!

https://news.ycombinator.com/item?id=38946967

> chandlerswift on Jan 11, 2024 | on: Conditional Git Configuration
>
> I'd attempted to configure this some time back, but never gotten it
> working, and this was the kick in the pants I needed to finally get
> it working!
>
> In case anyone is stuck in the same way that I was, the trailing
> slash at the end (which I had previously omitted, not realizing) is
> necessary for this to work. The docs[0] mention this, but I'd managed
> to repeatedly miss it:
>
> > If the pattern ends with /, * will be automatically added. For
> > example, the pattern foo/ becomes foo/*. In other words, it matches
> > "foo" and everything inside, recursively.
>
> [0]: https://git-scm.com/docs/git-config#Documentation/git-config...

:doh:
---
 sam/configuration.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sam/configuration.nix b/sam/configuration.nix
index 7e870a6..7bac6a2 100644
--- a/sam/configuration.nix
+++ b/sam/configuration.nix
@@ -172,7 +172,7 @@
           contents.core.sshCommand = "ssh -i ~/.ssh/github-vue";
         }
         {
-          condition = "gitdir:/home/chandler/projects/machine-config";
+          condition = "gitdir:/home/chandler/projects/machine-config/";
           contents.core.sshCommand = "ssh -i ~/.ssh/machine-config-deploy-key";
         }
       ];