From 80dc37f30e931ccacbcc24c376533a334ff846b4 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Wed, 16 Jul 2025 09:54:55 -0500 Subject: [PATCH 1/4] sam: Set git help.autoCorrect=prompt --- sam/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/sam/configuration.nix b/sam/configuration.nix index a450fa3..72cac10 100644 --- a/sam/configuration.nix +++ b/sam/configuration.nix @@ -139,6 +139,7 @@ lfs.enable = true; # TODO: delta or diff-so-fancy or difftastic extraConfig = { + help.autoCorrect = "prompt"; init.defaultBranch = "main"; diff.wsErrorHighlight = "all"; pull.ff = "only"; From c9ce1b7c193421ad729664f07db4ce589df24db6 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Wed, 16 Jul 2025 16:38:03 -0500 Subject: [PATCH 2/4] sam: Install azure-cli resource-graph extension --- sam/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sam/configuration.nix b/sam/configuration.nix index 72cac10..854120a 100644 --- a/sam/configuration.nix +++ b/sam/configuration.nix @@ -83,7 +83,7 @@ # azure-cli.extensions.fleet # azure-cli.extensions.interactive # azure-cli.extensions.log-analytics - # azure-cli.extensions.resource-graph + azure-cli.extensions.resource-graph # azure-cli.extensions.serial-console # azure-cli.extensions.ssh ]) From 3f464bd7916364ad8d54ce6369b46aa67d379ae9 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Mon, 21 Jul 2025 10:20:18 -0500 Subject: [PATCH 3/4] sam: Add openconnect --- sam/configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sam/configuration.nix b/sam/configuration.nix index 854120a..de7fe4c 100644 --- a/sam/configuration.nix +++ b/sam/configuration.nix @@ -102,6 +102,9 @@ jujutsu killall kubectl + # From https://github.com/NixOS/nixpkgs/pull/370555 + # I don't expect this to be backported, so this should be removed with 25.11 + (import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/a5ea75e611fb5bf6898d7d72401f6cb2aacf30f0.tar.gz") {}).openconnect pv ripgrep unzip From ff4f0a88fa542bfc0bf0b536303acdbe2f76fe94 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Mon, 21 Jul 2025 10:20:54 -0500 Subject: [PATCH 4/4] sam: Mount UTM host share This requires that I explicitly specify `chandler`'s UID and GID. --- sam/configuration.nix | 2 ++ sam/hardware-configuration.nix | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/sam/configuration.nix b/sam/configuration.nix index de7fe4c..ab0e14d 100644 --- a/sam/configuration.nix +++ b/sam/configuration.nix @@ -62,7 +62,9 @@ }; security.sudo.wheelNeedsPassword = false; + users.groups.users.gid = 100; users.users.chandler = { + uid = 1000; isNormalUser = true; description = "Chandler Swift"; extraGroups = [ "networkmanager" "wheel" "docker"]; diff --git a/sam/hardware-configuration.nix b/sam/hardware-configuration.nix index eb44286..6330286 100644 --- a/sam/hardware-configuration.nix +++ b/sam/hardware-configuration.nix @@ -24,6 +24,31 @@ options = [ "fmask=0077" "dmask=0077" ]; }; + fileSystems."/mnt/utm" = { + device = "share"; + fsType = "9p"; + options = [ + "trans=virtio" + "version=9p2000.L" + "rw" + "_netdev" + "nofail" + "auto" + ]; + }; + + fileSystems."/home/chandler/shared_with_host" = { + device = "/mnt/utm"; + fsType = "fuse.bindfs"; + options = [ + "map=502/${builtins.toString config.users.users.chandler.uid}:@20/@${builtins.toString config.users.groups.users.gid}" + "x-systemd.requires=/mnt/utm" + "_netdev" + "nofail" + "auto" + ]; + }; + swapDevices = [ { device = "/dev/disk/by-uuid/6c923fd7-5b0a-4dd5-b1ce-6cd4ea144275"; } ];