diff --git a/oscar/configuration.nix b/oscar/configuration.nix
index 76dcc84..e0d8a4f 100644
--- a/oscar/configuration.nix
+++ b/oscar/configuration.nix
@@ -98,6 +98,7 @@
   };
 
   environment.sessionVariables = {
+    NIXOS_OZONE_WL = "1";
     BUILDKIT_PROGRESS = "plain";
   };
 
@@ -247,11 +248,11 @@
 
     programs.git = {
       enable = true;
+      userEmail = "chandler@chandlerswift.com";
+      userName = "Chandler Swift";
       lfs.enable = true;
       # TODO: delta or diff-so-fancy or difftastic
-      settings = {
-        user.name = "Chandler Swift;
-        user.email = "chandler@chandlerswift.com";
+      extraConfig = {
         init.defaultBranch = "main";
         pull.ff = "only";
         #init.templatedir = "~/.git-template"; # unsure what this was intended to do -- default hooks, maybe?
@@ -286,7 +287,7 @@
 
     programs.ssh = {
       enable = true;
-      matchBlocks."*".addKeysToAgent = "yes";
+      addKeysToAgent = "yes";
       matchBlocks = {
         bert = {
           user = "root";
diff --git a/sam/configuration.nix b/sam/configuration.nix
index 45b1bbe..91b184d 100644
--- a/sam/configuration.nix
+++ b/sam/configuration.nix
@@ -93,13 +93,13 @@
       (azure-cli.withExtensions [
         # azure-cli.extensions.automation
         azure-cli.extensions.azure-devops
-        azure-cli.extensions.bastion
+        # 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
+        # azure-cli.extensions.ssh
       ])
       iperf
       units
@@ -131,6 +131,7 @@
 
       clang
 
+      go
       go-tools
       gopls
 
@@ -139,26 +140,6 @@
     programs.bash = {
       enable = true;
       historyControl = [ "ignoredups" "ignorespace" ];
-      initExtra = ''
-        # https://kubernetes.io/docs/reference/kubectl/quick-reference/#bash
-        source <(kubectl completion bash)
-        k() {
-          if [[ -t 1 ]]; then # stdout is a terminal
-            tput dim # Konsole's default theme requires some adjustment
-            printf "$ kubectl --context %q" "$(kubectl config current-context 2>/dev/null)"
-            printf " %q" "$@"
-            echo
-            tput sgr0
-          fi
-          kubectl "$@"
-        }
-        complete -o default -F __start_kubectl k
-      '';
-    };
-
-    programs.go = {
-      enable = true;
-      env.GOPATH = [ "/home/chandler/.local/share/go" ];
     };
 
     programs.direnv = {
@@ -169,10 +150,10 @@
 
     programs.git = {
       enable = true;
+      userName = "Chandler Swift";
       lfs.enable = true;
       # TODO: delta or diff-so-fancy or difftastic
-      settings = {
-        user.name = "Chandler Swift";
+      extraConfig = {
         help.autoCorrect = "prompt";
         init.defaultBranch = "main";
         diff.wsErrorHighlight = "all";
@@ -221,8 +202,7 @@
 
     programs.ssh = {
       enable = true;
-      matchBlocks."*".addKeysToAgent = "yes";
-      matchBlocks."ssh.dev.azure.com".extraOptions.WarnWeakCrypto = "no-pq-kex";
+      addKeysToAgent = "yes";
       includes = [
         "config.d/*"
       ];