+1

.config/fish/functions/basic_custom_setup.fish

reviewed

··· 19 19 jj \ 20 20 just \ 21 21 lazydocker \ 22 22 + mergiraf \ 22 23 lazygit \ 23 24 lua \ 24 25 luarocks \

+1 -3

.config/jj/config.toml

reviewed

··· 31 31 diff-formatter = ["difft", "--color=always", "$left", "$right"] 32 32 diff-tool = "difft" 33 33 editor = "nvim" 34 34 - 35 35 - [merge-tools.difft] 36 36 - diff-args = ["--color=always", "--color=always", "$left", "$right"] 34 34 + merge-editor = "mergiraf" 37 35 38 36 [colors] 39 37 "author" = { fg = "magenta", dim = true }