From 25019ba10b85ac0d8da1cb5f3296400cf59f33f5 Mon Sep 17 00:00:00 2001 From: Mark Riedesel Date: Sun, 30 Jun 2024 08:43:11 -0500 Subject: [PATCH] theme, add nvim colorizer --- .config/nvim/lazy-lock.json | 15 ++++++++------- .config/nvim/lua/klowner/plugins/colorizer.lua | 7 +++++++ .config/sway/autostart | 7 +++---- .config/sway/config.d/90-enable-theme.conf | 4 ++-- .../sway/config.d/98-application-defaults.conf | 2 +- .config/sway/modes/default | 2 +- .config/sway/themes/dynamic/theme.conf | 9 +++++++-- .config/waybar/style.css | 9 +++++---- .config/zsh/config.d/add-retheme-alias | 2 +- 9 files changed, 35 insertions(+), 22 deletions(-) create mode 100644 .config/nvim/lua/klowner/plugins/colorizer.lua diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 9a669bd..e5ebc41 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -2,19 +2,20 @@ "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "auto-session": { "branch": "main", "commit": "e5ffe230235c7d35c2f33078b7cd927a4fb579c4" }, + "auto-session": { "branch": "main", "commit": "879f5b30207bd53101e1034ca91330f23746f601" }, "bufferline.nvim": { "branch": "main", "commit": "99337f63f0a3c3ab9519f3d1da7618ca4f91cffe" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "colorizer.nvim": { "branch": "master", "commit": "7f84ba0d39b37484f5f1f838cafda9cb5241a532" }, "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" }, "friendly-snippets": { "branch": "main", "commit": "682157939e57bd6a2c86277dfd4d6fbfce63dbac" }, "gist.nvim": { "branch": "main", "commit": "92b13e486dd9fd083750450e0d262fcc68a62b91" }, - "gitsigns.nvim": { "branch": "main", "commit": "fa42613096ebfa5fee1ea87d70f8625ab9685d01" }, - "indent-blankline.nvim": { "branch": "master", "commit": "4288ce8128a52650e401dda42fd7651a6038f262" }, - "lazy.nvim": { "branch": "main", "commit": "0eb46e781666d2a5b288b671813f65b00896fff9" }, + "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" }, + "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "lazy.nvim": { "branch": "main", "commit": "1fad61712bd3937dda925775a7736b8efbcbf1a7" }, "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, @@ -24,10 +25,10 @@ "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "9c9eb07fecc578e25e28db8dc9002b43fff2ed79" }, + "nvim-lspconfig": { "branch": "master", "commit": "7edfd6692ba17f8d4fe08d84142781898ab0a672" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, "nvim-tree.lua": { "branch": "master", "commit": "8b2c5c678be4b49dff6a2df794877000113fd77b" }, - "nvim-treesitter": { "branch": "master", "commit": "53b32a6aa3e1de224e82f88cbdc08584c753adb7" }, + "nvim-treesitter": { "branch": "master", "commit": "7ff0b8d3d21b15eb7231fcbd2acfded8987f5efd" }, "nvim-ts-autotag": { "branch": "main", "commit": "ddfccbf0df1b9349c2b9e9b17f4afa8f9b6c1ed1" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "cb064386e667def1d241317deed9fd1b38f0dc2e" }, "nvim-unception": { "branch": "main", "commit": "a0af21a27e2ba19ce6004d57d34006d18bc6bad4" }, @@ -38,7 +39,7 @@ "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" }, "tokyonight.nvim": { "branch": "main", "commit": "30d7be361a7fbf187a881f17e574e9213d5108ea" }, - "trouble.nvim": { "branch": "main", "commit": "88c3be40c061ce053ab326ce4fdcb973a1f785ff" }, + "trouble.nvim": { "branch": "main", "commit": "e5d0e04121c662ce29190a57dd03655d43c59d44" }, "vim-fugitive": { "branch": "master", "commit": "d0c1a437536778bcc8174b7cb2ffdf98f611e6fe" }, "vim-maximizer": { "branch": "master", "commit": "2e54952fe91e140a2e69f35f22131219fcd9c5f1" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, diff --git a/.config/nvim/lua/klowner/plugins/colorizer.lua b/.config/nvim/lua/klowner/plugins/colorizer.lua new file mode 100644 index 0000000..34c266f --- /dev/null +++ b/.config/nvim/lua/klowner/plugins/colorizer.lua @@ -0,0 +1,7 @@ +return { + 'JosefLitos/colorizer.nvim', + event = { "BufNew" }, + opts = { + filetypes = { '*' }, + }, +}; diff --git a/.config/sway/autostart b/.config/sway/autostart index f4c70fa..0a2d749 100644 --- a/.config/sway/autostart +++ b/.config/sway/autostart @@ -2,7 +2,7 @@ set $initialize_foot_server '[ -x "$(command -v foot)" ] && systemctl --now --user enable foot-server.socket && systemctl --now --user enable foot-server' set $initialize_swayr_daemon '[ -x "$(command -v swayrd)" ] && systemctl --now --user enable swayrd' -set $initialize_waybar '[ -x "$(command -v waybar)" ] && (pkill waybar || exit 0) && systemctl --now --user enable waybar && (systemctl --user start waybar || $sway-config-dir/scripts/waybar.sh)' +set $initialize_waybar '[ -x "$(command -v waybar)" ] && (pkill waybar || exit 0) && $sway-config-dir/scripts/waybar.sh' set $initialize_workspace_icons '[ -x "$(command -v sworkstyle)" ] && systemctl --now --user enable sworkstyle' set $initialize_poweralert_daemon '[ -x "$(command -v poweralertd)" ] && systemctl --now --user enable poweralertd' set $initialize_idlehack_daemon '[ -x "$(command -v idlehack)" ] && systemctl --now --user enable idlehack' @@ -13,9 +13,8 @@ set $initialize_way_displays '[ -x "$(command -v way-displays)" ] && systemctl - set $autostart_dex '[ -x "$(command -v dex)" ] && gdbus wait --session org.kde.StatusNotifierWatcher && dex -a -e SWAY' set $flashfocus '[ -x "$(command -v flashfocus)" ] && flashfocus' -set $wlsunset '[ -x "$(command -v wlsunset)" ] && /usr/share/sway/scripts/sunset.sh "on"' +set $wlsunset '[ -x "$(command -v wlsunset)" ] && $sway-config-dir/scripts/sunset.sh "on"' set $autotiling '[ -x "$(command -v autotiling)" ] && autotiling || [ -x "$(command -v autotiling-rs)" ] && autotiling-rs' -set $help_menu '[ -x "$(command -v nwg-wrapper)" ] && [ -f $HOME/.config/nwg-wrapper/help.sh ] && /usr/share/sway/scripts/help.sh' set $kanshi '[ -x "$(command -v kanshi)" ] && pkill -x kanshi; exec kanshi' set $xdg-dirs '[ -x "$(command -v xdg-user-dirs-update)" ] && exec xdg-user-dirs-update' @@ -40,7 +39,7 @@ set $apply_background swaymsg 'output * bg $wallpaper fill' ## daemons -set $mako '[ -x "$(command -v mako)" ] && pkill -x mako; /usr/share/sway/scripts/mako.sh --font "$term-font" --text-color "$text-color" --border-color "$accent-color" --background-color "$background-color" --border-size 3 --width 400 --height 200 --padding 20 --margin 20 --default-timeout 15000' +set $mako '[ -x "$(command -v mako)" ] && pkill -x mako; mako --font "$term-font" --text-color "$text-color" --border-color "$accent-color" --background-color "$background-color" --border-size 3 --width 400 --height 200 --padding 20 --margin 20 --default-timeout 15000' set $swappy_notify '[ -x "$(command -v swappy)" ] && /usr/share/sway/scripts/screenshot-notify.sh' set $cliphist_watch '[ -x "$(command -v wl-paste)" ] && [ -x "$(command -v cliphist)" ] && wl-paste --watch waybar-signal clipboard' set $cliphist_store '[ -x "$(command -v wl-paste)" ] && [ -x "$(command -v cliphist)" ] && wl-paste --watch cliphist store' diff --git a/.config/sway/config.d/90-enable-theme.conf b/.config/sway/config.d/90-enable-theme.conf index bbe7244..0cdc49f 100644 --- a/.config/sway/config.d/90-enable-theme.conf +++ b/.config/sway/config.d/90-enable-theme.conf @@ -1,11 +1,11 @@ exec_always { - $sway-script-dir/enable-gtk-theme.sh "$gtk-theme" + $sway-scripts-dir/enable-gtk-theme.sh "$gtk-theme" gsettings set org.gnome.desktop.interface icon-theme "$icon-theme" gsettings set org.gnome.desktop.interface cursor-theme "$cursor-theme" gsettings set org.gnome.desktop.interface font-name "$gui-font" gsettings set org.gnome.desktop.input-sources show-all-sources true gsettings set org.gnome.desktop.interface monospace-font-name "$term-font" - $sway-script-dir/fontconfig.sh "monospace" "$term-font" + $sway-scripts-dir/fontconfig.sh "monospace" "$term-font" gsettings set org.freedesktop.appearance color-scheme "$gtk-color-scheme" gsettings set org.gnome.desktop.interface color-scheme "$gtk-color-scheme" diff --git a/.config/sway/config.d/98-application-defaults.conf b/.config/sway/config.d/98-application-defaults.conf index 49fdf74..67765f4 100644 --- a/.config/sway/config.d/98-application-defaults.conf +++ b/.config/sway/config.d/98-application-defaults.conf @@ -30,7 +30,7 @@ for_window [app_id="" title=".* is sharing your screen."] floating enable for_window [title="^wlay$"] floating enable # set opacity for specific apps -for_window [app_id="kitty"] opacity 0.9 +for_window [app_id="kitty"] opacity 0.95 # Don't allow applications to inhibit shortcuts, i.e. grab total control of the # keyboard. Chrome currently abuses this by enabling it for all "--app=..." diff --git a/.config/sway/modes/default b/.config/sway/modes/default index 18086c0..8dacb58 100644 --- a/.config/sway/modes/default +++ b/.config/sway/modes/default @@ -2,7 +2,7 @@ $bindsym $mod+Return exec kitty $bindsym $mod+Home exec thunar $bindsym $mod+b exec firefox -$bindsym $mod+d exec --no-startup-id ~/bin/launcher +$bindsym $mod+d exec wofi --show drun --color $HOME/.cache/wal/colors --allow-images # quick-access screenshot $bindsym $mod+g exec $screenshot_selection diff --git a/.config/sway/themes/dynamic/theme.conf b/.config/sway/themes/dynamic/theme.conf index 8700f5f..64d0402 100644 --- a/.config/sway/themes/dynamic/theme.conf +++ b/.config/sway/themes/dynamic/theme.conf @@ -1,6 +1,11 @@ # dynamic include $HOME/.cache/wal/colors-sway +set $gtk-theme Dracula +set $icon-theme Dracula-icons +set $cursor-theme elementary +set $gtk-color-scheme prefer-dark + set $background-color $color0 set $text-color $color6 set $selection-color $color1 @@ -16,5 +21,5 @@ client.placeholder $color0 $color0 $color5 $color0 $color0 client.background $color7 # Appearance -default_border pixel 5 -gaps inner 5 +default_border pixel 3 +gaps inner 3 diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 064ffee..a3007e5 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -30,6 +30,7 @@ margin: 0; min-height: 0; padding: 0; + font-size: 14px; font-family: Font Awesome, "JetBrainsMono NF", "Roboto Mono", "Ubuntu", "Droid", "MesloLGL Nerd Font", Roboto, sans-serif; } @@ -41,14 +42,14 @@ window#waybar { .modules-right, .modules-left { margin: 0; - padding: 2px 10px; + padding: 2px 5px; background-color: alpha(@background, 0.7); } .modules-right { - border-radius: 0 0 0 10px; + border-radius: 0 0 0 2px; } .modules-left { - border-radius: 0 0 10px 0; + border-radius: 0 0 2px 0; } #backlight, @@ -79,7 +80,7 @@ window#waybar { } #workspaces button { - padding-bottom: 2px; + padding: 2px; color: @foreground; } diff --git a/.config/zsh/config.d/add-retheme-alias b/.config/zsh/config.d/add-retheme-alias index c9862d5..e5121fc 100644 --- a/.config/zsh/config.d/add-retheme-alias +++ b/.config/zsh/config.d/add-retheme-alias @@ -1 +1 @@ -alias retheme="wal -q -t -i $(xdg-user-dir WALLPAPERS)" +alias retheme="wal -q -t -i $(xdg-user-dir WALLPAPERS) --saturate 0.95"