Mac things

Add claude code to mac
Formatting and hammerspoon
2026-01-13 13:26:57 +01:00 · 2026-01-02 23:28:02 +01:00 · 2025-12-29 12:23:03 +01:00 · 2025-12-29 12:21:57 +01:00 · 2025-12-29 10:16:31 +01:00 · 2025-12-14 21:57:38 +01:00
12 changed files with 307 additions and 173 deletions
@@ -52,6 +52,7 @@ in
    git
    coreutils
    vim
+    flameshot
    wireguard-tools
  ];

@@ -6,11 +6,11 @@
  # these need to be updated manually
  homebrew.casks = [
    "drawio"
-    "flameshot"
    "ghostty"
    "keepassxc"
    "spotify"
    "wireshark-chmodbpf"
+    "visual-studio-code"
  ];

  system.primaryUser = "lcech";
@@ -1,12 +1,18 @@
 {
  "nodes": {
    "cl-nix-lite": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": "nixpkgs",
+        "systems": "systems",
+        "treefmt-nix": "treefmt-nix"
+      },
      "locked": {
-        "lastModified": 1728174978,
-        "narHash": "sha256-Grqqg+xuicANB85j0gNEXxi9SBKY7bzGeTuyi95eGcY=",
+        "lastModified": 1766810506,
+        "narHash": "sha256-I4BxozsEu205tA7jazufztI8ZQ5p7hcCnjqrSKPz9nI=",
        "owner": "hraban",
        "repo": "cl-nix-lite",
-        "rev": "31cfe6275c341eb3120a99f4b1c8516c49a29d87",
+        "rev": "038e341cede255a83a8f04af114dc95717461d32",
        "type": "github"
      },
      "original": {
@@ -32,6 +38,24 @@
        "type": "github"
      }
    },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1765835352,
+        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
    "flake-utils": {
      "inputs": {
        "systems": [
@@ -54,7 +78,7 @@
    },
    "flake-utils_2": {
      "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
      },
      "locked": {
        "lastModified": 1731533236,
@@ -77,11 +101,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1762704774,
-        "narHash": "sha256-iodz4xQbULkHqetbPu5BCSWsVEzZiiNSv0/dzfH4XiE=",
+        "lastModified": 1766980997,
+        "narHash": "sha256-oegDNAvyQwaG3GqSi4U5jpKM7SYHGESGVIuKMRV/lbw=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "be4a9233dd3f6104c9b0fdd3d56f953eb519a4c7",
+        "rev": "7a7b43c7231a439d248179ba8d561dd6cd81799b",
        "type": "github"
      },
      "original": {
@@ -98,15 +122,15 @@
        "nixpkgs": [
          "nixpkgs"
        ],
-        "systems": "systems",
-        "treefmt-nix": "treefmt-nix"
+        "systems": "systems_2",
+        "treefmt-nix": "treefmt-nix_2"
      },
      "locked": {
-        "lastModified": 1756057867,
-        "narHash": "sha256-ziR5eQGqRWhW8tf8r0TIplaqNt+HXu1G1X41LUr4IYo=",
+        "lastModified": 1766810876,
+        "narHash": "sha256-VPElWFQIiP31lXQXEom+L4sl85alZpZn33O4hewsP9k=",
        "owner": "hraban",
        "repo": "mac-app-util",
-        "rev": "8414fa1e2cb775b17793104a9095aabeeada63ef",
+        "rev": "4747968574ea58512c5385466400b2364c85d2d0",
        "type": "github"
      },
      "original": {
@@ -122,11 +146,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1762627886,
-        "narHash": "sha256-/QLk1bzmbcqJt9sU43+y/3tHtXhAy0l8Ck0MoO2+evQ=",
+        "lastModified": 1766784396,
+        "narHash": "sha256-rIlgatT0JtwxsEpzq+UrrIJCRfVAXgbYPzose1DmAcM=",
        "owner": "LnL7",
        "repo": "nix-darwin",
-        "rev": "5125a3cd414dc98bbe2c528227aa6b62ee61f733",
+        "rev": "f0c8e1f6feb562b5db09cee9fb566a2f989e6b55",
        "type": "github"
      },
      "original": {
@@ -158,11 +182,42 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1754340878,
-        "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=",
+        "lastModified": 1766736597,
+        "narHash": "sha256-BASnpCLodmgiVn0M1MU2Pqyoz0aHwar/0qLkp7CjvSQ=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "cab778239e705082fe97bb4990e0d24c50924c04",
+        "rev": "f560ccec6b1116b22e6ed15f4c510997d99d5852",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1765674936,
+        "narHash": "sha256-k00uTP4JNfmejrCLJOwdObYC9jHRrr/5M/a/8L2EIdo=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "2075416fcb47225d9b68ac469a5c4801a9c4dd85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1761236834,
+        "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1",
        "type": "github"
      },
      "original": {
@@ -172,13 +227,29 @@
        "type": "github"
      }
    },
-    "nixpkgs_2": {
+    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1762482733,
-        "narHash": "sha256-g/da4FzvckvbiZT075Sb1/YDNDr+tGQgh4N8i5ceYMg=",
+        "lastModified": 1761236834,
+        "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1766870016,
+        "narHash": "sha256-fHmxAesa6XNqnIkcS6+nIHuEmgd/iZSP/VXxweiEuQw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e1ebeec86b771e9d387dd02d82ffdc77ac753abc",
+        "rev": "5c2bc52fb9f8c264ed6c93bd20afa2ff5e763dce",
        "type": "github"
      },
      "original": {
@@ -198,11 +269,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1762274591,
-        "narHash": "sha256-Vbhluvk15qwiyNDyPd9tjJh9gxIfUjbKVT79c05Pd3I=",
+        "lastModified": 1763909441,
+        "narHash": "sha256-56LwV51TX/FhgX+5LCG6akQ5KrOWuKgcJa+eUsRMxsc=",
        "owner": "nix-community",
        "repo": "plasma-manager",
-        "rev": "6296d7100cc84b2ff732b7c103a50c2856974cf6",
+        "rev": "b24ed4b272256dfc1cc2291f89a9821d5f9e14b4",
        "type": "github"
      },
      "original": {
@@ -217,11 +288,26 @@
        "mac-app-util": "mac-app-util",
        "nix-darwin": "nix-darwin",
        "nixgl": "nixgl",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_4",
        "plasma-manager": "plasma-manager"
      }
    },
    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
      "locked": {
        "lastModified": 1689347925,
        "narHash": "sha256-ozenz5bFe1UUqOn7f60HRmgc01BgTGIKZ4Xl+HbocGQ=",
@@ -236,7 +322,7 @@
        "type": "github"
      }
    },
