diff --git a/.img/screenshot.png b/.img/screenshot.png
index a1d3ec7..a792160 100644
Binary files a/.img/screenshot.png and b/.img/screenshot.png differ
diff --git a/README.md b/README.md
index 29d1169..6c866ce 100644
--- a/README.md
+++ b/README.md
@@ -13,9 +13,10 @@ $ chmod +x install.sh
$ ./install.sh
```
-This configuration depends on the following software packages:
+This configuration depends on the following packages:
- `alacritty`
+- `artix-backgrounds`
- `doas`\*
- `git`
- `grimshot`
diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
index ac130e4..4db90ba 100644
--- a/alacritty/.config/alacritty/alacritty.yml
+++ b/alacritty/.config/alacritty/alacritty.yml
@@ -15,8 +15,8 @@ font:
draw_bold_text_with_bright_colors: false
colors:
primary:
- background: '#0a0a0a'
- foreground: '#f4f4f4'
+ background: '#002b36'
+ foreground: '#839496'
cursor:
text: CellBackground
cursor: CellForeground
@@ -24,24 +24,24 @@ colors:
text: CellBackground
background: CellForeground
normal:
- black: '#0a0a0a'
- red: '#ce0000'
- green: '#29ab00'
- yellow: '#ffa700'
- blue: '#0060e5'
- magenta: '#ce00ce'
- cyan: '#66e6e6'
- white: '#f4f4f4'
+ black: '#073642'
+ red: '#dc322f'
+ green: '#859900'
+ yellow: '#b58900'
+ blue: '#268bd2'
+ magenta: '#d33682'
+ cyan: '#2aa198'
+ white: '#eee8d5'
bright:
- black: '#4c4c4c'
- red: '#ff0000'
- green: '#69c44c'
- yellow: '#ffc14c'
- blue: '#4c8fec'
- magenta: '#dc4cdc'
- cyan: '#93eded'
- white: '#ffffff'
-background_opacity: 0.85
+ black: '#002b36'
+ red: '#cb4b16'
+ green: '#586e75'
+ yellow: '#657b83'
+ blue: '#839496'
+ magenta: '#6c71c4'
+ cyan: '#93a1a1'
+ white: '#fdf6e3'
+background_opacity: 0.75
cursor:
style:
shape: Block
diff --git a/mako/.config/mako/config b/mako/.config/mako/config
index da63890..c039798 100644
--- a/mako/.config/mako/config
+++ b/mako/.config/mako/config
@@ -1,23 +1,23 @@
sort=-time
layer=overlay
-border-size=2
+border-size=3
border-radius=12
width=384
icons=1
max-icon-size=64
ignore-timeout=0
output=eDP-1
-border-color=#29ab00
-background-color=#104400cc
+border-color=#859900
+background-color=#8599007f
default-timeout=20000
[urgency=low]
-border-color=#0060e5
-background-color=#00265bcc
+border-color=#268bd2
+background-color=#268bd27f
default-timeout=10000
[urgency=high]
-border-color=#ce0000
-background-color=#520000cc
+border-color=#dc322f
+background-color=#dc322f7f
default-timeout=0
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index 50a3a93..3a13d81 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -23,7 +23,7 @@ set $menu exec $term --class launcher -t "Application Launcher" -e env HIST_FILE
### Output configuration
#
# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-output * bg ~/Pictures/Wallpapers/jonatan-pie-3l3RwQdHRHg-unsplash.jpg fill
+output * bg /usr/share/backgrounds/Artix_dna_spiral_dark.jpg fill
#
# Example configuration:
#
diff --git a/sway/.config/sway/config.d/appearance b/sway/.config/sway/config.d/appearance
index f963fb0..5bd07be 100644
--- a/sway/.config/sway/config.d/appearance
+++ b/sway/.config/sway/config.d/appearance
@@ -10,7 +10,7 @@ hide_edge_borders smart
# Gaps
gaps inner 8
-gaps outer 10
+gaps outer 4
# Font
font pango:Ubuntu Condensed 10
@@ -19,11 +19,11 @@ font pango:Ubuntu Condensed 10
# border, bground and text only apply to window titlebars
# class border bground text indicator child_border
-client.focused #0060E5 #000000 #FFFFFF #0043A0 #0060E5
-client.focused_inactive #222222 #000000 #FFFFFF #111111 #222222
-client.unfocused #222222 #000000 #FFFFFF #000000 #222222
-client.urgent #900000 #000000 #FFFFFF #0043A0 #900000
-client.placeholder #0C0C0C #000000 #FFFFFF #0043A0 #0C0C0C
+client.focused #268bd2 #000000 #eee8d5 #839496 #268bd2
+client.focused_inactive #073642 #000000 #eee8d5 #002bd2 #073642
+client.unfocused #073642 #000000 #eee8d5 #002b36 #073642
+client.urgent #dc322f #000000 #eee8d5 #cb4b16 #dc322f
+client.placeholder #073642 #000000 #eee8d5 #002bd2 #073642
-client.background #FFFFFF
+client.background #fdf6e3
diff --git a/swaylock/.config/swaylock/config b/swaylock/.config/swaylock/config
index e472942..e6977e4 100644
--- a/swaylock/.config/swaylock/config
+++ b/swaylock/.config/swaylock/config
@@ -6,23 +6,23 @@ indicator-thickness=4
screenshots
effect-blur=19x7
effect-vignette=0.4:0.8
-ring-color=0060e5
-ring-clear-color=0060e5
-ring-ver-color=29ab00
-ring-wrong-color=ce0000
-separator-color=0060e5
+ring-color=268bd2
+ring-clear-color=268bd2
+ring-ver-color=859900
+ring-wrong-color=dc322f
+separator-color=268bd2
line-uses-ring
-inside-color=00000095
-inside-clear-color=00000095
-inside-ver-color=00000095
-inside-wrong-color=00000095
-text-color=ffa700
-text-caps-lock-color=ffa700
-text-clear-color=ffa700
-text-ver-color=29ab00
-text-wrong-color=ce0000
-key-hl-color=66e6e6
-bs-hl-color=ce00ce
+inside-color=002b3675
+inside-clear-color=002b3675
+inside-ver-color=002b3675
+inside-wrong-color=002b3675
+text-color=b58900
+text-caps-lock-color=b58900
+text-clear-color=b58900
+text-ver-color=859900
+text-wrong-color=dc322f
+key-hl-color=eee8d5
+bs-hl-color=d33682
fade-in=0.2
grace=2
grace-no-mouse
diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config
index 188be77..0c9e32d 100644
--- a/waybar/.config/waybar/config
+++ b/waybar/.config/waybar/config
@@ -1,12 +1,12 @@
{
"layer": "top", // Waybar at top layer
"position": "top", // Waybar position (top|bottom|left|right)
- "height": 26, // Waybar height (to be removed for auto height)
+ "height": 36, // Waybar height (to be removed for auto height)
// "width": 1280, // Waybar width
// Choose the order of the modules
- "modules-left": ["idle_inhibitor", "sway/workspaces", "tray", "custom/media", "sway/mode"],
- "modules-center": ["sway/window"],
- "modules-right": ["custom/pvpn", "network", "pulseaudio", "cpu", "memory", "battery", "clock"],
+ "modules-left": ["idle_inhibitor", "sway/workspaces", "custom/media", "sway/mode"],
+ "modules-center": ["clock"],
+ "modules-right": ["custom/pvpn", "network", "pulseaudio", "cpu", "memory", "battery", "tray"],
// Modules configuration
"sway/workspaces": {
"disable-scroll": true,
@@ -46,22 +46,22 @@
"clock": {
"timezone": "Europe/Copenhagen",
"tooltip-format": "{:%Y %B}\n{calendar}",
- "format": "{:%Y-%m-%d \uf783 %T \uf017}", // calendar-day, clock
+ "format": "{:\uf783 %b %d %Y \uf017 %T}", // calendar-day, clock
"interval": 1
},
"cpu": {
- "format": "{usage}% \uf2db", // microchip
+ "format": "\uf2db {usage}%", // microchip
"tooltip": true
},
"memory": {
- "format": "{}% \uf538"
+ "format": "\uf538 {}%"
},
"temperature": {
//"thermal-zone": 2,
"hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input",
"critical-threshold": 90,
"format-critical": "Critical! {temperatureC}°C {icon}",
- "format": "{temperatureC}°C {icon}",
+ "format": "{icon} {temperatureC}°C",
"format-icons": ["\uf2cb", "\uf76b", "\uf769"], // thermometer-empty, temperature-low, temperature-high
"tooltip": true
},
@@ -71,26 +71,26 @@
"warning": 20,
"critical": 10
},
- "format": "{capacity}% {icon}",
- "format-charging": "{capacity}% \uf5e7", // charging-station
- "format-plugged": "{capacity}% \uf1e6", // plug
- "format-alt": "{time} {icon}",
+ "format": "{icon} {capacity}%",
+ "format-charging": "\uf5e7 {capacity}%", // charging-station
+ "format-plugged": "\uf1e6 {capacity}%", // plug
+ "format-alt": "{icon} {time}",
"format-icons": ["\uf244", "\uf243", "\uf242", "\uf241", "\uf240"] // battery-empty, battery-quarter, battery-half, battery-three-quarters, battery-full
},
"network": {
// "interface": "wlp2*", // (Optional) To force the use of this interface
- "format-wifi": "{essid} ({signalStrength}%) ",
- "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
- "format-linked": "{ifname} (No IP) ",
- "format-disconnected": "Disconnected \uf071" // exclamation-triangle
+ "format-wifi": " {essid} ({signalStrength}%)",
+ "format-ethernet": " {ifname}: {ipaddr}/{cidr}",
+ "format-linked": " {ifname} (No IP)",
+ "format-disconnected": "\uf071 Disconnected" // exclamation-triangle
},
"pulseaudio": {
"scroll-step": 2, // %, can be a float
- "format": "{volume}% {icon} {format_source}",
- "format-bluetooth": "{volume}% {icon} {format_source}",
- "format-bluetooth-muted": " {icon} {format_source}",
- "format-muted": " {format_source}",
- "format-source": "{volume}% ",
+ "format": "{icon} {volume}% {format_source}",
+ "format-bluetooth": "{icon} {volume}% {format_source}",
+ "format-bluetooth-muted": "{icon} {format_source}",
+ "format-muted": " {format_source}",
+ "format-source": " {volume}%",
"format-source-muted": "",
"format-icons": {
"headphone": "",
@@ -106,7 +106,7 @@
"custom/media": {
"format": "{icon} {}",
"return-type": "json",
- "max-length": 64,
+ "max-length": 48,
"format-icons": {
"chromium": "\uf1bc", // spotify (I use Spotify in my browser)
},
@@ -115,7 +115,7 @@
"exec": "$HOME/.config/waybar/mediaplayer.py --player chromium 2> /dev/null" // Filter player based on name
},
"custom/pvpn": { // Custom status module for ProtonVPN
- "format": "ProtonVPN {}",
+ "format": "{} ProtonVPN",
"exec": "$HOME/.config/waybar/pvpn.sh",
"return-type": "json",
"interval": 5,
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index e847581..1dc675b 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -1,50 +1,76 @@
+/* solarized colorscheme */
+
+/* base colors */
+@define-color base03 #002b36;
+@define-color base02 #073642;
+@define-color base01 #586e75;
+@define-color base00 #657b83;
+@define-color base0 #839496;
+@define-color base1 #93a1a1;
+@define-color base2 #eee8d5;
+@define-color base3 #fdf6e3;
+
+/* accent colors */
+@define-color brblack @base03;
+@define-color black @base02;
+@define-color yellow #b58900;
+@define-color orange #cb4b16;
+@define-color red #dc322f;
+@define-color magenta #d33682;
+@define-color violet #6c71c4;
+@define-color blue #268bd2;
+@define-color cyan #2aa198;
+@define-color green #859900;
+@define-color white @base2;
+@define-color brwhite @base3;
+@define-color dimmed @base0;
+
+/* colorscheme done */
+
* {
border: none;
border-radius: 0;
/* `otf-font-awesome` is required to be installed for icons */
/* Find Ubuntu Condensed font somewhere and install it in your system, it is NOT installed by default */
- font-family: "Ubuntu Condensed", "Font Awesome 5 Free Solid", "Font Awesome 5 Free Regular", "Font Awesome 5 Brands Regular", sans-serif;
+ font-family: "Fira Sans Condensed SemiBold", "Font Awesome 5 Free Solid", "Font Awesome 5 Free Regular", "Font Awesome 5 Brands Regular", sans-serif;
font-size: 16px;
min-height: 0;
}
window#waybar {
- background-color: rgba(10, 10, 10, 0.8);
+ background-color: alpha(@base03, 0.75);
transition-property: background-color;
transition-duration: .5s;
}
window#waybar.hidden {
- opacity: 0.8;
+ opacity: 0.5;
}
#workspaces button {
- padding: 0 2px;
+ background: transparent;
+ padding: 0px;
margin: 0 2px;
- color: #664200;
- /* Use box-shadow instead of border so the text isn't offset */
- box-shadow: inset 0 -2px #664200;
+ color: @dimmed;
}
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
#workspaces button:hover {
- background: transparent;
- color: #b27400;
- box-shadow: inset 0 -2px #b27400;
+ color: @white;
+ box-shadow: inset 0 3px @dimmed;
}
#workspaces button.focused {
- color: #ffa700;
- box-shadow: inset 0 -2px #ffa700;
+ color: @blue;
+ box-shadow: inset 0 3px @blue;
}
#workspaces button.urgent {
- background-color: #eb4d4b;
+ color: @orange;
+ box-shadow: inset 0 3px @orange;
}
#mode {
- color: #0060e5;
- box-shadow: inset 0 -2px #0060e5;
+ box-shadow: inset 0 3px @cyan;
}
#clock,
@@ -62,13 +88,9 @@ window#waybar.hidden {
#idle_inhibitor,
#mpd,
#custom-pvpn{
- padding: 0 5px;
- margin: 0 3px;
- color: #ffffff;
-}
-
-#window {
- margin: 0 12px;
+ padding: 0 4px;
+ margin: 0 4px;
+ color: @white;
}
/* If workspaces is the leftmost module, omit left margin */
@@ -81,34 +103,32 @@ window#waybar.hidden {
margin-right: 0;
}
-#clock {
- color: #ffa700;
- box-shadow: inset 0 -2px #ffa700;
-}
-
#battery {
- box-shadow: inset 0 -2px #ffffff;
+ box-shadow: inset 0 3px @white;
}
#battery.charging, #battery.plugged {
- color: #29ab00;
- box-shadow: inset 0 -2px #29ab00;
+ color: @green;
+ box-shadow: inset 0 3px @green;
background-color: transparent;
}
@keyframes blink {
to {
- background-color: #ffffff;
- color: #000000;
+ box-shadow: inset 0 3px @brblack;
+ background-color: @brwhite;
+ color: @brblack;
}
}
#battery.warning:not(.charging) {
- background-color: #b27400;
+ background-color: @yellow;
}
#battery.critical:not(.charging) {
- background-color: #ce0000;
+ box-shadow: inset 0 3px @brwhite;
+ background-color: @red;
+ color: @brwhite;
animation-name: blink;
animation-duration: 0.5s;
animation-timing-function: linear;
@@ -117,66 +137,64 @@ window#waybar.hidden {
}
label:focus {
- background-color: #000000;
+ background-color: @black;
}
#cpu {
- color: #29ab00;
- box-shadow: inset 0 -2px #29ab00;
+ color: @green;
+ box-shadow: inset 0 3px @green;
}
#memory {
- color: #ce00ce;
- box-shadow: inset 0 -2px #ce00ce;
+ color: @violet;
+ box-shadow: inset 0 3px @violet;
}
-#disk {
+/*#disk {
background-color: #964B00;
}
#backlight {
color: #66e6e6;
- box-shadow: inset 0 -2px #66e6e6;
-}
+ box-shadow: inset 0 2px #66e6e6;
+}*/
#network {
- color: #0060e5;
- box-shadow: inset 0 -2px #0060e5;
+ color: @blue;
+ box-shadow: inset 0 3px @blue;
}
#network.disconnected {
- color: #ce0000;
- box-shadow: inset 0 -2px #ce0000;
+ color: @red;
+ box-shadow: inset 0 3px @red;
}
#pulseaudio {
- color: #ffa700;
- box-shadow: inset 0 -2px #ffa700;
+ color: @yellow;
+ box-shadow: inset 0 3px @yellow;
}
#pulseaudio.muted {
- color: #ffa700;
- box-shadow: inset 0 -2px #ffa700;
+ color: @orange;
+ box-shadow: inset 0 3px @orange;
}
#custom-media {
background-color: transparent;
- color: #ffa700;
- box-shadow: inset 0 -2px #ffa700;
+ color: @violet;
}
#custom-media.custom-chromium {
background-color: transparent;
- color: #29ab00;
- box-shadow: inset 0 -2px #29ab00;
+ color: @green;
}
#custom-media.custom-vlc {
- background-color: #ffa000;
+ background-color: @orange;
}
#tray {
- box-shadow: inset 0 -2px #ffffff;
+ box-shadow: inset 0 3px @blue;
}
#tray > .passive {
@@ -185,26 +203,24 @@ label:focus {
#tray > .needs-attention {
-gtk-icon-effect: highlight;
- background-color: #eb4d4b;
+ background-color: @red;
}
#idle_inhibitor {
- color: #003072;
- box-shadow: inset 0 -2px #003072;
+ color: @dimmed;
}
#idle_inhibitor.activated {
- color: #0060e5;
- box-shadow: inset 0 -2px #0060e5;
+ color: @violet;
+ box-shadow: inset 0 3px @violet;
}
#custom-pvpn {
- color: #ce0000;
- box-shadow: inset 0 -2px #ce0000;
+ color: @red;
+ box-shadow: inset 0 3px @red;
}
#custom-pvpn.Connected {
- color: #29ab00;
- box-shadow: inset 0 -2px #29ab00;
+ color: @green;
+ box-shadow: inset 0 3px @green;
}
-