Update darwin stuff

home-manager/hammerspoon/C3CWorkspace.spoon/init.lua

@@ -12,31 +12,31 @@ return (function()
         license = "MIT";
     }
 
-    -- DELL S2722DGM: 0F6BDB5B-840D-40BE-AAC9-B467A78E057A
+    -- DELL S2722DGM: 394ACDEE-CA25-43C4-A533-D4EDF4A897AF
     -- DELL S2721DGF: D3142823-261D-46EF-B9C2-5181C7FE2CA5
-    -- AV Receiver:   B5A65BB6-E73E-4C3D-977C-33C86798AA5A
+    -- AV Receiver:   B5845603-D54C-44B8-9B55-96F7E5F50646
     local appScreenMap = {
         Slack = {
             desktop = 1,
-            screen = "0F6BDB5B-840D-40BE-AAC9-B467A78E057A",
+            screen = "394ACDEE-CA25-43C4-A533-D4EDF4A897AF",
             fullscreen = true,
         },
         Cursor = {
             desktop = 1,
-            screen = "B5A65BB6-E73E-4C3D-977C-33C86798AA5A",
+            screen = "B5845603-D54C-44B8-9B55-96F7E5F50646",
             fullscreen = true,
         },
         Notes = {
             desktop = 2,
-            screen = "B5A65BB6-E73E-4C3D-977C-33C86798AA5A"
+            screen = "B5845603-D54C-44B8-9B55-96F7E5F50646"
         },
         Spotify = {
             desktop = 3,
-            screen = "B5A65BB6-E73E-4C3D-977C-33C86798AA5A",
+            screen = "B5845603-D54C-44B8-9B55-96F7E5F50646",
             fullscreen = true,
         },
         ["zoom.us"] = {
-            screen = "B5A65BB6-E73E-4C3D-977C-33C86798AA5A",
+            screen = "B5845603-D54C-44B8-9B55-96F7E5F50646",
             fullscreen = true,
         },
         ["Microsoft Outlook"] = {

home-manager/hammerspoon/window-move.lua

@@ -63,7 +63,7 @@ windowMove = function()
 
 	hs.hotkey.bind({ "ctrl", "alt", "cmd" }, "pad3", function()
 		-- AV Receiver
-		local scr = getScreenById("B5A65BB6-E73E-4C3D-977C-33C86798AA5A")
+		local scr = getScreenById("B5845603-D54C-44B8-9B55-96F7E5F50646")
 		if scr == nil then
 			return
 		end
@@ -109,7 +109,7 @@ windowMove = function()
 
 	hs.hotkey.bind({ "ctrl", "alt", "cmd", "shift" }, "pad3", function()
 		-- AV Receiver
-		local scr = getScreenById("B5A65BB6-E73E-4C3D-977C-33C86798AA5A")
+		local scr = getScreenById("B5845603-D54C-44B8-9B55-96F7E5F50646")
 		if scr == nil then
 			return
 		end

home-manager/lcech-mac-veracode.nix

@@ -69,6 +69,9 @@ in
                 User becky
                 Hostname 10.196.196.5
                 IdentityFile ~/.ssh/id_ed25519_access
+
+        host gitlab.veracode-staging.us
+                IdentityFile ~/.ssh/id_rsa_fedramp
       '';
     };
 
@@ -96,8 +99,6 @@ in
 
   programs.git = {
     enable = true;
-    userName = gitUsername;
-    userEmail = gitEmail;
 
     ignores = [
       ".vscode"
@@ -111,7 +112,10 @@ in
       key = "5ABD6C5E";
     };
 
-    extraConfig = {
+    settings = {
+      user.name = gitUsername;
+      user.email = gitEmail;
+
       core = {
         autocrlf = "input";
         editor = "vim";
@@ -178,6 +182,7 @@ in
     shellAliases = {
       hammerspoon-config = "open -a ${pkgs.hammerspoon}/Applications/Hammerspoon.app/Contents/MacOS/Hammerspoon";
       get-key = "${pkgs.writeShellScript "get-key" ''
+        set -e
         scp dingleberry:/self/hintihint/keys/sum.key ${homedir}/hw.key
         read -p "waiting for confirmation to delete the key"
         rm ${homedir}/hw.key
@@ -192,7 +197,7 @@ in
           fi
         fi
 
-        if [[ $(dig +short myip.opendns.com @resolver1.opendns.com) == "185.142.210.84" ]]; then
+        if [[ "$(ipconfig getifaddr en0)" =~ "10.125.24" ]]; then
           sudo wg-quick up /etc/wireguard/home.conf
         else
           sudo wg-quick up /etc/wireguard/home-remote.conf

home-manager/shared/ghostty.config

@@ -1,4 +1,4 @@
-theme = "catppuccin-mocha"
+theme = "Catppuccin Mocha"
 window-width = 9999
 window-height = 9999