diff options
-rw-r--r-- | .config/catgirl/libera | 2 | ||||
-rw-r--r-- | .config/dunst/dunstrc | 2 | ||||
-rw-r--r-- | .config/nvim/lua/config/settings.lua | 8 | ||||
-rw-r--r-- | .config/nvim/lua/plugins/lspkind.lua | 33 | ||||
-rw-r--r-- | .config/nvim/lua/plugins/lualine.lua | 40 | ||||
-rw-r--r-- | .config/x11/xinitrc | 8 | ||||
-rwxr-xr-x | .local/bin/fetch_mail | 9 | ||||
-rwxr-xr-x | .local/bin/fetch_sfeed | 2 | ||||
-rwxr-xr-x | .local/bin/ndate | 2 |
9 files changed, 24 insertions, 82 deletions
diff --git a/.config/catgirl/libera b/.config/catgirl/libera index 34e3dca..d78ce38 100644 --- a/.config/catgirl/libera +++ b/.config/catgirl/libera @@ -2,6 +2,6 @@ host = irc.eu.libera.chat nick = jozan cert = libera.pem sasl-external -join = #linux,#freebsd,#archlinux,##chat,#c,#embedded,#neovim,#perl +join = #linux,##chat,#networking timestamp = %H:%M quiet diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index 5c2e861..c7a855b 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -28,7 +28,7 @@ idle_threshold = 0 # font = "Terminess Nerd Font 16" - font = "BlexMono Nerd Font:style=Medium:size=16" + font = "BlexMono Nerd Font Medium 16" # font = "NotoSans Nerd Font 17" line_height = 0 markup = full diff --git a/.config/nvim/lua/config/settings.lua b/.config/nvim/lua/config/settings.lua index 548fb11..aac3187 100644 --- a/.config/nvim/lua/config/settings.lua +++ b/.config/nvim/lua/config/settings.lua @@ -99,10 +99,10 @@ vim.diagnostic.config({ }, signs = { text = { - [vim.diagnostic.severity.ERROR] = " ", - [vim.diagnostic.severity.WARN] = " ", - [vim.diagnostic.severity.INFO] = " ", - [vim.diagnostic.severity.HINT] = " ", + [vim.diagnostic.severity.ERROR] = "E:", + [vim.diagnostic.severity.WARN] = "W:", + [vim.diagnostic.severity.INFO] = "I:", + [vim.diagnostic.severity.HINT] = "H:", }, }, underline = true, diff --git a/.config/nvim/lua/plugins/lspkind.lua b/.config/nvim/lua/plugins/lspkind.lua index 4326c76..2a5165f 100644 --- a/.config/nvim/lua/plugins/lspkind.lua +++ b/.config/nvim/lua/plugins/lspkind.lua @@ -3,35 +3,8 @@ return { 'onsails/lspkind.nvim', config = function() require('lspkind').setup({ - mode = 'symbol_text', - preset = 'codicons', - symbol_map = { - Text = "", - Method = "", - Function = "", - Constructor = "", - Field = "", - Variable = "", - Class = "", - Interface = "", - Module = "", - Property = "", - Unit = "", - Value = "", - Enum = "", - Keyword = "", - Snippet = "", - Color = "", - File = "", - Reference = "", - Folder = "", - EnumMember = "", - Constant = "", - Struct = "", - Event = "", - Operator = "", - TypeParameter = "", - }, + mode = 'text', + preset = 'default', }) end }, @@ -59,7 +32,7 @@ return { }, formatting = { format = lspkind.cmp_format({ - mode = 'symbol_text', + mode = 'text', maxwidth = { menu = 50, abbr = 50, diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua index 53d22ff..f6223c6 100644 --- a/.config/nvim/lua/plugins/lualine.lua +++ b/.config/nvim/lua/plugins/lualine.lua @@ -1,7 +1,6 @@ return { { 'nvim-lualine/lualine.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, config = function() local colors = { bg = '#32302f', @@ -108,7 +107,6 @@ return { function() return '▊' end, - -- color = { fg = colors.green }, -- Sets highlighting of component color = function() -- auto change color according to neovims mode return { fg = mode_color[vim.fn.mode()] } @@ -117,27 +115,14 @@ return { } ins_left { - -- mode component - function() - return '' - end, - color = function() - -- auto change color according to neovims mode - return { fg = mode_color[vim.fn.mode()] } - end, - padding = { right = 1 }, - } - - ins_left { 'buffers', show_filename_only = false, hide_filename_extension = false, show_modified_status = true, - icons_enabled = true, + icons_enabled = false, symbols = { - modified = ' ●', -- Text to show when the buffer is modified + modified = '+', -- Text to show when the buffer is modified alternate_file = '', -- Text to show to identify the alternate file - directory = '', -- Text to show when the buffer is a directory }, buffers_color = { -- Same values as the general color option can be used here. @@ -151,11 +136,11 @@ return { ins_left { 'diagnostics', sources = { 'nvim_diagnostic' }, - symbols = { error = ' ', warn = ' ', info = ' ' }, + symbols = { error = 'E:', warn = 'W:', info = 'I:' }, diagnostics_color = { color_error = { fg = colors.red }, color_warn = { fg = colors.yellow }, - color_info = { fg = colors.cyan }, + color_info = { fg = colors.blue }, }, } @@ -169,7 +154,7 @@ return { ins_right { 'filetype', - icons_enabled = true, -- I think icons are cool but Eviline doesn't have them. sigh + icons_enabled = false, -- I think icons are cool but Eviline doesn't have them. sigh color = { fg = colors.blue }, } @@ -180,7 +165,6 @@ return { local buf_ft = vim.api.nvim_buf_get_option(0, 'filetype') local clients = vim.lsp.get_clients() if next(clients) == nil then - icon = '' return '' end for _, client in ipairs(clients) do @@ -191,26 +175,19 @@ return { end return msg end, - icon = ' ', + icons_enabled = false, color = { fg = colors.cyan }, } ins_right { 'branch', - icon = '', + icons_enabled = false, color = { fg = colors.blue, gui = 'bold' }, } ins_right { - -- filesize component - 'filesize', - cond = conditions.buffer_not_empty, - } - - ins_right { 'diff', - -- Is it me or the symbol for modified us really weird - symbols = { added = ' ', modified = ' ', removed = ' ' }, + symbols = { added = '+', modified = '~', removed = '-' }, diff_color = { added = { fg = colors.bright_green }, modified = { fg = colors.yellow }, @@ -225,7 +202,6 @@ return { function() return '▊' end, - -- color = { fg = colors.green }, color = function() -- auto change color according to neovims mode return { fg = mode_color[vim.fn.mode()] } diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index 7f48d1a..d794cb8 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -2,21 +2,18 @@ case $(hostname -s) in mother) - icon=" " sleep="sleep 0.1" ping="ping -c1 -w1 9.9.9.9 >/dev/null 2>&1" host="mother" doas mkdir /var/run/jozan && doas chown -v jozan: /var/run/jozan ;; po-rbo) - icon=" " sleep="sleep 0.1" ping="ping -c1 -w1 9.9.9.9 >/dev/null 2>&1" host="po-rbo" doas mkdir /var/run/r_bousset && doas chown -v r_bousset: /var/run/r_bousset ;; mars) - icon=" " sleep="gsleep 1" ping="ping -c1 -t1 9.9.9.9 >/dev/null 2>&1" host="mars" @@ -63,8 +60,7 @@ for pid in $(ps aux | grep local/bin/kb | awk '{print $2}'); do kill -9 $pid done "$HOME"/.local/bin/kb & -[ $host = "po-rbo" ] && feh --no-fehbg --image-bg '#1d2021' --no-xinerama \ - --bg-fill "$HOME"/pics/wp.jpg && herbe ' wp set' & +[ $host = "po-rbo" ] && setwp "$HOME"/pics/wp/city/5.jpg & pkill wireplumber pkill pipewire-pulse pkill pipewire @@ -80,6 +76,6 @@ cd "$HOME" xrdb "$HOME"/.config/x11/xresources start_apps & startif fetch_sfeed -herbe "$icon welcome back, partner!" & +herbe "welcome back, partner!" & [ $host = "po-rbo" ] && exec dbus-run-session dwm diff --git a/.local/bin/fetch_mail b/.local/bin/fetch_mail index eaee5fb..04df4b3 100755 --- a/.local/bin/fetch_mail +++ b/.local/bin/fetch_mail @@ -13,7 +13,7 @@ sub test_gpg $ret = system("echo test | gpg2 --sign --batch --no-tty --pinentry-mode error -o /dev/null >/dev/null 2>&1"); if ($ret != 0) { - notify(" gpg locked | can't fetch mails"); + notify("[!] gpg locked | can't fetch mails"); } return $ret; } @@ -37,7 +37,7 @@ sub get_new_mail $ret = system('mbsync', $acc); if ($ret != 0) { - notify(" $acc: failed to sync mails"); + notify("[!] $acc: failed to sync mails"); } return; } @@ -80,13 +80,10 @@ sub fetch_thread open($fh, '+>', $mc_file) or die $!; $pre_count = -1; } - # if ($pre_count == -1) { - # $pre_count = count_new_mails($_, $maildir); - # } get_new_mail($acc); my $post_count = count_new_mails($acc); if ($post_count > $pre_count && $post_count > 0) { - my $notify_str = ' ' . $acc . ': ' . $post_count . ' new mail'; + my $notify_str = '[mail] ' . $acc . ': ' . $post_count . ' new mail'; $notify_str .= ($post_count > 1 ? "s\n" : "\n"); notify($notify_str) } diff --git a/.local/bin/fetch_sfeed b/.local/bin/fetch_sfeed index 08e6e41..3588ea2 100755 --- a/.local/bin/fetch_sfeed +++ b/.local/bin/fetch_sfeed @@ -14,5 +14,5 @@ post=$(wc -l $XDG_DATA_HOME/sfeed/feeds/* | rev | tr -d ' ') if [ $post -gt $pre ]; then - exec herbe " $((post-pre)) new articles" & + exec herbe "[rss] $((post-pre)) new articles" & fi diff --git a/.local/bin/ndate b/.local/bin/ndate index 7a3f6ad..4ee1758 100755 --- a/.local/bin/ndate +++ b/.local/bin/ndate @@ -11,4 +11,4 @@ # == ================ # ===================== -exec herbe " $(date '+%H:%M | %a, %d %b %Y')" & +exec herbe "$(date '+%H:%M | %a, %d %b %Y')" & |