alacritty/.config/alacritty/alacritty.toml

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

alacritty/.config/alacritty/dark.toml

@@ -1,31 +1,76 @@
-# Colors (Gruvbox dark)
+# https://github.com/alacritty/alacritty-theme/blob/master/themes/meliora.toml
-
-# Default colors
 [colors.primary]
-# hard contrast background = = '#1d2021'
+background = '#1c1917'
-# background = '#282828'
+foreground = '#d6d0cd'
-# soft contrast background = = '#32302f'
+# Bright and dim foreground colors
-background = '#292522'
+dim_foreground = '#d6d0cd'
-foreground = '#ebdbb2'
+bright_foreground = '#d6d0cd'
+
+# 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   = '#282828'
+black = '#2a2421'
-red     = '#cc241d'
+red = '#d49191'
-green   = '#98971a'
+green = '#b6b696'
-yellow  = '#d79921'
+yellow = '#c4b392'
-blue    = '#458588'
+blue = '#9e96b6'
-magenta = '#b16286'
+magenta = '#b696b1'
-cyan    = '#689d6a'
+cyan = '#98acc8'
-white   = '#a89984'
+white = '#ddd9d6'
 
 # Bright colors
 [colors.bright]
-black   = '#928374'
+black = '#2e2622'
-red     = '#fb4934'
+red = '#d89393'
-green   = '#b8bb26'
+green = '#b9b99b'
-yellow  = '#fabd2f'
+yellow = '#c8b692'
-blue    = '#83a598'
+blue = '#a299b9'
-magenta = '#d3869b'
+magenta = '#b997b4'
-cyan    = '#8ec07c'
+cyan = '#9bb0ca'
-white   = '#ebdbb2'
+white = '#e1dbd9'
+
+# 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,30 +1,26 @@
-# Colors (Alabaster)
+# https://github.com/zenbones-theme/zenbones.nvim/blob/main/extras/alacritty/zenbones_light.toml
-# author tonsky
+# This file is auto-generated by shipwright.nvim
-
-[colors.primary]
-background = '#F1F1F1' # changed
-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'
+black = "#CFC1BA"
-red = '#F05050'
+red = "#94253E"
-green = '#60CB00'
+green = "#3F5A22"
-yellow = '#FFBC5D'
+yellow = "#803D1C"
-blue = '#007ACC'
+blue = "#1D5573"
-magenta = '#E64CE6'
+magenta = "#7B3B70"
-cyan = '#00AACB'
+cyan = "#2B747C"
-white = '#FFFFFF'
+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"
+foreground = "#141D1C"

awesome/.config/awesome/rc.lua

