Skip to content

Commit fb3f5d4

Browse files
committed
Merge MR 'build(deps): update hk to v1.13.4' into 'main'
See merge request el-capitano/dotfiles!1280
2 parents fa74c23 + a27d404 commit fb3f5d4

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

chezmoi/dot_bashrc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ if [ -x /usr/bin/dircolors ]; then
1515
# alias ls='ls --color=auto'
1616
#alias dir='dir --color=auto'
1717
#alias vdir='vdir --color=auto'
18-
1918
alias grep='grep --color=auto'
2019
alias fgrep='fgrep --color=auto'
2120
alias egrep='egrep --color=auto'
@@ -32,7 +31,6 @@ export PROMPT_COMMAND="history -a"
3231
HISTSIZE=5000
3332
HISTFILESIZE=10000
3433

35-
3634
# make less more friendly for non-text input files, see lesspipe(1)
3735
[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
3836

chezmoi/dot_config/mise/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ fd = "10.2.0"
55
glab = "1.67.0"
66
go = "1.25.1"
77
hcloud = "1.51.0"
8-
hk = "1.12.1"
8+
hk = "1.13.4"
99
node = "24.8.0"
1010
pkl = "0.29.1"
1111
python = "3.13.7"

chezmoi/dot_config/serie/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
# Multiple commands can be specified in the format commands_{n}.
44
# For details about user command, see the separate User command section.
55
# type: object
6-
commands_1 = { name = "git diff", commands = ["git", "--no-pager", "diff", "--color=always", "{{first_parent_hash}}", "{{target_hash}}"]}
6+
commands_1 = { name = "git diff ", commands = ["sh", "-c", "git diff --color=always {{first_parent_hash}} {{target_hash}} | delta"] }

0 commit comments

Comments
 (0)