From d86ee29a8ecaa6dc22a0dbdbe3a8c7b8cd5ac967 Mon Sep 17 00:00:00 2001 From: Ethan Turkeltaub Date: Wed, 1 Apr 2026 22:19:00 -0400 Subject: [PATCH 1/3] Update inputs --- flake.lock | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 3236748..ce641d4 100644 --- a/flake.lock +++ b/flake.lock @@ -528,11 +528,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1772789198, - "narHash": "sha256-il+e7ynJzQ7UesRRCQlHwbBMbZNueyqWg1ayszwAM8U=", + "lastModified": 1775062601, + "narHash": "sha256-/5+NrxyE/JmHmnsSEve/zE7sTgXxrNSi+S+vAanmSSc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "cced6b8c32a8f0b8590fce78323ba7421f3eb0af", + "rev": "120ce11560e7ce7c73b9977ca15fe9915b921e82", "type": "github" }, "original": { @@ -838,11 +838,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -1877,11 +1877,11 @@ ] }, "locked": { - "lastModified": 1771957919, - "narHash": "sha256-mTZj/qntKYRTQk/p2lYQkRhuNPuRU1AjSScRRBnNuok=", + "lastModified": 1775060170, + "narHash": "sha256-PipZGd4lzEm64M3T0OOYbej+KgXEjmyIT+SPbswqAiA=", "owner": "nix-community", "repo": "haumea", - "rev": "6006638de0f991dc33d0590819f58d09bec27379", + "rev": "c9bf22f79ba1250c31d2c79232669b0280200cc6", "type": "github" }, "original": { @@ -1999,11 +1999,11 @@ ] }, "locked": { - "lastModified": 1772633058, - "narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=", + "lastModified": 1775077333, + "narHash": "sha256-OXcxobt7lBkh1B8AjwreU+24myhtKpqeLfAeIyNLFY8=", "owner": "nix-community", "repo": "home-manager", - "rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865", + "rev": "49ca96b2714c5931e17401eff87f3edd42d2b0f2", "type": "github" }, "original": { @@ -2975,11 +2975,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772598333, - "narHash": "sha256-YaHht/C35INEX3DeJQNWjNaTcPjYmBwwjFJ2jdtr+5U=", + "lastModified": 1774818300, + "narHash": "sha256-4eRB7XOFBxQ/tUUFPjz7UU2/zt1dtTiVP96X9BNWdeI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fabb8c9deee281e50b1065002c9828f2cf7b2239", + "rev": "fb0b20238291625260547f4ce9f5540aff156fd5", "type": "github" }, "original": { @@ -3007,11 +3007,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1772328832, - "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "lastModified": 1774748309, + "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "rev": "333c4e0545a6da976206c74db8773a1645b5870a", "type": "github" }, "original": { @@ -3175,11 +3175,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1773171979, - "narHash": "sha256-9PN9kBoLFhHFPEuh1A1vjs7hiIieUty2g3vlktMRN2Y=", + "lastModified": 1775093810, + "narHash": "sha256-kOlaUrWgaZHS63XDKAnew7iv+1nqh+QaL2xvDuKlCS8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1f0603d571329b2ed20ac2e7afce98f0318d203b", + "rev": "b44f78afb715c272c65fb6bcb29a7542d69fc9a0", "type": "github" }, "original": { @@ -3286,16 +3286,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1767313136, - "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", + "lastModified": 1775002709, + "narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", + "rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -4950,11 +4950,11 @@ ] }, "locked": { - "lastModified": 1772660329, - "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", + "lastModified": 1773297127, + "narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "rev": "71b125cd05fbfd78cab3e070b73544abe24c5016", "type": "github" }, "original": { From 882b88e9275584c70e583110374cf2816e254bca Mon Sep 17 00:00:00 2001 From: Ethan Turkeltaub Date: Thu, 2 Apr 2026 08:58:52 -0400 Subject: [PATCH 2/3] Add `worktrunk` --- modules/overlays/default.nix | 2 +- modules/profiles/home/git/worktrunk.nix | 1 + modules/suites/home.nix | 12 ++++++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 modules/profiles/home/git/worktrunk.nix diff --git a/modules/overlays/default.nix b/modules/overlays/default.nix index 4d4866e..9ef6b2e 100644 --- a/modules/overlays/default.nix +++ b/modules/overlays/default.nix @@ -11,7 +11,7 @@ in { nixpkgs-master-darwin-linux-builder = nixpkgs-master.darwin.linux-builder; - inherit (nixpkgs-master) ghostty-bin; + inherit (nixpkgs-master) ghostty-bin worktrunk; }; }; } diff --git a/modules/profiles/home/git/worktrunk.nix b/modules/profiles/home/git/worktrunk.nix new file mode 100644 index 0000000..d50f0f9 --- /dev/null +++ b/modules/profiles/home/git/worktrunk.nix @@ -0,0 +1 @@ +{ pkgs, ... }: { home.packages = [ pkgs.worktrunk ]; } diff --git a/modules/suites/home.nix b/modules/suites/home.nix index ddd1799..44ca348 100644 --- a/modules/suites/home.nix +++ b/modules/suites/home.nix @@ -27,8 +27,16 @@ with profiles; zed-editor ]; - development = - [ git.common git.difftastic git.mergiraf gh gh-dash mise vscode ]; + development = [ + git.common + git.difftastic + git.mergiraf + git.worktrunk + gh + gh-dash + mise + vscode + ]; identity = [ gnupg.default ]; From 24a341db26279c6922d3ae78d65b2e9788ef327a Mon Sep 17 00:00:00 2001 From: Ethan Turkeltaub Date: Fri, 3 Apr 2026 11:48:27 -0400 Subject: [PATCH 3/3] Modify casks installed --- hosts/mercury/configuration.nix | 2 +- modules/profiles/system/darwin/brew.nix | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/hosts/mercury/configuration.nix b/hosts/mercury/configuration.nix index e1f0733..343878a 100644 --- a/hosts/mercury/configuration.nix +++ b/hosts/mercury/configuration.nix @@ -15,7 +15,7 @@ }; homebrew = { - casks = [ "bruno" "cursor" "figma" "jabra-direct" "linear-linear" "loom" ]; + casks = [ "bruno" "figma" "jabra-direct" "linear-linear" "loom" "postico" ]; masApps = { "Flow" = 1423210932; }; }; diff --git a/modules/profiles/system/darwin/brew.nix b/modules/profiles/system/darwin/brew.nix index 6f5f6bb..a10089f 100644 --- a/modules/profiles/system/darwin/brew.nix +++ b/modules/profiles/system/darwin/brew.nix @@ -14,7 +14,6 @@ "1password" "arc" "cleanshot" - "elgato-stream-deck" "emacs-mac-spacemacs-icon" "fantastical" "firefox"