Restructured files

8 files changed, 218 insertions, 129 deletions

diff --git a/config.jsonc b/config.jsonc
index 12e47b1..0bfcbd5 100644..120000
--- a/config.jsonc
+++ b/config.jsonc
@@ -1,24 +1 @@
-{
-	"output": ["DP-1", "eDP-1"],
-	"position": "top",
-	"include": ["~/.config/waybar/modules.jsonc"],
-	"reload_style_on_change": true,
-
-	"modules-left": [
-		"custom/apps",
-		"sway/workspaces"
-	],
-
-	"modules-right": [
-		"cpu",
-		"memory",
-		"backlight",
-		"battery",
-		"bluetooth",
-		"network",
-		"wireplumber",
-		"clock#calendar",
-		"clock",
-		"tray"
-	]
-}
+themes/dark/config.jsonc
\ No newline at end of file
diff --git a/modules.jsonc b/modules/modules.jsonc
index 1a22270..05c6b7f 100644
--- a/modules.jsonc
+++ b/modules/modules.jsonc
@@ -23,6 +23,21 @@
 		"sort-by-number": true
 	},
 
+	"sway/workspaces#full": {
+		"disable-scroll": true,
+		"persistent-workspaces": {
+			"1": [],
+			"2": [],
+			"3": [],
+			"4": [],
+			"5": [],
+			"6": [],
+			"7": [],
+			"8": [],
+			"9": []
+		}
+	},
+
 	"sway/scratchpad": {
 		"format": "#{count}",
 		"show-empty": false,
@@ -138,7 +153,7 @@
 	"network": {
 		"format": "{ifname}",
 		"format-disabled": "󰖪",
-		"format-wifi": "Online  ",
+		"format-wifi": "{essid}  ",
 		"format-ethernet": "{ipaddr}/{cidr}  ",
 		"format-disconnected": "offline 󰤮",
 		"tooltip-format": "{ifname} via {gwaddr} 󰊗 ",
diff --git a/power_menu.xml b/modules/power_menu.xml
index 8b3ac50..8b3ac50 100644
--- a/power_menu.xml
+++ b/modules/power_menu.xml
diff --git a/style.css b/style.css
index 5bd6e07..75c4c1f 100644..120000
--- a/style.css
+++ b/style.css
@@ -1,104 +1 @@
-/* GTK Colours */
-@define-color fg #eee;
-@define-color mg #888;
-@define-color bg #000;
-
-* {
-	font-family: "Hack Nerd Font", monospace;
-	font-size: 12px;
-	font-weight: normal;
-	text-shadow: none;
-	box-shadow: none;
-	transition-property: background;
-	transition-duration: .5s;
-}
-
-/* Colours */
-/* #clock { color: lightblue; } */
-/* #clock.calendar { color: pink; }*/
-/* #wireplumber { color: #f1c40f; }*/
-/* #battery { color: mediumpurple; }*/
-/* #network.linked{ color: seagreen; }*/
-/* #network.disconnected{ color: red; }*/
-/* #bluetooth { color: royalblue; }*/
-
-/* Bar */
-window#waybar {
-	color: @fg;
-	background: black;
-	border-bottom: 1px solid #444
-
-	/*
-	background: transparent;
-	border: none;
-	*/
-}
-
-window#waybar.hidded {
-	opacity: 0.0;
-}
-
-/* Labels */
-label.module {
-	padding: 4px 10px 2px 10px;
-}
-
-label:hover {
-	color: white;
-}
-
-/* Tray */
-#tray {
-	background: @bg;
-	border: 1px solid @fg;
-	border-radius: 5px;
-	padding: 0 8px;
-}
-
-/* MENU */
-#custom-menu {
-	padding:0 18px 0 14px;
-}
-
-#custom-menu:hover {
-	background: @fg;
-	color: @bg;
-}
-
-/* TASKBAR */
-/*
-#taskbar button {
-	color: @mg;
-	padding: 4px 10px 4px 10px;
-	border-radius: 0;
-}
-#taskbar button:hover {
-	color: @bg;
-	background: @fg;
-}
-*/
-
-/* WORKSPACES & TASKBAR*/
-#workspaces button,
-#taskbar button {
-	color: @mg;
-	padding: 4px 10px 2px 10px;
-	border-radius: 0;
-	border:none;
-}
-
-#workspaces button:hover,
-#workspaces button.focused:hover,
-#taskbar button:hover {
-	color: @bg;
-	background: @fg;
-}
-
-#workspaces button.focused {
-	color: @fg;
-}
-
-#workspaces button.urgent {
-	color: red;
-}
-
+themes/dark/style.css
\ No newline at end of file
diff --git a/themes/dark/config.jsonc b/themes/dark/config.jsonc
new file mode 100644
index 0000000..ce8ed92
--- /dev/null
+++ b/themes/dark/config.jsonc
@@ -0,0 +1,24 @@
+{
+	"output": ["DP-1", "eDP-1"],
+	"position": "top",
+	"include": ["~/.config/waybar/modules/modules.jsonc"],
+	"reload_style_on_change": true,
+
+	"modules-left": [
+		"custom/apps",
+		"sway/workspaces"
+	],
+
+	"modules-right": [
+		"cpu",
+		"memory",
+		"backlight",
+		"battery",
+		"bluetooth",
+		"network",
+		"wireplumber",
+		"clock#calendar",
+		"clock",
+		"tray"
+	]
+}
diff --git a/themes/dark/style.css b/themes/dark/style.css
new file mode 100644
index 0000000..c3f875f
--- /dev/null
+++ b/themes/dark/style.css
@@ -0,0 +1,105 @@
+/* GTK Colours */
+@define-color fg #eee;
+@define-color mg #444;
+@define-color bg #000;
+
+* {
+	font-family: "Hack Nerd Font", monospace;
+	font-size: 9pt;
+	font-weight: normal;
+	text-shadow: none;
+	box-shadow: none;
+	transition-property: background;
+	transition-duration: .5s;
+}
+
+/* Colours */
+/* #clock { color: lightblue; } */
+/* #clock.calendar { color: pink; }*/
+/* #wireplumber { color: #f1c40f; }*/
+/* #battery { color: mediumpurple; }*/
+/* #network.linked{ color: seagreen; }*/
+/* #network.disconnected{ color: red; }*/
+/* #bluetooth { color: royalblue; }*/
+
+/* Bar */
+window#waybar {
+	color: @fg;
+	background: @bg;
+	border-bottom: 1px solid @mg;
+}
+
+window#waybar.hidded {
+	opacity: 0.0;
+}
+
+/* Labels */
+label.module {
+	padding: 0 8px;
+}
+
+label:hover {
+	color: white;
+}
+
+/* Tray */
+#tray {
+	background: @bg;
+	border: 1px solid @fg;
+	border-radius: 5px;
+	padding: 0 8px;
+}
+
+/* MENU */
+#custom-menu,
+#custom-apps {
+	padding:0 13px 0 10px;
+}
+
+#custom-menu:hover,
+#custom-apps:hover {
+	background: @fg;
+	color: @bg;
+}
+
+/* TASKBAR */
+/*
+#taskbar button {
+	color: @mg;
+	padding: 4px 10px 4px 10px;
+	border-radius: 0;
+}
+#taskbar button:hover {
+	color: @bg;
+	background: @fg;
+}
+*/
+
+/* WORKSPACES & TASKBAR*/
+#workspaces button,
+#taskbar button {
+	color: @mg;
+	padding: 0 6px;
+	border-radius: 0;
+	border:none;
+}
+
+#workspaces button:hover,
+#workspaces button.focused:hover,
+#taskbar button:hover {
+	color: @bg;
+	background: @fg;
+}
+
+#workspaces button.focused {
+	color: @fg;
+	background: @mg;
+	border-left: 1px solid @mg;
+	border-right: 1px solid @mg;
+	border-top: 1px solid @mg;
+}
+
+#workspaces button.urgent {
+	color: red;
+}
+
diff --git a/themes/dwm/config.jsonc b/themes/dwm/config.jsonc
new file mode 100644
index 0000000..961196a
--- /dev/null
+++ b/themes/dwm/config.jsonc
@@ -0,0 +1,19 @@
+{
+	"output": ["DP-1", "eDP-1"],
+	"position": "top",
+	"reload_style_on_change": true,
+	"include": [ "~/.config/waybar/modules/modules/modules.jsonc" ],
+	"modules-left": [ "sway/workspaces#full" ],
+	"modules-right": [
+		"cpu",
+		"memory",
+		"backlight",
+		"battery",
+		"bluetooth",
+		"network",
+		"wireplumber",
+		"clock#calendar",
+		"clock",
+		"tray"
+	]
+}
diff --git a/themes/dwm/style.css b/themes/dwm/style.css
new file mode 100644
index 0000000..dc6f08c
--- /dev/null
+++ b/themes/dwm/style.css
@@ -0,0 +1,52 @@
+/* GTK Colours */
+@define-color blu #224488;
+@define-color gry #6e6e6e;
+@define-color blk #101010;
+@define-color wht #b9c4d9;
+
+/* GLOBAL */
+* {
+	font-family: "Terminess Nerd Font", monospace;
+	font-size: 10pt;
+	padding: 0;
+	margin: 0;
+	box-shadow: none;
+}
+
+label {
+	padding: 0 10px;
+}
+
+label.module {
+	background: @blk;
+	color: @gry;
+}
+
+button {
+	border: none;
+	border-radius: 0;
+}
+
+/* BAR */
+#waybar {
+	background: @blu;
+}
+
+/* WORKSPACE */
+/* active */
+#workspaces button {
+	background: @blk;
+	color: @wht;
+}
+/* empty */
+#workspaces button.empty {
+	color: @gry;
+	background: @blk;
+	border: none;
+}
+/* focused */
+#workspaces button.focused {
+	background: @blu;
+	color: @wht;
+}
+