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
1 change: 1 addition & 0 deletions config/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
./factory
./ghostty
./hammerspoon
./jj
./k3s
./karabiner
./opencode
Expand Down
5 changes: 5 additions & 0 deletions config/jj/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#:schema https://docs.jj-vcs.dev/latest/config-schema.json

[user]
name = "Shun Kakinoki"
email = "shunkakinoki@gmail.com"
6 changes: 6 additions & 0 deletions config/jj/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{ config, ... }:
{
xdg.configFile."jj/config.toml" = {
source = config.lib.file.mkOutOfStoreSymlink ./config.toml;
};
}
1 change: 1 addition & 0 deletions home-manager/programs/fish/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
cat = "bat";
e = "nvim";
g = "git";
j = "jj";

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

Using a shell abbreviation for a single-letter command like j can be problematic. If another tool (like autojump) uses j as a command, this abbreviation will cause j <args> to be expanded to jj <args>, which is likely not the intended behavior. Using a shell alias is generally safer for command shortcuts as it clearly defines j as a command, and can be bypassed with command j if the original is ever needed. Given the PR title also mentions 'alias', it would be more consistent to implement this in the shellAliases block instead.

lzd = "lazydocker";
lzg = "lazygit";
sag = "_ssh_add_github";
Expand Down
1 change: 1 addition & 0 deletions nix-darwin/config/homebrew.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"gnupg"
"graphviz"
"helm"
"jjui"
"kurtosis-cli"
"mas"
"opencode"
Expand Down
Loading