diff --git a/dot_zprofile b/dot_zprofile
index 0c4572e..4ac9bd1 100644
--- a/dot_zprofile
+++ b/dot_zprofile
@@ -1,6 +1,7 @@
if [[ -z $DISPLAY && $TTY = /dev/tty1 ]]; then
export MOZ_ENABLE_WAYLAND=1
export XDG_CURRENT_DESKTOP=sway
+ export XDG_SESSION_TYPE=wayland
exec dbus-run-session sway
fi
diff --git a/private_dot_config/alacritty/alacritty.yml b/private_dot_config/alacritty/alacritty.yml
index 772c18f..b945c3b 100644
--- a/private_dot_config/alacritty/alacritty.yml
+++ b/private_dot_config/alacritty/alacritty.yml
@@ -12,5 +12,4 @@ font:
style: Medium
size: 10
import:
- - /home/emily/.config/alacritty/themes/tokyo_storm.yml
-
+ - /home/emily/.config/alacritty/themes/tokyo_night.yml
diff --git a/private_dot_config/mako/config b/private_dot_config/mako/config
index 3f1ec9f..e9091f3 100644
--- a/private_dot_config/mako/config
+++ b/private_dot_config/mako/config
@@ -1,6 +1,6 @@
anchor=bottom-right
font=JetBrainsMono Nerd Font 10
-background-color=#24283b
+background-color=#1a1b26
text-color=#c0caf5
width=350
margin=0,20,20
diff --git a/private_dot_config/oomox/ui_config.json b/private_dot_config/oomox/ui_config.json
index 619542f..ffa8976 100644
--- a/private_dot_config/oomox/ui_config.json
+++ b/private_dot_config/oomox/ui_config.json
@@ -1 +1 @@
-{"window_width": 951, "window_height": 979, "preset_list_minimal_width": 150, "preset_list_width": 150, "preset_list_sections_expanded": {"presets": true, "plugins": true, "user": true}}
\ No newline at end of file
+{"window_width": 944, "window_height": 979, "preset_list_minimal_width": 150, "preset_list_width": 150, "preset_list_sections_expanded": {"presets": true, "plugins": true, "user": true}}
\ No newline at end of file
diff --git a/private_dot_config/sway/config b/private_dot_config/sway/config
index a493ed0..d405e79 100644
--- a/private_dot_config/sway/config
+++ b/private_dot_config/sway/config
@@ -4,15 +4,11 @@
exec mako
exec nm-applet --indicator
exec blueman-applet
-exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
exec thunar --daemon
+exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
# Import GTK settings
-exec_always {
- gsettings set $gnome-schema gtk-theme 'tokyo-storm'
- gsettings set $gnome-schema icon-theme 'tokyo-storm'
- gsettings set $gnome-schema font-name 'JetBrainsMono Nerd Font 10'
-}
+exec_always ~/.scripts/import-gsettings.sh
### Styling
default_border pixel 2
@@ -24,8 +20,8 @@ font pango:JetBrainsMono Nerd Font 10px
# class border backgr. text indicator child_border
client.focused #7aa2f7 #414868 #c0caf5 #7dcfff #7aa2f7
client.focused_inactive #7aa2f7 #414868 #c0caf5 #7dcfff #7aa2f7
-client.unfocused #414868 #24283b #a9b1d6 #7dcfff #414868
-client.urgent #e0af68 #e0af68 #1d202f #7dcfff #e0af68
+client.unfocused #414868 #1a1b26 #a9b1d6 #7dcfff #414868
+client.urgent #e0af68 #e0af68 #15161E #7dcfff #e0af68
### Variables
set $mod Mod4
@@ -35,11 +31,12 @@ set $up k
set $right l
set $term alacritty
set $menu wofi
-set $wallpaper ~/Pictures/wallhaven-wq1wlr.jpg
+set $wallpaper ~/Pictures/akkodian.jpg
### Special snowflake window rules
for_window [app_id="pavucontrol"] floating enable
for_window [app_id="nm-connection-editor"] floating enable
+for_window [app_id="galculator"] floating enable
for_window [title="File Operation Progress"] floating enable
### Key bindings
diff --git a/private_dot_config/waybar/config b/private_dot_config/waybar/config
index 2144caa..dcaf89e 100644
--- a/private_dot_config/waybar/config
+++ b/private_dot_config/waybar/config
@@ -1,7 +1,7 @@
{
"position": "bottom",
"modules-left": ["sway/workspaces"],
- "modules-right": ["custom/music", "backlight", "pulseaudio", "battery", "clock", "tray"],
+ "modules-right": ["tray", "network", "backlight", "pulseaudio", "battery", "clock"],
// Modules configuration
"sway/workspaces": {
"disable-scroll": true,
@@ -17,32 +17,17 @@
"8": [],
"9": [],
"10": []
- },
+ },
},
"tray": {
"spacing": 10,
},
- "custom/music": {
- "format": " {}",
- "interval": 1,
- "exec": "/home/emily/.scripts/player.sh"
- },
- "clock": {
- "format": " {:%H:%M}",
- "tooltip-format": "{:%Y %B}\n{calendar}",
- "format-alt": " {:%d/%m/%Y}"
- },
- "battery": {
- "states": {
- "warning": 20,
- "critical": 5,
- },
- "format": "{icon} {capacity}%",
- "format-icons": {
- "default": ["", "", "", "", ""],
- "charging": ["", "", "", "", ""]
- },
+
+ "network": {
+ "format": "{bandwidthDownBits} ↓↑ {bandwidthUpBits}",
+ "interval": 2
},
+
"backlight": {
"device": "intel_backlight",
"on-scroll-up": "light -A 10",
@@ -50,10 +35,28 @@
"format": "{icon} {percent}%",
"format-icons": ["", "", ""]
},
+
"pulseaudio": {
"on-click": "pavucontrol",
"format": "{icon} {volume}%",
"format-muted": "ﱝ Muted",
"format-icons": ["", "", "墳", ""]
- }
+ },
+
+ "battery": {
+ "states": {
+ "warning": 20,
+ "critical": 5,
+ },
+ "format": "{icon} {capacity}%",
+ "format-icons": {
+ "default": ["", "", "", "", ""],
+ "charging": ["", "", "", "", ""]
+ },
+ },
+
+ "clock": {
+ "format": " {:%a %b %d - %H:%M}",
+ "tooltip-format": "{:%Y %B}\n{calendar}",
+ }
}
diff --git a/private_dot_config/waybar/style.css b/private_dot_config/waybar/style.css
index 27bf40d..2e44e3b 100644
--- a/private_dot_config/waybar/style.css
+++ b/private_dot_config/waybar/style.css
@@ -12,65 +12,61 @@ window#waybar {
}
#workspaces {
- background-color: #24283b;
+ border: 2px solid #414868;
+ background-color: #1a1b26;
margin-bottom: 8px;
margin-left: 8px;
- border-radius: 5px;
+ border-radius: 5px
}
+
#workspaces button {
padding: 5px 8px;
color: #c0caf5;
}
#workspaces button.focused {
- color: #24283b;
- background-color: #7aa2f7;
- border-radius: 5px;
+ color: #7aa2f7;
+ border-radius: 4px;
}
-#workspaces button:hover {
- background-color: #7dcfff;
- color: #24283b;
- border-radius: 5px;
+#workspaces button.persistent {
+ color: #414868;
+ border-radius: 4px;
}
-#tray, #custom-music, #clock, #battery, #pulseaudio, #backlight {
- background-color: #24283b;
+#tray, #network, #backlight, #pulseaudio, #battery, #clock {
+ border-bottom: 2px solid #414868;
+ border-top: 2px solid #414868;
+ background-color: #1a1b26;
+ color: #c0caf5;
padding: 5px 8px;
margin-bottom: 8px;
}
-#clock {
- color: #7dcfff;
-}
-
-#battery {
- color: #b48ead;
-}
-
-#battery.charging {
- color: #b48ead;
-}
-
-#battery.warning:not(.charging) {
- background-color: #f7768e;
- color: #24283b;
+#network {
+ color: #f7768e;
}
#backlight {
color: #9ece6a;
}
-#custom-music {
- color: #f7768e;
- border-radius: 5px 0px 0px 5px;
-}
-
-#tray {
- border-radius: 0px 5px 5px 0px;
- margin-right: 8px;
-}
-
#pulseaudio {
color: #e0af68;
}
+
+#battery {
+ color: #bb9af7;
+}
+
+#clock {
+ color: #7aa2f7;
+ border-radius: 0px 3px 3px 0px;
+ margin-right: 8px;
+ border-right: 2px solid #414868;
+}
+
+#tray {
+ border-radius: 5px 0px 0px 3px;
+ border-left: 2px solid #414868;
+}
\ No newline at end of file
diff --git a/private_dot_config/wofi/style.css b/private_dot_config/wofi/style.css
index 7b0d618..4e3c8bc 100644
--- a/private_dot_config/wofi/style.css
+++ b/private_dot_config/wofi/style.css
@@ -1,17 +1,17 @@
window {
margin: 0px;
border: 2px solid #414868;
- border-radius: 5px;
- background-color: #24283b;
+ border-radius: 4px;
+ background-color: #1a1b26;
font-family: "JetBrainsMono Nerd Font";
font-size: 10px;
}
#input {
margin: 5px;
- border: 1px solid #24283b;
+ border: 1px solid #1a1b26;
color: #c0caf5;
- background-color: #24283b;
+ background-color: #1a1b26;
}
#input image {
@@ -21,13 +21,13 @@ window {
#inner-box {
margin: 5px;
border: none;
- background-color: #24283b;
+ background-color: #1a1b26;
}
#outer-box {
margin: 5px;
border: none;
- background-color: #24283b;
+ background-color: #1a1b26;
}
#scroll {