From 61071d56b827dcfa0555b3e79f2b0472fe15f580 Mon Sep 17 00:00:00 2001 From: juan Date: Tue, 29 Mar 2022 18:02:47 +0800 Subject: [PATCH] Add swaync and change color scheme of wofi & kitty --- .config/kitty/iceberg_dark.conf | 46 --------- .config/kitty/kitty.conf | 4 +- .config/kitty/nord.conf | 43 --------- .config/sway/config | 20 ++-- .config/swaync/config.json | 25 +++++ .config/swaync/style.css | 159 ++++++++++++++++++++++++++++++++ .config/waybar/config | 22 ++++- .config/waybar/style.css | 98 +++++++++++++------- .config/wofi/config | 7 +- .config/wofi/style.css | 28 +++--- 10 files changed, 298 insertions(+), 154 deletions(-) delete mode 100644 .config/kitty/iceberg_dark.conf delete mode 100644 .config/kitty/nord.conf create mode 100644 .config/swaync/config.json create mode 100644 .config/swaync/style.css diff --git a/.config/kitty/iceberg_dark.conf b/.config/kitty/iceberg_dark.conf deleted file mode 100644 index eb7097d..0000000 --- a/.config/kitty/iceberg_dark.conf +++ /dev/null @@ -1,46 +0,0 @@ -background #161821 -foreground #c6c8d1 - -selection_background #1e2132 -selection_foreground #c6c8d1 - -cursor #d2d4de - -# black -color0 #161821 -color8 #6b7089 - -# red -color1 #e27878 -color9 #e98989 - -# green -color2 #b4be82 -color10 #c0ca8e - -# yellow/orange -color3 #e2a478 -color11 #e9b189 - -# blue -color4 #84a0c6 -color12 #91acd1 - -# magenta/purple -color5 #a093c7 -color13 #ada0d3 - -# cyan -color6 #89b8c2 -color14 #95c4ce - -# white -color7 #c6c8d1 -color15 #d2d4de - -# tab bar -active_tab_foreground #161821 -active_tab_background #84a0c6 -inactive_tab_foreground #d2d4de -inactive_tab_background #353a50 -tab_bar_background #0f1117 diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index ceea3fd..fccaf15 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -629,7 +629,7 @@ symbol_map U+23FB-U+23FE,U+2B58,U+E200-U+E2A9,U+E0A0-U+E0A3,U+E0B0-U+E0BF,U+E0C0 #: The foreground and background colors - background_opacity 0.8 + background_opacity 0.95 #: The opacity of the background. A number between 0 and 1, where 1 is #: opaque and 0 is fully transparent. This will only work if @@ -1311,4 +1311,4 @@ symbol_map U+23FB-U+23FE,U+2B58,U+E200-U+E2A9,U+E0A0-U+E0A3,U+E0B0-U+E0BF,U+E0C0 #: }}} # }}} -include ./iceberg_dark.conf +include themes/serenade.conf diff --git a/.config/kitty/nord.conf b/.config/kitty/nord.conf deleted file mode 100644 index 54f3a96..0000000 --- a/.config/kitty/nord.conf +++ /dev/null @@ -1,43 +0,0 @@ -# Nord Colorscheme for Kitty -# Based on: -# - https://gist.github.com/marcusramberg/64010234c95a93d953e8c79fdaf94192 -# - https://github.com/arcticicestudio/nord-hyper - -foreground #D8DEE9 -background #2E3440 -selection_foreground #000000 -selection_background #FFFACD -url_color #0087BD -cursor #81A1C1 - -# black -color0 #3B4252 -color8 #4C566A - -# red -color1 #BF616A -color9 #BF616A - -# green -color2 #A3BE8C -color10 #A3BE8C - -# yellow -color3 #EBCB8B -color11 #EBCB8B - -# blue -color4 #81A1C1 -color12 #81A1C1 - -# magenta -color5 #B48EAD -color13 #B48EAD - -# cyan -color6 #88C0D0 -color14 #8FBCBB - -# white -color7 #E5E9F0 -color15 #ECEFF4 diff --git a/.config/sway/config b/.config/sway/config index ae4d1bc..ce6701d 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -12,7 +12,7 @@ set $menu wofi | xargs swaymsg exec -- exec wlsunset -l 30.4 -L 104.0 -T 6500 -t 3500 exec light -S 70 exec --no-startup-id pipewire -exec mako +exec swaync exec playerctld daemon #my keybinds @@ -20,6 +20,7 @@ exec playerctld daemon bindsym $mod+Ctrl+l exec ~/.config/sway/scripts/logout.sh bindsym $mod+Print exec grim ~/Pictures/Screenshots/$(date +'%H:%M_%y%m%d.png') && \ exec notify-send -t 3000 'Screenshot saved.' +bindsym $mod+n exec swaync-client -t -sw #set gtk theme @@ -35,13 +36,12 @@ exec_always { #set colour #color class border backgr. text indicator child_border -client.focused #a093c7 #161821 #d2d4de #84a0c6 #a093c7 -client.focused_inactive #6b7089 #161821 #d2d4de #84a0c6 #6b7089 -client.unfocused #6b7089 #161821 #d2d4de #84a0c6 #6b7089 -client.urgent #e27878 #161821 #d2d4de #84a0c6 #bf616a -client.placeholder #6b7089 #161821 #d2d4de #84a0c6 #6b7089 -client.background #6b7089 -#2e3440 +client.focused #82abbc #2a2f33 #bfddb2 #415c6d #7fbbb3 +client.focused_inactive #3f464b #2a2f33 #bfddb2 #415c6d #3f464b +client.unfocused #3f464b #2a2f33 #bfddb2 #415c6d #3f464b +client.urgent #d76e6e #2a2f33 #bfddb2 #415c6d #e68183 +client.placeholder #3f464b #2a2f33 #bfddb2 #415c6d #3f464b +client.background #3f464b #2a2f33 #bind fn keys @@ -60,7 +60,7 @@ bindsym XF86AudioPrev exec 'playerctl previous' #borders stuff -default_border pixel 2 +default_border pixel 1 #workspace_auto_back_and_forth yes force_display_urgency_hint 500 ms smart_borders no_gaps @@ -164,5 +164,5 @@ bindsym $mod+0 scratchpad show bar swaybar_command waybar -output * bg $(find ~/Pictures/Wallpapers/ -type f | shuf -n1) fill +output * bg $(find ~/Pictures/Wallpapers/serenade/ -type f | shuf -n1) fill include /etc/sway/config.d/* diff --git a/.config/swaync/config.json b/.config/swaync/config.json new file mode 100644 index 0000000..fc8f790 --- /dev/null +++ b/.config/swaync/config.json @@ -0,0 +1,25 @@ +{ + "$schema": "/etc/xdg/swaync/configSchema.json", + "positionX": "right", + "positionY": "top", + "control-center-margin-top": 12, + "control-center-margin-bottom": 256, + "control-center-margin-right": 8, + "control-center-margin-left": 8, + "timeout": 10, + "timeout-low": 5, + "timeout-critical": 0, + "notification-window-width": 500, + "keyboard-shortcuts": true, + "image-visibility": "always", + "transition-time": 200, + "hide-on-clear": true, + "hide-on-action": true, + "script-fail-notify": true, + "scripts": { + "example-script": { + "exec": "echo 'Do something...'", + "urgency": "Normal" + } + } +} diff --git a/.config/swaync/style.css b/.config/swaync/style.css new file mode 100644 index 0000000..bb613d5 --- /dev/null +++ b/.config/swaync/style.css @@ -0,0 +1,159 @@ +/* + * vim: ft=less + */ + +@define-color border-color #7f868c; +@define-color bg #2e3338; +@define-color bg-trans rgba(46, 51, 56, 0.9); +@define-color bg-hover #373d41; +@define-color bg-focus #474f54; +@define-color bg-selected #3f464b; +@define-color fg #bfddb2; +@define-color orange #e5a46b; +@define-color blue #82abbc; + +.notification-row { + outline: none; +} +.notification-row:focus, +.notification-row:hover { + background: @bg-hover; +} + +.notification { + border-radius: 3px; + margin: 6px 12px; + box-shadow: 0px 2px 4px 2px rgba(0, 0, 0, 0.3); + padding: 0; +} + +.notification-content { + background: transparent; + padding: 6px; + border-radius: 3px; +} + +.close-button { + background: black; + color: white; + text-shadow: none; + padding: 0 2px; + box-shadow: 0px 2px 4px 2px rgba(0, 0, 0, 0.3); + border-radius: 50%; +} +.close-button:hover { + background: rgb(30, 30, 30); + transition: all 0.15s ease-in-out; +} + +.notification-default-action, +.notification-action { + padding: 4px; + margin: 0; + box-shadow: none; + background: @bg; + border: 1px solid @border-color; +} + +.notification-default-action:hover, +.notification-action:hover { + background: @bg-hover; +} + +.notification-default-action { + border-radius: 3px; +} + +/* When alternative actions are visible */ +.notification-default-action:not(:only-child) { + border-bottom-left-radius: 0px; + border-bottom-right-radius: 0px; +} + +.notification-action { + border-radius: 0px; + border-top: none; + border-right: none; +} + +/* add bottom border radius to eliminate clipping */ +.notification-action:first-child { + border-bottom-left-radius: 10px; +} +.notification-action:last-child { + border-bottom-right-radius: 10px; + border-right: 1px solid @border-color; +} + +.image { +} + +.body-image { + margin-top: 6px; + background-color: white; + border-radius: 3px; +} + +.summary { + color: @fg; + text-shadow: none; +} + +.time { + color: @fg; + text-shadow: none; +} + +.body { + background: transparent; + color: @fg; + text-shadow: none; +} + +.top-action-title { + color: @fg; + text-shadow: none; +} + +.control-center-clear-all { + color: @orange; + text-shadow: none; + background: @bg; + border: 1px solid @border-color; + box-shadow: none; + border-radius: 3px; +} +.control-center-clear-all:hover { + background: @bg-hover; +} + +.control-center-dnd { + border-radius: 3px; + background: @bg; + border: 1px solid @border-color; + box-shadow: none; +} + +.control-center-dnd:checked { + background: @blue; +} +.control-center-dnd slider { + border-radius: 3px; + background: @bg-hover; + border: 1px solid @border-color; +} + +.control-center { + background: @bg-trans; + border-radius: 5px; + border: 1px solid @border-color; +} +.control-center-list { + background: @bg-trans; + border: 1px @border-color; + border-style: dashed solid hidden solid; +} + +.floating-notifications { + background: transparent; +} diff --git a/.config/waybar/config b/.config/waybar/config index 6524b05..eebe945 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -2,9 +2,9 @@ "layer": "top", // Waybar at top layer "height": 24, // Waybar height (to be removed for auto height) // Choose the order of the modules - "modules-left": ["sway/workspaces", "sway/window"], - "modules-center": [], - "modules-right": ["tray","custom/player","network","battery","clock"], + "modules-left": ["sway/workspaces"], + "modules-center": ["sway/window"], + "modules-right": ["custom/notification","tray","custom/player","network","battery","clock"], "tray": { "spacing": 10 }, @@ -38,6 +38,22 @@ // "exec": "sleep 10 && curl 'https://wttr.in/?format=%t+(%f)+%c'", // "interval": 1800 //}, + "custom/notification": { + "tooltip": false, + "format": "{icon}", + "format-icons": { + "notification": "", + "none": "", + "dnd-notification": "", + "dnd-none": "" + }, + "return-type": "json", + "exec-if": "which swaync-client", + "exec": "swaync-client -swb", + "on-click": "swaync-client -t -sw", + "on-click-right": "swaync-client -d -sw", + "escape": true + }, "custom/player": { "escape": true, "exec": "playerctl metadata --format '{{uc(playerName)}}: {{ artist }} - {{ album }} - {{ title }} {{emoji(status)}}' || echo 'Stopped  '", diff --git a/.config/waybar/style.css b/.config/waybar/style.css index dd7d3a2..7dce9ff 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,74 +1,102 @@ * { border: none; border-radius: 0; - font-size: 14px; + font-size: 13px; min-height: 0; - color: #c6c8d1; } +@import "serenade.css"; + window#waybar { - background: rgba(30, 33, 50, 0.9); + background: @background; + border-bottom: 2px solid @blue; + color: @white_b; } #workspaces { margin: 5px 10px; } + #workspaces button { - padding: 0 12px; - border-radius: 0; + padding: 0 5px; + background: transparent; + color: @foreground; + border-bottom: 2px solid transparent; } #workspaces button.focused { - background: rgba(160, 147, 199, 0.5); - border-radius: 2px; -} - -#workspaces button:hover { - background-color: rgba(173, 160, 211, 0.2); - border-radius: 2px; + background: @foreground; + color: @selection_background; } #workspaces button.urgent { - background-color: #e27878; - border-radius: 2px; + background-color: @magenta; } +#mode, #clock, -#battery, -#network, -/* #custom-weather, */ -#custom-player { - background-color: #161821; - padding: 0px 10px; - margin: 5px 0px; +#battery { + padding: 0 10px; + margin: 0 5px; } + #clock { - border-radius: 0px 2px 2px 0px; - margin-right: 10px; + background-color: @green; + color: @background; +} + +#battery { + background-color: @yellow; + color: @background; +} + +#battery.charging { + color: @background; + background-color: @green; } @keyframes blink { to { - background-color: #d2d4de; - color: #161821; + background-color: @white_b; + color: @background; } } -#battery.charging { - color: #b4be82; +/* #idle_inhibitor, */ +/* #pulseaudio, */ +/* #custom-openvpn, */ +/* #network, */ +/* #cpu, */ +/* #memory, */ +/* #temperature, */ +/* #backlight, */ +/* #battery, */ +/* #clock, */ +/* #tray { */ +/* padding: 0 6px; */ +/* margin: 0 3px; */ +/* } */ + +#clock, +#battery, +#network, +#custom-notification, +#custom-player { + padding: 0px 10px; + margin: 0px 5px; } -#battery.critical:not(.charging) { - background-color: #e98989; +#clock { + margin-right: 10px; +} + +#battery.warning:not(.charging) { + background: @red; + color: @white_b; animation-name: blink; - animation-duration: 1.0s; + animation-duration: 0.5s; animation-timing-function: linear; animation-iteration-count: infinite; animation-direction: alternate; } - -#custom-player { - border-radius: 2px 0px 0px 2px; - margin-left: 10px; -} diff --git a/.config/wofi/config b/.config/wofi/config index 7f9a2ea..386e9ca 100644 --- a/.config/wofi/config +++ b/.config/wofi/config @@ -1,12 +1,15 @@ +# style style=/home/juan/.config/wofi/style.css xoffset=660 yoffset=275 -show=drun width=600 height=500 + +# opts +show=drun always_parse_args=true show_all=true print_command=true layer=overlay insensitive=true -prompt= +prompt=Search for Applications diff --git a/.config/wofi/style.css b/.config/wofi/style.css index 64b7063..09ea091 100644 --- a/.config/wofi/style.css +++ b/.config/wofi/style.css @@ -1,33 +1,33 @@ window { margin: 0px; - border: 2px solid #6b7089; - border-radius: 2px; - background-color: #161821; + border: 1px solid #7f868c; + border-radius: 3px; + background-color: #2a2f33; font-family: monospace; font-size: 14px; } #input { margin: 5px; - border: 1px solid #1e2132; - color: #d2d4de; - background-color: #161821; + border: 1px solid #bfddb2; + color: #c1bf89; + background-color: #2e3338; } #input image { - color: #d2d4de; + color: #bfddb2; } #inner-box { margin: 5px; border: none; - background-color: #161821; + background-color: #2a2f33; } #outer-box { margin: 5px; border: none; - background-color: #161821; + background-color: #2a2f33; } #scroll { @@ -38,18 +38,20 @@ window { #text { margin: 5px; border: none; - color: #d2d4de; + color: #bfddb2; } #entry:selected { - background-color: #1e2132; + background-color: #474f54; + color: #c1bf89; border-radius: 3px; font-weight: normal; } #text:selected { - background-color: #1e2132; + background-color: #474f54; + color: #c1bf89; border-radius: 3px; - font-weight: normal; + font-weight: bold; }