From e2c24dbcb8b220731ab9cf250eac01a8d254594d Mon Sep 17 00:00:00 2001 From: josuezamudio Date: Sun, 3 Nov 2024 20:20:26 -0800 Subject: [PATCH] add git to PS, alacritty settings, and gruvebox changes --- .bashrc | 14 ++++++-- .config/alacritty/alacritty.toml | 37 +++++--------------- .config/nvim/lua/plugins/gruvbox.lua | 52 ++++++++++++++-------------- 3 files changed, 47 insertions(+), 56 deletions(-) diff --git a/.bashrc b/.bashrc index 66b6198..e09b4d4 100644 --- a/.bashrc +++ b/.bashrc @@ -56,11 +56,21 @@ if [ -n "$force_color_prompt" ]; then 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 - 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 - PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w $(parse_git_branch)\$ ' fi + unset color_prompt force_color_prompt # If this is an xterm set the title to user@host:dir diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 59cecbe..2f10a5b 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -1,35 +1,16 @@ 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] 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] history = 10000 diff --git a/.config/nvim/lua/plugins/gruvbox.lua b/.config/nvim/lua/plugins/gruvbox.lua index 91d886c..4fa0e95 100644 --- a/.config/nvim/lua/plugins/gruvbox.lua +++ b/.config/nvim/lua/plugins/gruvbox.lua @@ -1,29 +1,29 @@ return { - "ellisonleao/gruvbox.nvim", - priority = 1000, - config = function () - require("gruvbox").setup({ - undercurl = true, - underline = true, - bold = true, - italic = { - strings = true, - comments = true, - operators = false, - folds = true, - }, - strikethrough = true, - invert_selection = false, - invert_signs = false, - invert_tabline = false, - invert_intend_guides = false, - inverse = true, -- invert background for search, diffs, statuslines and errors - contrast = "soft", -- can be "hard", "soft" or empty string - palette_overrides = {}, - overrides = {}, - dim_inactive = false, - transparent_mode = false, - }) - end + "ellisonleao/gruvbox.nvim", + priority = 1000, + config = function () + require("gruvbox").setup({ + undercurl = true, + underline = true, + bold = true, + italic = { + strings = true, + comments = true, + operators = false, + folds = true, + }, + strikethrough = true, + invert_selection = false, + invert_signs = false, + invert_tabline = false, + invert_intend_guides = false, + inverse = true, -- invert background for search, diffs, statuslines and errors + contrast = "hard", -- can be "hard", "soft" or empty string + palette_overrides = {}, + overrides = {}, + dim_inactive = false, + transparent_mode = true, + }) + end }