@@ -51,20 +51,7 @@ end
 
 -- {{{ Variable definitions
 -- Themes define colours, icons, font and wallpapers.
-
-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

@@ -5,22 +5,22 @@ local dpi                      = xresources.apply_dpi
 
 local theme                 = {}
 
-theme.font                     = "Fira Code Nerd Font 10"
+theme.font                  = "Fira Code Nerd Font 10.5"
 theme.tasklist_disable_icon = true
 theme.wibar_height          = 40
 
-theme.bg_normal                = "#293d38" -- hsl(165deg 20% 20%)
+theme.bg_normal             = "#283538"
-theme.bg_focus                 = "#478575" -- hsl(165deg 30% 40%)
+theme.bg_focus              = "#36537d" -- hsl(215deg 40% 35%)
-theme.bg_urgent                = "#5c3d45" -- hsl(345deg 20% 30%)
+theme.bg_urgent             = "#d8aeb5"
 theme.bg_minimize           = "#363e49" -- hsl(215deg 15% 25%)
 theme.bg_systray            = theme.bg_normal
-theme.tasklist_bg_focus        = "#3d5c54" -- hsl(165deg 20% 30%)
+theme.tasklist_bg_focus     = "#263c59" -- hsl(215deg 40% 25%)
 
-theme.fg_normal                = "#a9d6ca" -- hsl(165deg 35% 75%)"
+theme.fg_normal             = "#9ea7aa"
 theme.fg_focus              = "#b1babd"
 theme.fg_urgent             = theme.bg_focus
 theme.fg_minimize           = "#8a9294"
-theme.taglist_fg_empty         = "#62847b" -- hsl(165deg 15% 45%)"
+theme.taglist_fg_empty      = "#798082"
 
 theme.useless_gap           = dpi(1)
 theme.border_width          = dpi(2)
@@ -30,11 +30,6 @@ theme.border_marked            = "#91231c"
 
 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_fairv          = themes_path .. "default/layouts/fairvw.png"

awesome/.config/awesome/theme_light.lua

@@ -5,22 +5,22 @@ local dpi                      = xresources.apply_dpi
 
 local theme                 = {}
 
-theme.font                     = "Fira Code Nerd Font 10"
+theme.font                  = "Fira Code Nerd Font 10.5"
 theme.tasklist_disable_icon = true
 theme.wibar_height          = 40
 
-theme.bg_normal                = "#293d38" -- hsl(165deg 20% 20%)
+theme.bg_normal             = "#283538"
-theme.bg_focus                 = "#a9d6ca" -- hsl(165deg 35% 75%)
+theme.bg_focus              = "#82a0c9" -- hsl(215deg 40% 65%)
-theme.bg_urgent                = "#bc8f9b" -- hsl(345deg 25% 65%)
+theme.bg_urgent             = "#d0426a"
-theme.bg_minimize              = "#62847b" -- hsl(165deg 15% 45%)
+theme.bg_minimize           = "#7b899d" -- hsl(215deg 15% 55%)
 theme.bg_systray            = theme.bg_normal
-theme.tasklist_bg_focus        = "#8fbcb1" -- hsl(165deg 25% 65%)
+theme.tasklist_bg_focus     = "#5e85ba" -- hsl(215deg 40% 55%)
 
-theme.fg_normal                = "#a9d6ca" -- hsl(165deg 35% 75%)"
+theme.fg_normal             = "#616c6f"
 theme.fg_focus              = "#363d3e"
 theme.fg_urgent             = "#e9f2f5"
 theme.fg_minimize           = "#4b5456"
-theme.taglist_fg_empty         = "#62847b" -- hsl(165deg 15% 45%)"
+theme.taglist_fg_empty      = "#566063"
 
 theme.useless_gap           = dpi(1)
 theme.border_width          = dpi(2)
@@ -30,11 +30,6 @@ theme.border_marked            = "#91231c"
 
 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_fairv          = themes_path .. "default/layouts/fairvw.png"

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

@@ -22,18 +22,15 @@
   "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" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "5639d58a3d11ff7c05c8e31e159bfedae55d7961" },
   "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
-  "melange-nvim": { "branch": "master", "commit": "2db5407f2f6d6d6286f50f2f7365728d66f6f3ae" },
   "mellifluous.nvim": { "branch": "v1", "commit": "1637e46585435ebda7963248e0e65422effad8d9" },
   "mini.nvim": { "branch": "main", "commit": "0420076298c4457f200c2de468f65d080597a347" },
   "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
   "neogit": { "branch": "master", "commit": "333968f8222fda475d3e4545a9b15fe9912ca26a" },
-  "nordic.nvim": { "branch": "main", "commit": "8627750ece357e9670f9e69853091f7fbb8d6523" },
   "nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
   "nvim-cmp": { "branch": "main", "commit": "1e1900b0769324a9675ef85b38f99cca29e203b3" },
   "nvim-lspconfig": { "branch": "master", "commit": "fb733ac734249ccf293e5c8018981d4d8f59fa8f" },
@@ -73,6 +70,5 @@
   "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },
   "whaler": { "branch": "main", "commit": "9e0b67e36250cb80e679563adcd4b7451eae26b2" },
   "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" },
-  "yankbank-nvim": { "branch": "main", "commit": "ded8f01bd6a7887310e14d463c8aa55eb79ec281" },
+  "yankbank-nvim": { "branch": "main", "commit": "ded8f01bd6a7887310e14d463c8aa55eb79ec281" }
-  "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" }
 }

