Skip to content

New work system #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
khaykingleb merged 2 commits into from
Aug 26, 2025
Merged

New work system #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0fef3e
feat(darwin,homebrew): update flakes
khaykingleb Aug 26, 2025
c8385a4
feat(homebrew): add claude and claude-code
khaykingleb Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 27 additions & 62 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/common/packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 6 additions & 4 deletions modules/darwin/homebrew.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ let
generalCasks = lib.lists.flatten [
# Development
"visual-studio-code"
"chatgpt"
"cursor"
"claude"
"claude-code"
"iterm2"
"docker"
"tailscale"
"docker-desktop"
"tailscale-app"
"postman"
"chatgpt"

# TODO(khaykingleb): add notion-mail cask when it's available in homebrew
# Productivity
Expand Down Expand Up @@ -38,7 +40,7 @@ let
"keepassxc"

# Productivity
"todoist"
"todoist-app"
"anki"

# Communication
Expand Down
3 changes: 2 additions & 1 deletion systems/macbook-pro-m1/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Handles system-level configuration for Macbook Pro M1 (macOS)
{ ... }:
{ user, ... }:
{
imports = [
../../modules/darwin
Expand All @@ -10,6 +10,7 @@

# Used for backwards compatibility
system.stateVersion = 5;
system.primaryUser = user;

# networking.hostName = hostName;
}
5 changes: 3 additions & 2 deletions systems/macbook-pro-m4-together/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -10,6 +10,7 @@

# Used for backwards compatibility
system.stateVersion = 5;
system.primaryUser = user;

# networking.hostName = hostName;
}
5 changes: 3 additions & 2 deletions systems/macbook-pro-m4/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -10,6 +10,7 @@

# Used for backwards compatibility
system.stateVersion = 5;
system.primaryUser = user;

# networking.hostName = hostName;
}
2 changes: 1 addition & 1 deletion users/shared/completions.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion users/shared/programs/asdf.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion users/shared/programs/conda.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion users/shared/programs/krew.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ ... }: {
programs.zsh = {
initExtra = ''
initContent = ''
# >>> KREW
export PATH="''${KREW_ROOT:-$HOME/.krew}/bin:$PATH"
# <<< KREW
Expand Down
2 changes: 1 addition & 1 deletion users/shared/programs/zsh/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
];

# Custom ZSH settings
initExtra = ''
initContent = ''
# >>> General
# Initialize powerlevel10k
source ~/.p10k.zsh
Expand Down