From 16f3677cde88e48f73b83ccd63036f50bfe27690 Mon Sep 17 00:00:00 2001 From: Nick Boughton Date: Tue, 17 Aug 2021 20:32:59 +0100 Subject: [PATCH] gettin' nordy with it --- .gitignore | 2 ++ gtk-3.0/settings.ini | 4 ++-- sway/config | 13 +++++----- wal/colorschemes/dark/my-nord.json | 26 ++++++++++++++++++++ waybar/config | 30 +++++++++++------------ waybar/modules/cputemp | 2 +- waybar/modules/gpu/usage | 2 +- waybar/style.css | 38 ++++++++++++++++++------------ 8 files changed, 77 insertions(+), 40 deletions(-) create mode 100644 wal/colorschemes/dark/my-nord.json diff --git a/.gitignore b/.gitignore index a8b3f71..c9567f3 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,5 @@ configstore/ eog/ lutris/ menus/ +oomox/ +inkscape/ diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini index 50e1b2f..4a39c80 100644 --- a/gtk-3.0/settings.ini +++ b/gtk-3.0/settings.ini @@ -1,7 +1,7 @@ [Settings] gtk-application-prefer-dark-theme=0 -gtk-theme-name=Gruvbox-Material-Dark -gtk-icon-theme-name=Gruvbox-Material-Dark +gtk-theme-name=Nordic-darker +gtk-icon-theme-name=Tela-circle-blue-dark gtk-font-name=Roboto 10 gtk-cursor-theme-name=Adwaita gtk-cursor-theme-size=0 diff --git a/sway/config b/sway/config index b2508a9..630a568 100644 --- a/sway/config +++ b/sway/config @@ -13,7 +13,7 @@ input "type:touchpad" { # Logo key. Use Mod1 for Alt. set $mod Mod4 # Your preferred terminal emulator -set $term kitty +set $term alacritty # Your preferred application launcher set $menu wofi -c ~/.config/wofi/config -s ~/.config/wofi/style.css -I #set $menu nwggrid -f @@ -21,15 +21,15 @@ set $menu wofi -c ~/.config/wofi/config -s ~/.config/wofi/style.css -I ### Gnome settings set $gnome-schema org.gnome.desktop.interface exec_always { - gsettings set $gnome-schema gtk-theme 'Gruvbox-Material-Dark' - gsettings set $gnome-schema icon-theme 'Gruvbox-Material-Dark' + gsettings set $gnome-schema gtk-theme 'Nordic-darker' + gsettings set $gnome-schema icon-theme 'Tela-circle-blue-dark' gsettings set $gnome-schema font-name 'Roboto Regular 10' gsettings set $gnome-schema monospace-font-name 'Fira Code 10' gsettings set $gnome-schema document-font-name 'Roboto Regular 10' gsettings set org.gnome.desktop.wm.preferences titlebar-font 'Roboto Regular 10' gsettings set org.gnome.desktop.wm.preferences button-layout '' gsettings set org.gnome.desktop.default-applications.terminal exec $term - gsettings set org.gnome.desktop.default-applications.terminal exec-arg '' + gsettings set org.gnome.desktop.default-applications.terminal exec-arg '-e' } @@ -274,12 +274,13 @@ titlebar_border_thickness 0 # Colors & background # include ~/.cache/wal/colors-sway -output "*" background /home/nick/Pictures/Wallpapers/photo-1517999179346-a7078f1e40a6.jpeg fill +output "*" background /home/nick/Pictures/Wallpapers/wl0fdl62lik41.jpg fill + #output "*" background /home/nick/Pictures/Wallpapers/5b1iuo0xlth61.png fill #output "*" background $wallpaper fill # class border backgr. text indicator child_border - client.focused $foreground $background $color4 $foreground $foreground + client.focused $foreground $background $color6 $foreground $foreground client.focused_inactive $color8 $background $foreground $color8 $color8 client.unfocused $color8 $background $foreground $color8 $color8 client.urgent $foreground $background $color1 $foreground $foreground diff --git a/wal/colorschemes/dark/my-nord.json b/wal/colorschemes/dark/my-nord.json new file mode 100644 index 0000000..280e936 --- /dev/null +++ b/wal/colorschemes/dark/my-nord.json @@ -0,0 +1,26 @@ +{ + "alpha": "100", + "special": { + "background": "#2E3440", + "foreground": "#D8DEE9", + "cursor": "#D8DEE9" + }, + "colors": { + "color0": "#2E3440", + "color1": "#BF616A", + "color2": "#A3BE8C", + "color3": "#EBCB8B", + "color4": "#5E81AC", + "color5": "#B48EAD", + "color6": "#8FBCBB", + "color7": "#D8DEE9", + "color8": "#4C566A", + "color9": "#BF616A", + "color10": "#A3BE8C", + "color11": "#EBCB8B", + "color12": "#5E81AC", + "color13": "#B48EAD", + "color14": "#8FBCBB", + "color15": "#ECEFF4" + } +} diff --git a/waybar/config b/waybar/config index b9e8be0..e0bcaed 100644 --- a/waybar/config +++ b/waybar/config @@ -24,7 +24,7 @@ "wlr/taskbar": { "all-outputs": false, "format": "{icon} {title:.15}", - "icon-theme": "Gruvbox-Material-Dark", + "icon-theme": "Tela-circle-blue-dark", "icon-size": 14, "on-click": "activate", "on-middle-click": "close", @@ -46,7 +46,7 @@ "custom/gputemp": { "interval": 2, "return-type": "json", - "format": "{icon} {}", + "format": "{icon}", "format-icons": [ "", "", @@ -59,7 +59,7 @@ "custom/gpuuse": { "interval": 2, "return-type": "json", - "format": " {}%", + "format": " ", "exec": "~/.config/waybar/modules/gpu/usage" } }, @@ -76,10 +76,10 @@ "clock", "custom/separator", "battery", - "custom/separator", + //"custom/separator", "disk#1", "disk#2", - "custom/separator", + //"custom/separator", "memory", "cpu", "custom/cputemp" @@ -88,12 +88,12 @@ "idle_inhibitor", "custom/separator", "custom/covid", - "custom/separator", + //"custom/separator", "custom/updates", "custom/auroch", - "custom/separator", + //"custom/separator", "backlight", - "custom/separator", + //"custom/separator", "pulseaudio", "custom/separator", "custom/powermenu" @@ -161,7 +161,7 @@ "critical": 80 }, "interval": 5, - "format": " {}%" + "format": "" }, "cpu": { "states": { @@ -170,7 +170,7 @@ "critical": 95 }, "interval": 1, - "format": " {usage:2}%" + "format": "" }, "battery": { "states": { @@ -178,7 +178,7 @@ "warning": 30, "critical": 15 }, - "format": "{icon} {capacity}%", + "format": "{icon}", "format-icons": [ "", "", @@ -194,7 +194,7 @@ "critical": 95 }, "interval": 5, - "format": " {percentage_used:2}%", + "format": "", "path": "/" }, "disk#2": { @@ -204,7 +204,7 @@ "critical": 95 }, "interval": 5, - "format": " {percentage_used:2}%", + "format": "", "path": "/home" }, "custom/updates": { @@ -213,7 +213,7 @@ "interval": 5, "exec": "cat ~/tmp/updates.json", "exec-if": "file ~/tmp/updates.json", - "on-click": "kitty ~/.config/waybar/modules/updates/updates.sh; systemctl --user start updates.service", + "on-click": "alacritty -e ~/.config/waybar/modules/updates/updates.sh; systemctl --user start updates.service", "tooltip": true }, "custom/auroch": { @@ -233,7 +233,7 @@ "custom/cputemp": { "interval": 2, "return-type": "json", - "format": "{icon} {}", + "format": "{icon}", "format-icons": [ "", "", diff --git a/waybar/modules/cputemp b/waybar/modules/cputemp index 8fdb7f6..2d45f97 100755 --- a/waybar/modules/cputemp +++ b/waybar/modules/cputemp @@ -9,5 +9,5 @@ elif [[ $pct -gt 99 ]]; then class="critical" fi -echo "{\"text\": \"$temp\", \"class\": \"$class\", \"percentage\": $pct }" +echo "{\"text\": \"$temp\", \"tooltip\": \" ${temp}\", \"class\": \"$class\", \"percentage\": $pct }" diff --git a/waybar/modules/gpu/usage b/waybar/modules/gpu/usage index f8a1e34..af909ef 100755 --- a/waybar/modules/gpu/usage +++ b/waybar/modules/gpu/usage @@ -9,4 +9,4 @@ elif [[ $n -gt 80 ]]; then class="critical" fi -echo "{ \"text\": \"$(printf '%2d' $n)\", \"percentage\": $n, \"class\": \"$class\" }" +echo "{ \"text\": \"$(printf '%2d' $n)\", \"tooltip\": \"$n%\", \"percentage\": $n, \"class\": \"$class\" }" diff --git a/waybar/style.css b/waybar/style.css index eeffff4..d55f9fc 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -26,10 +26,11 @@ /* Gruvbox */ @define-color text @foreground; +@define-color good @color2; @define-color warn @color3; @define-color crit @color1; -@define-color accent @color4; -@define-color hilight @color4; +@define-color accent @color6; +@define-color hilight @color6; /* Sexy @define-color text @foreground; @@ -100,7 +101,7 @@ window#waybar.bottom { #workspaces button { color: @text; margin: 0; - padding: 3px 5px 0px 5px; + padding: 3px 15px 0px 15px; border-radius: 0px; } #workspaces button.focused { @@ -111,21 +112,24 @@ window#waybar.bottom { color: @warn; } -#disk.1, -#custom-gpuuse, -#custom-gputemp, -#memory { - padding-right: 5px; -} -#disk.2, -#cpu, -#custom-swap, -#custom-auroch, -#custom-gputemp, -#custom-cputemp { +#custom-auroch { padding-left: 5px; } +#battery.good, +#custom-covid.DOWN, +#cpu.good, +#custom-updates.no-updates, +#custom-auroch.no-updates, +#custom-cputemp.normal, +#custom-gputemp.normal, +#custom-gpuuse.normal, +#disk.1.good, +#disk.2.good, +#memory.good { + color: @good; +} + #battery.warning, #custom-covid.UP, #cpu.warning, @@ -137,6 +141,7 @@ window#waybar.bottom { #disk.1.warning, #disk.2.warning, #memory.warning { + background: @background; color: @warn; } @@ -150,14 +155,17 @@ window#waybar.bottom { #disk.1.critical, #disk.2.critical, #memory.critical { + background: @background; color: @crit; } +/* #custom-auroch.no-updates, #custom-covid.DOWN, #custom-updates.no-updates { color: @text; } +*/ #custom-updates.updates, #custom-auroch.updates { color: @hilight;