-    "systems_2": {
+    "systems_3": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -253,14 +339,32 @@
    },
    "treefmt-nix": {
      "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1755934250,
-        "narHash": "sha256-CsDojnMgYsfshQw3t4zjRUkmMmUdZGthl16bXVWgRYU=",
+        "lastModified": 1766000401,
+        "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "74e1a52d5bd9430312f8d1b8b0354c92c17453e5",
+        "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "treefmt-nix_2": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3"
+      },
+      "locked": {
+        "lastModified": 1766000401,
+        "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd",
        "type": "github"
      },
      "original": {
@@ -52,7 +52,8 @@
            function (
              import nixpkgs {
                inherit system;
-                config.allowUnfreePredicate = (pkg: builtins.elem (nixpkgs.lib.getName pkg) [ "nvidia" ]);
+                config.allowUnfreePredicate = (pkg: builtins.elem (nixpkgs.lib.getName pkg) [ "nvidia" "claude-code" ]);
+                config.allowUnfree = true;
              }
            )
          );
@@ -106,7 +107,21 @@
            (
              { ... }:
              {
-                nixpkgs.overlays = [ overlay ];
+                nixpkgs.overlays = [ 
+                  overlay
+                  (
+                    self: super:
+                    let
+                      nixpkgsWithFree = import nixpkgs {
+                        system = "aarch64-darwin";
+                        config.allowUnfree = true;
+                      };
+                    in
+                    {
+                      claude-code = nixpkgsWithFree.claude-code;
+                    }
+                  )
+                ];
              }
            )
            mac-app-util.darwinModules.default
@@ -46,6 +46,7 @@ in
        "application/xhtml+xml" = "userapp-Firefox-5T0SK2.desktop";
        "application/x-extension-xhtml" = "userapp-Firefox-5T0SK2.desktop";
        "application/x-extension-xht" = "userapp-Firefox-5T0SK2.desktop";
+        "x-scheme-handler/lmstudio" = "LM Studio.desktop";
      };
      enable = true;
    };
@@ -65,6 +66,8 @@ in

  home.packages = with pkgs; [
    android-tools
+    direnv
+    nix-direnv
    kdePackages.kdeconnect-kde
    # TODO: Move from system to nix
    # awscli2
@@ -78,6 +81,7 @@ in
      text = ''
        default-cache-ttl 34560000
        max-cache-ttl 34560000
+        allow-loopback-pinentry
        pinentry-program ${pkgs.pinentry-curses}/bin/pinentry
      '';
    };
@@ -152,6 +156,7 @@ in
    enable = true;
    settings = {
      use-agent = true;
+      pinentry-mode = "loopback";
    };
    mutableKeys = false;
    publicKeys = [ ];
@@ -302,6 +307,7 @@ in
      vysokyujezd = "${homedir}/storage/.life/stavby/vysoky-ujezd";
      work = "/mnt/yosuke/share/arnie/work";
      smarthome = "/mnt/yosuke/share/arnie/smarthome";
+      lab = "/mnt/storage/.lab";

      # Hardware
      v2-red = "${homedir}/storage/.hardware/3d-print/v2-red-V2-2201270017";
@@ -15,8 +15,9 @@
    awscli2
    kubectl
    nixd
-    yq
+    tree
    viu
+    yq
  ];

  # Let Home Manager install and manage itself.