nvim/.config/nvim/lua/lupan/utils.lua

@@ -1,9 +1,7 @@
 local M = {}
 
-local filename = os.getenv('HOME') .. '/.config/alacritty/alacritty.toml'
-
 function M.terminalbg()
-  local ok, lines = pcall(io.lines, filename)
+  local ok, lines = pcall(io.lines, os.getenv('HOME') .. '/.config/alacritty/alacritty.toml')
   if ok then
     for line in lines do
       if string.find(line, 'light.toml') then
@@ -14,16 +12,4 @@ function M.terminalbg()
   return "dark"
 end
 
-local w = vim.uv.new_fs_event()
-
-local function watch(fname)
-  w:start(filename, {}, vim.schedule_wrap(function(...)
-    vim.o.background = M.terminalbg()
-    w:stop()
-    watch(fname)
-  end))
-end
-
-watch(filename)
-
 return M

nvim/.config/nvim/lua/plugins/appearance.lua

@@ -2,20 +2,14 @@ return {
   {
     "ramojus/mellifluous.nvim",
     branch = "v1",
+    config = function()
+      vim.o.background = require('lupan.utils').terminalbg()
+      vim.cmd.colorscheme('mellifluous')
+    end
   },
   {
     'rmehri01/onenord.nvim',
   },
-  {
-    'AlexvZyl/nordic.nvim',
-  },
-  {
-    "savq/melange-nvim",
-    config = function()
-      vim.o.background = require('lupan.utils').terminalbg()
-      vim.cmd.colorscheme('melange')
-    end
-  },
   {
     -- Indentation guides (see `:help indent_blankline.txt`)
     'lukas-reineke/indent-blankline.nvim',

nvim/.config/nvim/lua/plugins/convenience.lua

@@ -22,26 +22,4 @@ return {
       require("better_escape").setup(opts)
     end,
   },
-  {
-    "folke/zen-mode.nvim",
-    opts = {
-      window = { width = 180 },
-      plugins = {
-        tmux = { enabled = true },
-      },
-      on_open = function()
-        vim.opt.laststatus = 1
-        require('incline').disable()
-        vim.system({ 'hyprctl', 'dispatch', 'fullscreen' })
-        vim.system({ 'awesome-client', 'client.focus.fullscreen = true' })
-      end,
-      on_close = function()
-        vim.opt.laststatus = 3
-        require('incline').enable()
-        vim.system({ 'hyprctl', 'dispatch', 'fullscreen' })
-        vim.system({ 'awesome-client', 'client.focus.fullscreen = false' })
-      end
-    },
-    keys = { { "<leader>z", "<cmd>ZenMode<CR>" } },
-  },
 }

nvim/.config/nvim/lua/plugins/line.lua

@@ -1,17 +1,7 @@
-vim.opt.fillchars = {
-  stl = "─",
-}
-
 return {
   {
     "sschleemilch/slimline.nvim",
-    opts = {
+    opts = {}
-      spaces = {
-        components = "─",
-        left = "─",
-        right = "─",
-      },
-    },
   },
 
   {

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

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

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

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

shell/.zshrc

@@ -19,19 +19,13 @@ plug "zsh-users/zsh-autosuggestions"
 plug "zsh-users/zsh-syntax-highlighting"
 plug "MichaelAquilina/zsh-you-should-use"
 plug "zsh-users/zsh-history-substring-search"
-
-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
@@ -72,6 +66,7 @@ setopt share_history
 
 # Convenience.
 
+setopt autocd
 bindkey -M vicmd '^[h' run-help
 bindkey -M viins '^[h' run-help
 

xsession/.xsession

@@ -7,7 +7,6 @@ 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