awesome: change to green colors

alacritty/.config/alacritty/alacritty.toml

@@ -1,4 +1,3 @@
-
 [colors]
 draw_bold_text_with_bright_colors = false
 
@@ -6,7 +5,7 @@ draw_bold_text_with_bright_colors = false
 TERM = "xterm-256color"
 
 [font]
-size = 9
+size = 10
 
 [font.bold]
 family = "Fira Code Nerd Font"

alacritty/.config/alacritty/dark.toml

@@ -1,76 +1,31 @@
-# https://github.com/alacritty/alacritty-theme/blob/master/themes/meliora.toml
+# Colors (Gruvbox dark)
+
+# Default colors
 [colors.primary]
-background = '#1c1917'
+# hard contrast background = = '#1d2021'
-foreground = '#d6d0cd'
+# background = '#282828'
-# Bright and dim foreground colors
+# soft contrast background = = '#32302f'
-dim_foreground = '#d6d0cd'
+background = '#292522'
-bright_foreground = '#d6d0cd'
+foreground = '#ebdbb2'
-
-# Cursor colors
-[colors.cursor]
-text = '#1c1917'
-cursor = '#d6d0cd'
-
-[colors.vi_mode_cursor]
-text = '#1c1917'
-cursor = '#d6d0cd'
-
-# Search colors
-[colors.search]
-matches = { foreground = '#1c1917', background = '#24201e' }
-focused_match = { foreground = '#1c1917', background = '#2a2522' }
-
-[colors.footer_bar]
-foreground = '#1c1917'
-background = '#b8aea8'
-
-# Keyboard regex hints
-[colors.hints]
-start = { foreground = '#1c1917', background = '#c4b392' }
-end = { foreground = '#1c1917', background = '#24201e' }
-
-# Selection colors
-[colors.selection]
-text = '#d6d0cd'
-background = '#2a2522'
 
 # Normal colors
 [colors.normal]
-black = '#2a2421'
+black   = '#282828'
-red = '#d49191'
+red     = '#cc241d'
-green = '#b6b696'
+green   = '#98971a'
-yellow = '#c4b392'
+yellow  = '#d79921'
-blue = '#9e96b6'
+blue    = '#458588'
-magenta = '#b696b1'
+magenta = '#b16286'
-cyan = '#98acc8'
+cyan    = '#689d6a'
-white = '#ddd9d6'
+white   = '#a89984'
 
 # Bright colors
 [colors.bright]
-black = '#2e2622'
+black   = '#928374'
-red = '#d89393'
+red     = '#fb4934'
-green = '#b9b99b'
+green   = '#b8bb26'
-yellow = '#c8b692'
+yellow  = '#fabd2f'
-blue = '#a299b9'
+blue    = '#83a598'
-magenta = '#b997b4'
+magenta = '#d3869b'
-cyan = '#9bb0ca'
+cyan    = '#8ec07c'
-white = '#e1dbd9'
+white   = '#ebdbb2'
-
-# Dim colors
-[colors.dim]
-black = '#2a2421'
-red = '#d18989'
-green = '#727246'
-yellow = '#c1b090'
-blue = '#9b92b3'
-magenta = '#b393ad'
-cyan = '#95a9c5'
-white = '#e3d5ce'
-
-[[colors.indexed_colors]]
-index = 16
-color = '#c4b392'
-
-[[colors.indexed_colors]]
-index = 17
-color = '#ddd9d6'

alacritty/.config/alacritty/light.toml

@@ -1,26 +1,30 @@
-# https://github.com/zenbones-theme/zenbones.nvim/blob/main/extras/alacritty/zenbones_light.toml
+# Colors (Alabaster)
-# This file is auto-generated by shipwright.nvim
+# author tonsky
-[colors.bright]
+
-black = "#CFC1BA"
-red = "#94253E"
-green = "#3F5A22"
-yellow = "#803D1C"
-blue = "#1D5573"
-magenta = "#7B3B70"
-cyan = "#2B747C"
-white = "#4F5E68"
-[colors.cursor]
-cursor = "#2C363C"
-text = "#F0EDEC"
-[colors.normal]
-black = "#F0EDEC"
-blue = "#286486"
-cyan = "#3B8992"
-green = "#4F6C31"
-magenta = "#88507D"
-red = "#A8334C"
-white = "#2C363C"
-yellow = "#944927"
 [colors.primary]