@@ -29,7 +29,9 @@
                    echo "Commands:"
                    echo -n '${
                      builtins.toJSON (
-                        builtins.mapAttrs (s: value: value.description) self.devShells.${pkgs.stdenv.hostPlatform.system}.default.config.scripts
+                        builtins.mapAttrs (
+                          s: value: value.description
+                        ) self.devShells.${pkgs.stdenv.hostPlatform.system}.default.config.scripts
                      )
                    }' | \
                    ${pkgs.jq}/bin/jq -r 'to_entries | map("  \(.key)\n" + "    - \(if .value == "" then "no description provided" else .value end)") | "" + .[]'
@@ -12,31 +12,27 @@ 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 = {
+        Code = {
            desktop = 1,
-            screen = "B5A65BB6-E73E-4C3D-977C-33C86798AA5A",
+            screen = "D3142823-261D-46EF-B9C2-5181C7FE2CA5",
            fullscreen = true,
        },
-        Notes = {
-            desktop = 2,
-            screen = "B5A65BB6-E73E-4C3D-977C-33C86798AA5A"
-        },
        Spotify = {
-            desktop = 3,
-            screen = "B5A65BB6-E73E-4C3D-977C-33C86798AA5A",
+            desktop = 2,
+            screen = "D3142823-261D-46EF-B9C2-5181C7FE2CA5",
            fullscreen = true,
        },
        ["zoom.us"] = {
-            screen = "B5A65BB6-E73E-4C3D-977C-33C86798AA5A",
+            screen = "D3142823-261D-46EF-B9C2-5181C7FE2CA5",
            fullscreen = true,
        },
        ["Microsoft Outlook"] = {
@@ -35,7 +35,7 @@ windowMove = function()

 	hs.hotkey.bind({ "ctrl", "alt", "cmd" }, "pad1", function()
 		-- DELL S2722DGM
-		local scr = getScreenById("0F6BDB5B-840D-40BE-AAC9-B467A78E057A")
+		local scr = getScreenById("394ACDEE-CA25-43C4-A533-D4EDF4A897AF")
 		if scr == nil then
 			return
 		end
@@ -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
@@ -79,7 +79,7 @@ windowMove = function()

 	hs.hotkey.bind({ "ctrl", "alt", "cmd", "shift" }, "pad1", function()
 		-- DELL S2722DGM
-		local scr = getScreenById("0F6BDB5B-840D-40BE-AAC9-B467A78E057A")
+		local scr = getScreenById("394ACDEE-CA25-43C4-A533-D4EDF4A897AF")
 		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
@@ -32,11 +32,13 @@ in
  home.stateVersion = "24.11";

  home.packages = with pkgs; [
-    hammerspoon
-    pstree
-    watch
+    claude-code
    colima
    docker
+    hammerspoon
+    pstree
+    ssm-session-manager-plugin
+    watch
    wireshark-qt
  ];

@@ -69,6 +71,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 +101,6 @@ in

  programs.git = {
    enable = true;
-    userName = gitUsername;
-    userEmail = gitEmail;

    ignores = [
      ".vscode"
@@ -111,7 +114,10 @@ in
      key = "5ABD6C5E";
    };

-    extraConfig = {
+    settings = {
+      user.name = gitUsername;
+      user.email = gitEmail;
+
      core = {
        autocrlf = "input";
        editor = "vim";
@@ -178,6 +184,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,12 +199,15 @@ 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
        fi
      ''}";
+      ssm = "${pkgs.writeShellScript "ssm" ''
+        aws --profile $1 --region ''${3:-us-east-1} ssm start-session --target $2
+      ''}";
    };

    initContent = ''
@@ -21,8 +21,7 @@ in
      size = 10000;
    };

-    shellAliases =
-      {
+    shellAliases = {
      # use eval $(aws-export-credentials) to expose them to environment
      aws-export-credentials = lib.mkDefault "${pkgs.awscli2}/bin/aws configure export-credentials --format env --profile";

@@ -1,4 +1,4 @@
-theme = "catppuccin-mocha"
+theme = "Catppuccin Mocha"
 window-width = 9999
 window-height = 9999
Author	SHA1	Message	Date
arnie	9503c33f24	Mac things	2026-01-13 13:26:57 +01:00
arnie	fa9c2115e9	Add claude code to mac	2026-01-02 23:28:02 +01:00
arnie	b9b62ea3c3	Formatting and hammerspoon	2025-12-29 12:23:03 +01:00
arnie	c34274413a	Add session manager plugin	2025-12-29 12:21:57 +01:00
arnie	0a7d543ff4	Update darwin stuff	2025-12-29 10:16:31 +01:00
Arnie	4c7d1aabea	Add tree	2025-12-14 21:57:38 +01:00
Arnie	43fe34151a	Update becky	2025-12-14 20:10:10 +01:00
Arnie	ebcc853148	Fix pinentry for linux	2025-12-08 16:05:39 +01:00
Arnie	524ccea715	Update flake	2025-12-08 16:05:28 +01:00