Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion home-manager/packages/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ with pkgs;
gh
google-cloud-sdk
git
glance
glow
gnumake
gping
Expand All @@ -67,7 +68,6 @@ with pkgs;
procs
# qwen-code # FIXME: npmDepsHash is stale in nixpkgs, uncomment when fixed
ripgrep
rustup
sccache
sd
shellcheck
Expand Down
1 change: 1 addition & 0 deletions home-manager/programs/bash/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
# Add additional bin paths
export PATH="$PATH:$GOPATH/bin"
export PATH="$HOME/.bun/bin:$PATH"
export PATH="$HOME/.cargo/bin:$PATH"
export PATH="$HOME/.foundry/bin:$PATH"
export PATH="$HOME/.local/bin:$PATH"
export PATH="$HOME/.nix-profile/bin:$PATH"
Expand Down
34 changes: 21 additions & 13 deletions home-manager/programs/fish/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,20 @@
if test (uname) = "Linux"
set -gx XDG_RUNTIME_DIR /run/user/(id -u)
end

# Go configuration
set -gx GOPATH $HOME/go

direnv hook fish | source
'';
loginShellInit = ''
fish_add_path -p ~/.local/bin
fish_add_path -p ~/.bun/bin
fish_add_path -p ~/.cargo/bin
fish_add_path -p ~/.foundry/bin
fish_add_path -p ~/.nix-profile/bin
fish_add_path -p ~/go/bin
fish_add_path -p /nix/var/nix/profiles/default/bin
fish_add_path -p ~/.foundry/bin
fish_add_path -p /opt/homebrew/bin
fish_add_path -p /opt/homebrew/opt/postgresql@18/bin
fish_add_path -p /etc/profiles/per-user/${config.home.username}/bin
Expand All @@ -31,9 +37,11 @@
set fish_theme dracula
fish_add_path -p ~/.local/bin
fish_add_path -p ~/.bun/bin
fish_add_path -p ~/.cargo/bin

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Medium

Duplicate PATH configuration: ~/.cargo/bin is being added in both loginShellInit (line 24) and interactiveShellInit (line 40). Since loginShellInit runs for login shells and its PATH changes persist to interactive shells, adding it again in interactiveShellInit is redundant and causes unnecessary PATH pollution. Consider keeping it only in loginShellInit or document why both are needed.

Agent: 🏛 Architecture • Fix in Cursor • Fix in Claude

Prompt for Agent
Task: Address review feedback left on GitHub.
Repository: shunkakinoki/dotfiles#559
File: home-manager/programs/fish/default.nix#L40
Action: Open this file location in your editor, inspect the highlighted code, and resolve the issue described below.

Feedback:
Duplicate PATH configuration: `~/.cargo/bin` is being added in both `loginShellInit` (line 24) and `interactiveShellInit` (line 40). Since `loginShellInit` runs for login shells and its PATH changes persist to interactive shells, adding it again in `interactiveShellInit` is redundant and causes unnecessary PATH pollution. Consider keeping it only in `loginShellInit` or document why both are needed.

fish_add_path -p ~/.foundry/bin
fish_add_path -p ~/.nix-profile/bin
fish_add_path -p ~/go/bin

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Medium

Duplicate PATH configuration: ~/go/bin is being added in both loginShellInit (line 27) and interactiveShellInit (line 43). This creates the same redundancy issue as with the cargo bin path. The duplication across both shell initialization contexts will cause the path to appear multiple times unnecessarily.

Agent: 🏛 Architecture • Fix in Cursor • Fix in Claude

Prompt for Agent
Task: Address review feedback left on GitHub.
Repository: shunkakinoki/dotfiles#559
File: home-manager/programs/fish/default.nix#L43
Action: Open this file location in your editor, inspect the highlighted code, and resolve the issue described below.

Feedback:
Duplicate PATH configuration: `~/go/bin` is being added in both `loginShellInit` (line 27) and `interactiveShellInit` (line 43). This creates the same redundancy issue as with the cargo bin path. The duplication across both shell initialization contexts will cause the path to appear multiple times unnecessarily.

fish_add_path -p /nix/var/nix/profiles/default/bin
fish_add_path -p ~/.foundry/bin
fish_add_path -p /opt/homebrew/bin
fish_add_path -p /opt/homebrew/opt/postgresql@18/bin
fish_add_path -p /etc/profiles/per-user/${config.home.username}/bin
Expand All @@ -54,7 +62,6 @@
j = "jj";
lzd = "lazydocker";
lzg = "lazygit";
sag = "_ssh_add_github";
ta = "tmux new -A -s default";
v = "nvim";

Expand All @@ -66,24 +73,25 @@
coxel = "_coxel_function";
coxelh = "_coxelh_function";
dev = "_dev_function";
ocxe = "_ocxe_function";
ocxeh = "_ocxeh_function";
gco = "_gco_function";
grco = "_grco_function";
grcr = "_grcr_function";
kyber = "_kyber_function";
kyberd = "_kyberd_function";
kyberm = "_kyberm_function";
zdo = "_zdo_function";
zmo = "_zmo_function";
fch = "_fzf_cmd_history --allow-execute";
fdp = "_fzf_directory_picker --allow-cd --prompt-name Projects ~/";
ffp = "_fzf_file_picker --allow-open-in-editor --prompt-name Files";
ffpf = "_fzf_file_picker --allow-open-in-editor --show-hidden-files --prompt-name Files+";
fgb = "_fzf_git_branch";
fgw = "_fzf_git_worktree";
fhq = "_fzf_ghq_picker";
gco = "_gco_function";
grco = "_grco_function";
grcr = "_grcr_function";
kyber = "_kyber_function";
kyberd = "_kyberd_function";
kyberm = "_kyberm_function";
ocxe = "_ocxe_function";
ocxeh = "_ocxeh_function";
sag = "_ssh_add_github";
shortcuts = "_fish_shortcuts";
zdo = "_zdo_function";
zmo = "_zmo_function";
};
plugins = [
{
Expand Down
2 changes: 1 addition & 1 deletion home-manager/programs/lazydocker/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, ... }:
{
home.packages = [ pkgs.lazydocker ];
home.packages = with pkgs; [ pkgs.lazydocker ];

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The with pkgs; statement brings the attributes of pkgs into the current scope, so you don't need to prefix lazydocker with pkgs.. The current usage is redundant and defeats the purpose of using with.

  home.packages = with pkgs; [ lazydocker ];

Copilot AI Jan 12, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The pkgs. prefix is redundant when using with pkgs; in the list. Since you're already unpacking the pkgs namespace with with pkgs;, you should use lazydocker directly without the prefix.

Suggested change
home.packages = with pkgs; [ pkgs.lazydocker ];
home.packages = with pkgs; [ lazydocker ];

Copilot uses AI. Check for mistakes.
}
7 changes: 4 additions & 3 deletions home-manager/programs/rust/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ pkgs, ... }:
{
programs.fish.interactiveShellInit = ''
fish_add_path -p ~/.cargo/bin/
'';
home.packages = with pkgs; [
rustup
];
}
1 change: 1 addition & 0 deletions home-manager/programs/zsh/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
# Additional bin paths
export PATH="$PATH:$GOPATH/bin"
export PATH="$HOME/.bun/bin:$PATH"
export PATH="$HOME/.cargo/bin:$PATH"
export PATH="$HOME/.foundry/bin:$PATH"
export PATH="$HOME/.local/bin:$PATH"
export PATH="$HOME/.nix-profile/bin:$PATH"
Expand Down
Loading