add git to PS, alacritty settings, and gruvebox changes

This commit is contained in:
2024-11-03 20:20:26 -08:00
parent 136cda824b
commit e2c24dbcb8
3 changed files with 47 additions and 56 deletions

14
.bashrc
View File

@@ -56,11 +56,21 @@ if [ -n "$force_color_prompt" ]; then
fi fi
fi fi
#if [ "$color_prompt" = yes ]; then
# PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
#else
# PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
#fi
parse_git_branch() {
git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'
}
if [ "$color_prompt" = yes ]; then if [ "$color_prompt" = yes ]; then
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[01;31m\]$(parse_git_branch)\[\033[00m\]\$ '
else else
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w $(parse_git_branch)\$ '
fi fi
unset color_prompt force_color_prompt unset color_prompt force_color_prompt
# If this is an xterm set the title to user@host:dir # If this is an xterm set the title to user@host:dir

View File

@@ -1,35 +1,16 @@
live_config_reload = true live_config_reload = true
[colors]
draw_bold_text_with_bright_colors = true
[colors.bright]
black = "0x928374"
blue = "0x83a598"
cyan = "0x8ec07c"
green = "0xb8bb26"
magenta = "0xd3869b"
red = "0xfb4934"
white = "0xebdbb2"
yellow = "0xfabd2f"
[colors.normal]
black = "0x282828"
blue = "0x458588"
cyan = "0x689d6a"
green = "0x98971a"
magenta = "0xb16286"
red = "0xcc241d"
white = "0xa89984"
yellow = "0xd79921"
[colors.primary]
background = "0x282828"
foreground = "0xebdbb2"
[font] [font]
normal = { family = "JetBrainsMono NF", style = "Regular" } normal = { family = "JetBrainsMono NF", style = "Regular" }
size = 10.5 size = 12
[window]
decorations = 'buttonless'
dynamic_padding = false
opacity = 0.9
[colors]
draw_bold_text_with_bright_colors = true
[scrolling] [scrolling]
history = 10000 history = 10000

View File

@@ -18,11 +18,11 @@ return {
invert_tabline = false, invert_tabline = false,
invert_intend_guides = false, invert_intend_guides = false,
inverse = true, -- invert background for search, diffs, statuslines and errors inverse = true, -- invert background for search, diffs, statuslines and errors
contrast = "soft", -- can be "hard", "soft" or empty string contrast = "hard", -- can be "hard", "soft" or empty string
palette_overrides = {}, palette_overrides = {},
overrides = {}, overrides = {},
dim_inactive = false, dim_inactive = false,
transparent_mode = false, transparent_mode = true,
}) })
end end
} }