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 config/macos/ghostty/config.ghostty
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ keybind = ctrl+shift+j=scroll_page_lines:5
keybind = ctrl+shift+up=scroll_page_lines:-5
keybind = ctrl+shift+down=scroll_page_lines:5

split-divider-color = #ff6600
split-divider-color = #3f3f46
cursor-style = block
# ssh-env/ssh-terminfo install Ghostty's terminfo on remote hosts and fall
# back to xterm-256color, so TERM=xterm-ghostty does not break Neovim and
Expand Down
4 changes: 2 additions & 2 deletions config/shared/nvim/lua/plugins/ui.lua
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ return {
buffer_selected = {
fg = "#FFFFFF",
bg = { attribute = "bg", highlight = "TabLineSel" },
bold = true,
bold = false,
italic = false,
underline = true,
sp = "#007ACC",
Expand Down Expand Up @@ -290,7 +290,7 @@ return {
lualine_c = {
{
"branch",
color = { fg = "#5fd700", gui = "bold" },
color = { fg = "#5fd700" },
icon = "",
padding = { left = 0, right = 1 },
},
Expand Down
1 change: 1 addition & 0 deletions config/shared/zsh/aliases.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@ alias gp='git push'
alias gsw='git switch'
alias gb='git branch'
alias gd='git diff'
alias gds='git diff --staged'
alias gsta='git stash push'
alias gstp='git stash pop'
19 changes: 19 additions & 0 deletions tests/common_zsh_test.bash
Original file line number Diff line number Diff line change
Expand Up @@ -1439,6 +1439,25 @@ test_minimal_profile_keeps_system_vim() {
teardown_test_home
}

test_git_staged_diff_alias_is_available() {
local output

setup_test_home
output="$(
PATH="/usr/bin:/bin" \
ZDOTDIR="" \
/bin/zsh -f -c '
_selfishell_command_path() { command -v "$1"; }
source "$1"
alias gds
' zsh "$ROOT_DIR/config/shared/zsh/aliases.zsh"
)"

[[ "$output" == "gds='git diff --staged'" ]] ||
fail "gds does not show staged Git changes: $output"
teardown_test_home
}

test_zsh_plugin_pins_match_dependencies_conf() {
local repository target_file expected_commit

Expand Down
9 changes: 8 additions & 1 deletion tests/fixtures/neovim/editor_workflow.lua
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,10 @@ local lualine = assert(
)
local branch = lualine.opts.sections.lualine_c[1]
assert(branch.icon == "", "lualine branch icon should be hidden")
assert(branch.color.fg == "#5fd700" and branch.color.gui == "bold", "lualine branch color is incorrect")
assert(
branch.color.fg == "#5fd700" and branch.color.gui == nil,
"lualine branch should use regular bright green"
)
assert(branch.padding.left == 0 and branch.padding.right == 1, "lualine branch spacing is incorrect")
local filetype = lualine.opts.sections.lualine_x[1]
assert(
Expand All @@ -137,6 +140,10 @@ assert(bufferline.event == "VeryLazy", "bufferline is not deferred")
assert(bufferline.opts.options.always_show_bufferline == false, "bufferline should hide for one buffer")
assert(bufferline.opts.options.show_buffer_icons == false, "bufferline buffer icons should be hidden")
assert(bufferline.opts.options.offsets[1].filetype == "NvimTree", "bufferline is not aligned with NvimTree")
assert(
bufferline.opts.highlights.buffer_selected.bold == false,
"selected buffer should rely on color and underline instead of bold"
)
assert(
not has_dependency(bufferline, "nvim-tree/nvim-web-devicons"),
"nvim-web-devicons dependency should be removed"
Expand Down