From e0fef3ef07d0f8bab64765df670fdd319c7433b8 Mon Sep 17 00:00:00 2001 From: Gleb Khaykin Date: Wed, 27 Aug 2025 00:52:14 +0200 Subject: [PATCH 1/2] feat(darwin,homebrew): update flakes --- flake.lock | 89 +++++++-------------- modules/common/packages.nix | 2 +- modules/darwin/homebrew.nix | 8 +- systems/macbook-pro-m1/default.nix | 3 +- systems/macbook-pro-m4-together/default.nix | 5 +- systems/macbook-pro-m4/default.nix | 5 +- users/shared/completions.nix | 2 +- users/shared/programs/asdf.nix | 2 +- users/shared/programs/conda.nix | 2 +- users/shared/programs/krew.nix | 2 +- users/shared/programs/zsh/default.nix | 2 +- 11 files changed, 45 insertions(+), 77 deletions(-) diff --git a/flake.lock b/flake.lock index 5d78bd9..6877371 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1731323744, - "narHash": "sha256-SxUQm4cTHcaoPQHoXe26ZV8cZiMWBGow8MjE4L+MckM=", + "lastModified": 1753461463, + "narHash": "sha256-kGc7pRH0diLzKmOHsEFA8sZ9NJpgT+tqxAMsuqNd5Po=", "owner": "Homebrew", "repo": "brew", - "rev": "254bf3fe9d8fa2e1b2fb55dbcf535b2d870180c4", + "rev": "4d14be89e99a45181c18e96a5f19a5b43343cc0f", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.4.5", + "ref": "4.5.13", "repo": "brew", "type": "github" } @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1737120639, - "narHash": "sha256-p5e/45V41YD3tMELuiNIoVCa25/w4nhOTm0B9MtdHFI=", + "lastModified": 1756247014, + "narHash": "sha256-aqMKFVMK/xhv0eJ1006zSmrUaXFO09AkaU8FutDbaZs=", "owner": "nix-community", "repo": "home-manager", - "rev": "a0046af169ce7b1da503974e1b22c48ef4d71887", + "rev": "2c4ef7d7172708f6247d2ed9b56f0341b9ce63e1", "type": "github" }, "original": { @@ -40,11 +40,11 @@ "homebrew-bundle": { "flake": false, "locked": { - "lastModified": 1738968347, - "narHash": "sha256-TmsbNeBFOy1OWti+uxj150wlvIbwpEoehExAwVwGqag=", + "lastModified": 1745335228, + "narHash": "sha256-TIKR2UgtyUmHLNZp255/vLs+1I10hXe+sciMEbAGFwE=", "owner": "homebrew", "repo": "homebrew-bundle", - "rev": "0d4878acb6be52840d0f648288affa5fcbdd7779", + "rev": "a3265c84b232e13048ecbf6fc18a2eedfadbeb08", "type": "github" }, "original": { @@ -56,11 +56,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1739182160, - "narHash": "sha256-znjdv+KGT7e7JbqL/CVVPFdo2nW8pRrCENrto+G49aY=", + "lastModified": 1756246851, + "narHash": "sha256-4tMHW5NABe9h5pAkwXXnG57T5E+qDPEvB4yP3KmE+Ho=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "963a37adba0ee1a0537c91130134fd86b677a104", + "rev": "92d0a7fcc236c08ce46f6e4624f1f1b76ac61dcc", "type": "github" }, "original": { @@ -72,11 +72,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1739178556, - "narHash": "sha256-ZEPq3nUK3P/yQkmaVjjDXiYJescIWUJRq4MlKizzdHM=", + "lastModified": 1756246822, + "narHash": "sha256-j/r5mZu6XtJ6aehfLfuRjspqvEr85QHWB0bbxn0ZmNA=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "9fe40ab85c50e1d362110ef49409f068781f293c", + "rev": "e9f48432d8a60f6ec496684d04b09a0674f0c03e", "type": "github" }, "original": { @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1737085297, - "narHash": "sha256-0gpgsX7hCauT6pblVg+hrDnt83lPoYzq/2BqqyvU8Tc=", + "lastModified": 1755825449, + "narHash": "sha256-XkiN4NM9Xdy59h69Pc+Vg4PxkSm9EWl6u7k6D5FZ5cM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "09414c7e2def24a5c52e588017b8524bcb68972a", + "rev": "8df64f819698c1fee0c2969696f54a843b2231e8", "type": "github" }, "original": { @@ -105,38 +105,16 @@ "type": "github" } }, - "nix-darwin_2": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1716329735, - "narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-homebrew": { "inputs": { - "brew-src": "brew-src", - "nix-darwin": "nix-darwin_2", - "nixpkgs": [ - "nixpkgs" - ] + "brew-src": "brew-src" }, "locked": { - "lastModified": 1736041957, - "narHash": "sha256-Kk/cVtkxwfHNoB6nINUarMLTtyAEvH+ohzxKBptMzzg=", + "lastModified": 1754250993, + "narHash": "sha256-MEin+qoQKtFC1b0f4tnQ+Z82BQWSCgh6Ef7rpmH9gig=", "owner": "zhaofengli-wip", "repo": "nix-homebrew", - "rev": "a6d99cc7436fc18c097b3536d9c45c0548c694c8", + "rev": "314d057294e79bc2596972126b84c6f9f144499a", "type": "github" }, "original": { @@ -147,24 +125,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1687274257, - "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", - "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source", - "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1737003892, - "narHash": "sha256-RCzJE9wKByLCXmRBp+z8LK9EgdW+K+W/DXnJS4S/NVo=", + "lastModified": 1756159630, + "narHash": "sha256-ohMvsjtSVdT/bruXf5ClBh8ZYXRmD4krmjKrXhEvwMg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae06b9c2d83cb5c8b12d7d0e32692e93d1379713", + "rev": "84c256e42600cb0fdf25763b48d28df2f25a0c8b", "type": "github" }, "original": { @@ -182,7 +147,7 @@ "homebrew-core": "homebrew-core", "nix-darwin": "nix-darwin", "nix-homebrew": "nix-homebrew", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" } } }, diff --git a/modules/common/packages.nix b/modules/common/packages.nix index c8248ec..cccaadf 100644 --- a/modules/common/packages.nix +++ b/modules/common/packages.nix @@ -35,7 +35,7 @@ devcontainer # devcontainer cli # Monitoring - neofetch # system information viewer + fastfetch # system information viewer (neofetch successor) htop # process viewer (replacement for top) btop # process viewer (replacement for htop) ctop # container viewer diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix index dd0d270..d4f4437 100644 --- a/modules/darwin/homebrew.nix +++ b/modules/darwin/homebrew.nix @@ -3,12 +3,12 @@ let generalCasks = lib.lists.flatten [ # Development "visual-studio-code" + "chatgpt" "cursor" "iterm2" - "docker" - "tailscale" + "docker-desktop" + "tailscale-app" "postman" - "chatgpt" # TODO(khaykingleb): add notion-mail cask when it's available in homebrew # Productivity @@ -38,7 +38,7 @@ let "keepassxc" # Productivity - "todoist" + "todoist-app" "anki" # Communication diff --git a/systems/macbook-pro-m1/default.nix b/systems/macbook-pro-m1/default.nix index a24d2e0..c4d6047 100644 --- a/systems/macbook-pro-m1/default.nix +++ b/systems/macbook-pro-m1/default.nix @@ -1,5 +1,5 @@ # Handles system-level configuration for Macbook Pro M1 (macOS) -{ ... }: +{ user, ... }: { imports = [ ../../modules/darwin @@ -10,6 +10,7 @@ # Used for backwards compatibility system.stateVersion = 5; + system.primaryUser = user; # networking.hostName = hostName; } diff --git a/systems/macbook-pro-m4-together/default.nix b/systems/macbook-pro-m4-together/default.nix index 3847a85..70e7c2d 100644 --- a/systems/macbook-pro-m4-together/default.nix +++ b/systems/macbook-pro-m4-together/default.nix @@ -1,5 +1,5 @@ -# Handles system-level configuration for Macbook Pro M1 (macOS) -{ ... }: +# Handles system-level configuration for Macbook Pro M4 for work (macOS) +{ user, ... }: { imports = [ ../../modules/darwin @@ -10,6 +10,7 @@ # Used for backwards compatibility system.stateVersion = 5; + system.primaryUser = user; # networking.hostName = hostName; } diff --git a/systems/macbook-pro-m4/default.nix b/systems/macbook-pro-m4/default.nix index a24d2e0..fe369d8 100644 --- a/systems/macbook-pro-m4/default.nix +++ b/systems/macbook-pro-m4/default.nix @@ -1,5 +1,5 @@ -# Handles system-level configuration for Macbook Pro M1 (macOS) -{ ... }: +# Handles system-level configuration for Macbook Pro M4 for personal use (macOS) +{ user, ... }: { imports = [ ../../modules/darwin @@ -10,6 +10,7 @@ # Used for backwards compatibility system.stateVersion = 5; + system.primaryUser = user; # networking.hostName = hostName; } diff --git a/users/shared/completions.nix b/users/shared/completions.nix index b91bce6..6db2791 100644 --- a/users/shared/completions.nix +++ b/users/shared/completions.nix @@ -9,7 +9,7 @@ echo "Docker completions already set up" fi ''; - programs.zsh.initExtra = '' + programs.zsh.initContent = '' # >>> ASDF completions # https://asdf-vm.com/guide/getting-started-legacy.html FPATH="$HOME/.asdf/completions:$FPATH" diff --git a/users/shared/programs/asdf.nix b/users/shared/programs/asdf.nix index fbd816d..23c2fc5 100644 --- a/users/shared/programs/asdf.nix +++ b/users/shared/programs/asdf.nix @@ -5,7 +5,7 @@ ]; programs.zsh = { # NOTE: https://asdf-vm.com/guide/getting-started.html - initExtra = '' + initContent = '' # >>> ASDF . "${pkgs.asdf-vm}/share/asdf-vm/asdf.sh" alias python3="$HOME/.asdf/shims/python3" diff --git a/users/shared/programs/conda.nix b/users/shared/programs/conda.nix index b8fde4a..f26b2a6 100644 --- a/users/shared/programs/conda.nix +++ b/users/shared/programs/conda.nix @@ -6,7 +6,7 @@ # sh ${config.home.homeDirectory}/.config/dotfiles/users/shared/scripts/conda.sh install_conda_linux # ''; # TODO(khaykingleb): conda doesn't work on my work mac - # programs.zsh.initExtra = '' + # programs.zsh.initContent = '' # # >>> Conda # __conda_setup="$(${config.home.homeDirectory}/anaconda3/bin/conda 'shell.zsh' 'hook' 2> /dev/null)" # if [ $? -eq 0 ]; then diff --git a/users/shared/programs/krew.nix b/users/shared/programs/krew.nix index b110435..11d3bf7 100644 --- a/users/shared/programs/krew.nix +++ b/users/shared/programs/krew.nix @@ -1,6 +1,6 @@ { ... }: { programs.zsh = { - initExtra = '' + initContent = '' # >>> KREW export PATH="''${KREW_ROOT:-$HOME/.krew}/bin:$PATH" # <<< KREW diff --git a/users/shared/programs/zsh/default.nix b/users/shared/programs/zsh/default.nix index 73eb1e2..bca3732 100644 --- a/users/shared/programs/zsh/default.nix +++ b/users/shared/programs/zsh/default.nix @@ -39,7 +39,7 @@ ]; # Custom ZSH settings - initExtra = '' + initContent = '' # >>> General # Initialize powerlevel10k source ~/.p10k.zsh From c8385a4d30a525d39143582c7b0c801d25c9a9b8 Mon Sep 17 00:00:00 2001 From: Gleb Khaykin Date: Wed, 27 Aug 2025 00:53:26 +0200 Subject: [PATCH 2/2] feat(homebrew): add claude and claude-code --- modules/darwin/homebrew.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix index d4f4437..68ffdbd 100644 --- a/modules/darwin/homebrew.nix +++ b/modules/darwin/homebrew.nix @@ -5,6 +5,8 @@ let "visual-studio-code" "chatgpt" "cursor" + "claude" + "claude-code" "iterm2" "docker-desktop" "tailscale-app"