-background = "#F0F1F1"
+background = '#F1F1F1' # changed
-foreground = "#141D1C"
+foreground = '#434343'
+
+[colors.cursor]
+text = '#F7F7F7'
+cursor = '#434343'
+
+[colors.normal]
+black = '#000000'
+red = '#AA3731'
+green = '#448C27'
+yellow = '#CB9000'
+blue = '#325CC0'
+magenta = '#7A3E9D'
+cyan = '#0083B2'
+white = '#BBBBBB'
+
+[colors.bright]
+black = '#777777'
+red = '#F05050'
+green = '#60CB00'
+yellow = '#FFBC5D'
+blue = '#007ACC'
+magenta = '#E64CE6'
+cyan = '#00AACB'
+white = '#FFFFFF'

awesome/.config/awesome/rc.lua

@@ -51,7 +51,20 @@ end
 
 -- {{{ Variable definitions
 -- Themes define colours, icons, font and wallpapers.
-local theme = "theme_dark.lua"
+
+local function read_theme()
+  local theme = "theme_dark.lua"
+  local f = io.open(os.getenv('HOME') .. '/.config/alacritty/alacritty.toml')
+  if f then
+    if string.find(f:read('*all'), 'light') then
+      theme = 'theme_light.lua'
+    end
+    f:close()
+    return theme
+  end
+end
+
+local theme = read_theme()
 beautiful.init(gears.filesystem.get_configuration_dir() .. theme)
 
 local function set_wallpaper(s)

awesome/.config/awesome/theme_dark.lua

@@ -1,51 +1,56 @@
-local themes_path           = require("gears.filesystem").get_themes_dir()
+local themes_path              = require("gears.filesystem").get_themes_dir()
 
-local xresources            = require("beautiful.xresources")
+local xresources               = require("beautiful.xresources")
-local dpi                   = xresources.apply_dpi
+local dpi                      = xresources.apply_dpi
 
-local theme                 = {}
+local theme                    = {}
 
-theme.font                  = "Fira Code Nerd Font 10.5"
+theme.font                     = "Fira Code Nerd Font 10"
-theme.tasklist_disable_icon = true
+theme.tasklist_disable_icon    = true
-theme.wibar_height          = 40
+theme.wibar_height             = 40
 
-theme.bg_normal             = "#283538"
+theme.bg_normal                = "#293d38" -- hsl(165deg 20% 20%)
-theme.bg_focus              = "#36537d" -- hsl(215deg 40% 35%)
+theme.bg_focus                 = "#478575" -- hsl(165deg 30% 40%)
-theme.bg_urgent             = "#d8aeb5"
+theme.bg_urgent                = "#5c3d45" -- hsl(345deg 20% 30%)
-theme.bg_minimize           = "#363e49" -- hsl(215deg 15% 25%)
+theme.bg_minimize              = "#363e49" -- hsl(215deg 15% 25%)
-theme.bg_systray            = theme.bg_normal
+theme.bg_systray               = theme.bg_normal
-theme.tasklist_bg_focus     = "#263c59" -- hsl(215deg 40% 25%)
+theme.tasklist_bg_focus        = "#3d5c54" -- hsl(165deg 20% 30%)
 
-theme.fg_normal             = "#9ea7aa"
+theme.fg_normal                = "#a9d6ca" -- hsl(165deg 35% 75%)"
-theme.fg_focus              = "#b1babd"
+theme.fg_focus                 = "#b1babd"
-theme.fg_urgent             = theme.bg_focus
+theme.fg_urgent                = theme.bg_focus
-theme.fg_minimize           = "#8a9294"
+theme.fg_minimize              = "#8a9294"
-theme.taglist_fg_empty      = "#798082"
+theme.taglist_fg_empty         = "#62847b" -- hsl(165deg 15% 45%)"
 
-theme.useless_gap           = dpi(1)
+theme.useless_gap              = dpi(1)
-theme.border_width          = dpi(2)
+theme.border_width             = dpi(2)
-theme.border_normal         = "#708090"
+theme.border_normal            = "#708090"
-theme.border_focus          = "#a0522d"
+theme.border_focus             = "#a0522d"
-theme.border_marked         = "#91231c"
+theme.border_marked            = "#91231c"
 
-theme.bg_wallpaper          = "#424a4c"
+theme.bg_wallpaper             = "#424a4c"
+
+theme.hotkeys_font             = theme.font
+theme.hotkeys_description_font = theme.font
+theme.hotkeys_bg               = theme.bg_minimize
+theme.hotkeys_modifiers_fg     = theme.border_focus
 
 -- You can use your own layout icons like this:
-theme.layout_fairh          = themes_path .. "default/layouts/fairhw.png"
+theme.layout_fairh             = themes_path .. "default/layouts/fairhw.png"
-theme.layout_fairv          = themes_path .. "default/layouts/fairvw.png"
+theme.layout_fairv             = themes_path .. "default/layouts/fairvw.png"
-theme.layout_floating       = themes_path .. "default/layouts/floatingw.png"
+theme.layout_floating          = themes_path .. "default/layouts/floatingw.png"
-theme.layout_magnifier      = themes_path .. "default/layouts/magnifierw.png"
+theme.layout_magnifier         = themes_path .. "default/layouts/magnifierw.png"
-theme.layout_max            = themes_path .. "default/layouts/maxw.png"
+theme.layout_max               = themes_path .. "default/layouts/maxw.png"
-theme.layout_fullscreen     = themes_path .. "default/layouts/fullscreenw.png"
+theme.layout_fullscreen        = themes_path .. "default/layouts/fullscreenw.png"
-theme.layout_tilebottom     = themes_path .. "default/layouts/tilebottomw.png"
+theme.layout_tilebottom        = themes_path .. "default/layouts/tilebottomw.png"
-theme.layout_tileleft       = themes_path .. "default/layouts/tileleftw.png"
+theme.layout_tileleft          = themes_path .. "default/layouts/tileleftw.png"
-theme.layout_tile           = themes_path .. "default/layouts/tilew.png"
+theme.layout_tile              = themes_path .. "default/layouts/tilew.png"
-theme.layout_tiletop        = themes_path .. "default/layouts/tiletopw.png"
+theme.layout_tiletop           = themes_path .. "default/layouts/tiletopw.png"
-theme.layout_spiral         = themes_path .. "default/layouts/spiralw.png"
+theme.layout_spiral            = themes_path .. "default/layouts/spiralw.png"
-theme.layout_dwindle        = themes_path .. "default/layouts/dwindlew.png"
+theme.layout_dwindle           = themes_path .. "default/layouts/dwindlew.png"
-theme.layout_cornernw       = themes_path .. "default/layouts/cornernww.png"
+theme.layout_cornernw          = themes_path .. "default/layouts/cornernww.png"
-theme.layout_cornerne       = themes_path .. "default/layouts/cornernew.png"
+theme.layout_cornerne          = themes_path .. "default/layouts/cornernew.png"
-theme.layout_cornersw       = themes_path .. "default/layouts/cornersww.png"
+theme.layout_cornersw          = themes_path .. "default/layouts/cornersww.png"
-theme.layout_cornerse       = themes_path .. "default/layouts/cornersew.png"
+theme.layout_cornerse          = themes_path .. "default/layouts/cornersew.png"
 
 return theme

awesome/.config/awesome/theme_light.lua

@@ -1,51 +1,56 @@
-local themes_path           = require("gears.filesystem").get_themes_dir()
+local themes_path              = require("gears.filesystem").get_themes_dir()
 
-local xresources            = require("beautiful.xresources")
+local xresources               = require("beautiful.xresources")
-local dpi                   = xresources.apply_dpi
+local dpi                      = xresources.apply_dpi
 
-local theme                 = {}
+local theme                    = {}
 
-theme.font                  = "Fira Code Nerd Font 10.5"
+theme.font                     = "Fira Code Nerd Font 10"
-theme.tasklist_disable_icon = true
+theme.tasklist_disable_icon    = true
-theme.wibar_height          = 40
+theme.wibar_height             = 40
 
-theme.bg_normal             = "#283538"
+theme.bg_normal                = "#293d38" -- hsl(165deg 20% 20%)
-theme.bg_focus              = "#82a0c9" -- hsl(215deg 40% 65%)
+theme.bg_focus                 = "#a9d6ca" -- hsl(165deg 35% 75%)
-theme.bg_urgent             = "#d0426a"
+theme.bg_urgent                = "#bc8f9b" -- hsl(345deg 25% 65%)
-theme.bg_minimize           = "#7b899d" -- hsl(215deg 15% 55%)
+theme.bg_minimize              = "#62847b" -- hsl(165deg 15% 45%)
-theme.bg_systray            = theme.bg_normal
+theme.bg_systray               = theme.bg_normal
-theme.tasklist_bg_focus     = "#5e85ba" -- hsl(215deg 40% 55%)
+theme.tasklist_bg_focus        = "#8fbcb1" -- hsl(165deg 25% 65%)
 
-theme.fg_normal             = "#616c6f"
+theme.fg_normal                = "#a9d6ca" -- hsl(165deg 35% 75%)"
-theme.fg_focus              = "#363d3e"
+theme.fg_focus                 = "#363d3e"
-theme.fg_urgent             = "#e9f2f5"
+theme.fg_urgent                = "#e9f2f5"
-theme.fg_minimize           = "#4b5456"
+theme.fg_minimize              = "#4b5456"
-theme.taglist_fg_empty      = "#566063"
+theme.taglist_fg_empty         = "#62847b" -- hsl(165deg 15% 45%)"
 
-theme.useless_gap           = dpi(1)
+theme.useless_gap              = dpi(1)
-theme.border_width          = dpi(2)
+theme.border_width             = dpi(2)
-theme.border_normal         = "#bebebe"
+theme.border_normal            = "#bebebe"
-theme.border_focus          = "#ff7f50"
+theme.border_focus             = "#ff7f50"
-theme.border_marked         = "#91231c"
+theme.border_marked            = "#91231c"
 
-theme.bg_wallpaper          = "#b0bec2"
+theme.bg_wallpaper             = "#b0bec2"
+
+theme.hotkeys_font             = theme.font
+theme.hotkeys_description_font = theme.font
+theme.hotkeys_bg               = theme.border_normal
+theme.hotkeys_modifiers_fg     = theme.bg_focus
 
 -- You can use your own layout icons like this:
-theme.layout_fairh          = themes_path .. "default/layouts/fairhw.png"
+theme.layout_fairh             = themes_path .. "default/layouts/fairhw.png"
-theme.layout_fairv          = themes_path .. "default/layouts/fairvw.png"
+theme.layout_fairv             = themes_path .. "default/layouts/fairvw.png"
-theme.layout_floating       = themes_path .. "default/layouts/floatingw.png"
+theme.layout_floating          = themes_path .. "default/layouts/floatingw.png"
-theme.layout_magnifier      = themes_path .. "default/layouts/magnifierw.png"
+theme.layout_magnifier         = themes_path .. "default/layouts/magnifierw.png"
-theme.layout_max            = themes_path .. "default/layouts/maxw.png"
+theme.layout_max               = themes_path .. "default/layouts/maxw.png"
-theme.layout_fullscreen     = themes_path .. "default/layouts/fullscreenw.png"
+theme.layout_fullscreen        = themes_path .. "default/layouts/fullscreenw.png"
-theme.layout_tilebottom     = themes_path .. "default/layouts/tilebottomw.png"
+theme.layout_tilebottom        = themes_path .. "default/layouts/tilebottomw.png"
-theme.layout_tileleft       = themes_path .. "default/layouts/tileleftw.png"
+theme.layout_tileleft          = themes_path .. "default/layouts/tileleftw.png"
-theme.layout_tile           = themes_path .. "default/layouts/tilew.png"
+theme.layout_tile              = themes_path .. "default/layouts/tilew.png"
-theme.layout_tiletop        = themes_path .. "default/layouts/tiletopw.png"
+theme.layout_tiletop           = themes_path .. "default/layouts/tiletopw.png"
-theme.layout_spiral         = themes_path .. "default/layouts/spiralw.png"
+theme.layout_spiral            = themes_path .. "default/layouts/spiralw.png"
-theme.layout_dwindle        = themes_path .. "default/layouts/dwindlew.png"
+theme.layout_dwindle           = themes_path .. "default/layouts/dwindlew.png"
-theme.layout_cornernw       = themes_path .. "default/layouts/cornernww.png"
+theme.layout_cornernw          = themes_path .. "default/layouts/cornernww.png"
-theme.layout_cornerne       = themes_path .. "default/layouts/cornernew.png"
+theme.layout_cornerne          = themes_path .. "default/layouts/cornernew.png"
-theme.layout_cornersw       = themes_path .. "default/layouts/cornersww.png"
+theme.layout_cornersw          = themes_path .. "default/layouts/cornersww.png"
-theme.layout_cornerse       = themes_path .. "default/layouts/cornersew.png"
+theme.layout_cornerse          = themes_path .. "default/layouts/cornersew.png"
 
 return theme

nvim/.config/nvim/lazy-lock.json

@@ -22,6 +22,7 @@
   "iswap.nvim": { "branch": "master", "commit": "e02cc91f2a8feb5c5a595767d208c54b6e3258ec" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "leap.nvim": { "branch": "main", "commit": "346a16ef942635a8ca5ff92e603d07e7e8be6cbe" },
+  "lsp_signature.nvim": { "branch": "master", "commit": "c909a01eb923101c76a57fd2187835e9013ab59a" },
   "lspsaga.nvim": { "branch": "main", "commit": "6063935cf68de9aa6dd79f8e1caf5df0a9385de3" },
   "marks.nvim": { "branch": "master", "commit": "bb25ae3f65f504379e3d08c8a02560b76eaf91e8" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },

nvim/.config/nvim/lua/plugins/lsp.lua

@@ -162,4 +162,12 @@ return {
     opts = {},
     cmd = 'Trouble'
   },
+
+  {
+    "ray-x/lsp_signature.nvim",
+    event = "InsertEnter",
+    opts = {
+      -- cfg options
+    },
+  }
 }

nvim/.config/nvim/lua/plugins/rabbit.lua

@@ -17,6 +17,9 @@ return {
       history = { switch = ';' },
       harpoon = { switch = 'f' },
     },
+    colors = {
+      file = '#5a418a',
+    },
   },
   keys = {
     { '<leader>1', function() rabbit_select(1) end },

shell/.zshrc

@@ -19,13 +19,19 @@ plug "zsh-users/zsh-autosuggestions"
 plug "zsh-users/zsh-syntax-highlighting"
 plug "MichaelAquilina/zsh-you-should-use"
 plug "zsh-users/zsh-history-substring-search"
-plug "agkozak/zsh-z"
+
+if which zoxide > /dev/null; then
+    eval "$(zoxide init --cmd cd zsh)"
+else
+    plug "agkozak/zsh-z"
+    ZSHZ_ECHO=1
+    setopt autocd
+fi
 
 ZVM_VI_INSERT_ESCAPE_BINDKEY=jj
 ZSH_HIGHLIGHT_STYLES[comment]=fg=blue
 HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND=bg=magenta,fg=black,bold
 HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND=bg=red,fg=black,bold
-ZSHZ_ECHO=1
 
 bindkey '^[[A' history-substring-search-up
 bindkey '^[[B' history-substring-search-down
@@ -66,7 +72,6 @@ setopt share_history
 
 # Convenience.
 
-setopt autocd
 bindkey -M vicmd '^[h' run-help
 bindkey -M viins '^[h' run-help
 

xsession/.xsession

@@ -7,6 +7,7 @@ fi
 xset b off
 xrandr --auto
 xrandr --output HDMI1 --right-of DP1
+xrandr --output DP-0 --left-of DP-2
 xrdb -merge ~/.Xresources
 setxkbmap pl -option ctrl:nocaps