From efbd44ca4b367c17ebd95fdfd3ecd408dd8f72b7 Mon Sep 17 00:00:00 2001
From: Jaci Anderson <jaci.s.anderson@gmail.com>
Date: Sat, 27 Jan 2024 12:34:48 -0700
Subject: [PATCH] Update jaci config, working labwc
---
jaci/dotfiles/colors.txt | 24 ++++
jaci/dotfiles/labwc/autostart | 3 +
jaci/dotfiles/labwc/menu.xml | 8 +-
jaci/dotfiles/labwc/rc.xml | 8 +-
jaci/dotfiles/labwc/themerc-override | 29 +++--
jaci/dotfiles/waybar/config | 162 +++-----------------------
jaci/dotfiles/waybar/style.css | 98 ++++++++++++++++
jaci/modules/home-manager/home.nix | 2 +-
jaci/modules/labwc/labwc_conf.nix | 2 +-
nate/modules/apps/firefox/firefox.nix | 2 +-
10 files changed, 170 insertions(+), 168 deletions(-)
create mode 100644 jaci/dotfiles/colors.txt
create mode 100644 jaci/dotfiles/waybar/style.css
diff --git a/jaci/dotfiles/colors.txt b/jaci/dotfiles/colors.txt
new file mode 100644
index 0000000..8552c00
--- /dev/null
+++ b/jaci/dotfiles/colors.txt
@@ -0,0 +1,24 @@
+# Colors
+Celadon - #B0F2B4
+Celeste - #BAF2E9
+Thistle - #DFC2F2
+English Violet - #51344D
+Indian Red - #C97064
+Black Olive - #1F271B - Black, Font
+Egg Shell - #F8F1DD - White, Font
+
+## Coolors Link
+
+[here](https://coolors.co/b0f2b4-dfc2f2-baf2e9-51344d-c97064)
+
+## CSS
+
+```css
+@define-color celadon #b0f2b4
+@define-color celeste #baf2e9
+@define-color thistle #dfc2f2
+@define-color english_violet #51344d
+@define-color indian_red #c97064
+@define-color black_olive #1f271b
+@define-color egg_shell #f8f1dd
+```
diff --git a/jaci/dotfiles/labwc/autostart b/jaci/dotfiles/labwc/autostart
index 6aa46a4..10a349b 100644
--- a/jaci/dotfiles/labwc/autostart
+++ b/jaci/dotfiles/labwc/autostart
@@ -20,3 +20,6 @@ waybar >/dev/null 2>&1 &
# through the org.freedesktop.Notifications D-Bus API and require a client such
# as mako to function correctly. Thunderbird is an example of this.
mako >/dev/null 2>&1 &
+
+# Setup network applet
+nm-applet --indicator >/dev/null 2>&1 &
diff --git a/jaci/dotfiles/labwc/menu.xml b/jaci/dotfiles/labwc/menu.xml
index 55a107a..d10afdf 100644
--- a/jaci/dotfiles/labwc/menu.xml
+++ b/jaci/dotfiles/labwc/menu.xml
@@ -47,16 +47,20 @@
<item label="Web browser">
<action name="Execute" command="firefox" />
</item>
+ <item label="Steam">
+ <action name="Execute" command="steam" />
+ </item>
<item label="Terminal">
<action name="Execute" command="foot" />
</item>
+ <separator />
<item label="Reconfigure">
<action name="Reconfigure" />
</item>
- <item label="Exit">
+ <item label="Logout">
<action name="Exit" />
</item>
- <item label="Poweroff">
+ <item label="Power Off">
<action name="Execute" command="systemctl -i poweroff" />
</item>
</menu>
diff --git a/jaci/dotfiles/labwc/rc.xml b/jaci/dotfiles/labwc/rc.xml
index e43c171..77e4928 100644
--- a/jaci/dotfiles/labwc/rc.xml
+++ b/jaci/dotfiles/labwc/rc.xml
@@ -27,10 +27,10 @@
<cornerRadius>16</cornerRadius>
<keepBorder>yes</keepBorder>
<font>
- <name>GohuFont</name>
- <size>10</size>
+ <name>GohuFont 14 Nerd Font</name>
+ <size>14</size>
<slant>normal</slant>
- <weight>normal</weight>
+ <weight>bold</weight>
</font>
<!--<font place="ActiveWindow">
@@ -81,7 +81,7 @@
<resize popupShow="Never" />
<focus>
- <followMouse>no</followMouse>
+ <followMouse>yes</followMouse>
<followMouseRequiresMovement>yes</followMouseRequiresMovement>
<raiseOnFocus>no</raiseOnFocus>
</focus>
diff --git a/jaci/dotfiles/labwc/themerc-override b/jaci/dotfiles/labwc/themerc-override
index ee474cc..f56ab4c 100644
--- a/jaci/dotfiles/labwc/themerc-override
+++ b/jaci/dotfiles/labwc/themerc-override
@@ -1,4 +1,3 @@
-
# This file contains all themerc options with default values
#
# System-wide and local themes can be overridden by creating a copy of this
@@ -7,7 +6,7 @@
# make sure all other lines are commented out or deleted.
# general
-border.width: 10
+border.width: 3
padding.height: 3
# The following options has no default, but fallbacks back to
@@ -15,14 +14,14 @@ padding.height: 3
# titlebar.height:
# window border
-window.active.border.color: #e1dedb
+window.active.border.color: #ffe6f2
window.inactive.border.color: #f6f5f4
# ToggleKeybinds status indicator
window.active.indicator.toggled-keybind.color: #ff0000
# window titlebar background
-window.active.title.bg.color: #e1dedb
+window.active.title.bg.color: #ffe6f2
window.inactive.title.bg.color: #f6f5f4
# window titlebar text
@@ -44,22 +43,22 @@ menu.overlap.x: 0
menu.overlap.y: 0
menu.width.min: 20
menu.width.max: 200
-menu.items.bg.color: #fcfbfa
-menu.items.text.color: #000000
-menu.items.active.bg.color: #e1dedb
-menu.items.active.text.color: #000000
-menu.items.padding.x: 7
-menu.items.padding.y: 4
+menu.items.bg.color: #ffe6f2
+menu.items.text.color: #330066
+menu.items.active.bg.color: #ffffcc
+menu.items.active.text.color: #330066
+menu.items.padding.x: 12
+menu.items.padding.y: 6
menu.separator.width: 1
menu.separator.padding.width: 6
menu.separator.padding.height: 3
-menu.separator.color: #888888
+menu.separator.color: #8c1aff
# on screen display (window-cycle dialog)
-osd.bg.color: #dddda6
-osd.border.color: #000000
-osd.border.width: 1
-osd.label.text.color: #000000
+osd.bg.color: #ffe6f2
+osd.border.color: #ffffcc
+osd.border.width: 3
+osd.label.text.color: #330066
osd.window-switcher.width: 600
osd.window-switcher.padding: 4
diff --git a/jaci/dotfiles/waybar/config b/jaci/dotfiles/waybar/config
index 9ec8de2..c9eebcb 100644
--- a/jaci/dotfiles/waybar/config
+++ b/jaci/dotfiles/waybar/config
@@ -1,23 +1,24 @@
{
- "modules-left": ["wlr/taskbar"],
- "modules-center": [],
+ "modules-left": [
+ "wlr/taskbar"
+ ],
+ "modules-center": [
+ "clock",
+ ],
"modules-right": [
- "network",
"idle_inhibitor",
- "memory",
- "cpu",
"pulseaudio",
"custom/spotify",
- "clock",
+ "network",
+ "memory",
+ "cpu",
"custom/power",
],
// Modules
- "wlr/taskbar": {
- "format": "{app_id}",
+ "wlr/taskbar": {
+ "format": "{icon} {name}",
"on-click": "minimize-raise",
- },
-
-
+ },
"idle_inhibitor": {
"format": "{icon} ",
"format-icons":{
@@ -25,103 +26,29 @@
"deactivated": ""
}
},
-
- "battery": {
- "states": {
- // "good": 95,
- "warning": 30,
- "critical": 15
- },
- "format": "{capacity}% {icon}",
- "format-charging": "{capacity}% ",
- "format-plugged": "{capacity}% ",
- // "format-good": "", // An empty format will hide the module
- // "format-full": "",
- "format-icons": ["", "", "", "", ""]
- },
-
- "custom/PBPbattery": {
- "exec": "~/.config/waybar/scripts/PBPbattery.sh",
- "format": "{}",
- },
-
"clock": {
"interval": 10,
- "format-alt": " {:%e %b %Y}", // Icon: calendar-alt
- "format": "{:%I:%M %p}",
- "tooltip-format": "{:%e %B %Y}"
+ "format-alt": " {:%e %b %Y}", // Icon: calendar-alt
+ "format": " {:%I:%M %p}",
},
-
"cpu": {
"interval": 5,
- "format": " {usage}% ({load})", // Icon: microchip
+ "format": " {usage}%",
"states": {
"warning": 70,
"critical": 90,
},
- "on-click": "xfce4-terminal -e 'htop'",
+ "on-click": "foot -e 'htop'",
},
-
- "custom/keyboard-layout": {
- "exec": "swaymsg -t get_inputs | grep -m1 'xkb_active_layout_name' | cut -d '\"' -f4",
- // Interval set only as a fallback, as the value is updated by signal
- "interval": 30,
- "format": " {}", // Icon: keyboard
- // Signal sent by Sway key binding (~/.config/sway/key-bindings)
- "signal": 1, // SIGHUP
- "tooltip": false,
- "on-click": "~/.config/waybar/scripts/keyboard_layout.sh",
- },
-
"memory": {
"interval": 5,
"format": " {}%", // Icon: memory
- "on-click": "xfce4-terminal -e 'htop'",
+ "on-click": "foot -e 'htop'",
"states": {
"warning": 70,
"critical": 90
}
},
-
- "network": {
- "interval": 5,
- "format-wifi": " {essid} ({signalStrength}%)", // Icon: wifi
- "format-ethernet": " {ifname}: {ipaddr}/{cidr}", // Icon: ethernet
- "format-disconnected": "⚠ Disconnected",
- "tooltip-format": "{ifname}: {ipaddr}",
- "on-click": "xfce4-terminal -e 'nmtui'",
- },
- "network#vpn": {
- "interface": "tun0",
- "format": " {essid} ({signalStrength}%)",
- "format-disconnected": "⚠ Disconnected",
- "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
- },
-
- "sway/mode": {
- "format": "{}",
- "tooltip": false
- },
-
- "sway/window": {
- "format": "{}",
- "max-length": 120
- },
-
- "sway/workspaces": {
- "disable-scroll": true,
- "disable-markup" : false,
- "all-outputs": true,
- "format": " {icon} ",
- //"format":"{icon}",
- "format-icons": {
- "1": "",
- "2": "",
- "3": "",
- "4": "",
- }
- },
-
"pulseaudio": {
"scroll-step": 1, // %, can be a float
"format": "{volume}% {icon}",
@@ -143,66 +70,13 @@
"on-scroll-up": "pactl set-sink-volume @DEFAULT_SINK@ +2%",
"on-scroll-down": "pactl set-sink-volume @DEFAULT_SINK@ -2%",
},
-
- // to use the weather module replace <your_location> with your city or town
- // note: do not use spaces: new york would be newyork
- "custom/weather": {
- "exec": "~/.config/waybar/scripts/weather.sh <your_location>",
- "return-type": "json",
- "interval": 600,
- },
-
"tray": {
"icon-size": 18,
"spacing":10,
},
-
- "backlight#icon": {
- "format": "{icon}",
- "format-icons": [""],
- "on-scroll-down": "brightnessctl -c backlight set 1%-",
- "on-scroll-up": "brightnessctl -c backlight set +1%"
- },
-
- "backlight#value" :{
- "format": "{percent}%",
- "on-scroll-down": "brightnessctl -c backlight set 1%-",
- "on-scroll-up": "brightnessctl -c backlight set +1%"
- },
-
- "custom/firefox": {
- "format": " ",
- "on-click": "exec firefox",
- "tooltip": false
- },
-
"custom/spotify": {
"format": " ",
- "on-click": "xfce4-terminal -e 'ncspot'",
+ "on-click": "spot",
"tooltip": false
},
-
- "custom/terminal": {
- "format": " ",
- "on-click": "exec xfce4-terminal",
- "tooltip": false
- },
-
- "custom/files": {
- "format": " ",
- "on-click": "exec thunar",
- "tooltip": false
- },
-
- "custom/launcher": {
- "format":" ",
- "on-click": "exec wofi -c ~/.config/wofi/config -I",
- "tooltip": false,
- },
-
- "custom/power": {
- "format":"⏻",
- "on-click": "exec ~/.config/waybar/scripts/power-menu.sh",
- "tooltip": false,
- },
}
diff --git a/jaci/dotfiles/waybar/style.css b/jaci/dotfiles/waybar/style.css
new file mode 100644
index 0000000..82e5601
--- /dev/null
+++ b/jaci/dotfiles/waybar/style.css
@@ -0,0 +1,98 @@
+@define-color celadon #b0f2b4;
+@define-color celeste #baf2e9;
+@define-color thistle #dfc2f2;
+@define-color english_violet #51344d;
+@define-color indian_red #c97064;
+@define-color black_olive #1f271b;
+@define-color egg_shell #f8f1dd;
+
+* {
+ border: none;
+ border-radius: 0;
+ margin: 0;
+ padding: 0;
+ color: @egg_shell;
+ font-family: "GohuFont 14 Nerd Font";
+ font-size: 16px;
+ font-weight: normal;
+}
+
+/* The whole bar */
+#waybar {
+ background: transparent;
+ background-color: transparent;
+}
+
+#taskbar {
+ background: transparent;
+ color: @egg_shell;
+}
+#taskbar button {
+ padding-left: 3px;
+ padding-right: 3px;
+ margin-left: 3px;
+ margin-right: 3px;
+ color: transparent;
+ border-bottom: 2px solid;
+}
+
+#taskbar button.active {
+ color: @celeste;
+}
+
+.modules-left,
+.modules-right,
+.modules-center {
+ margin: 8px 8px 1px 8px;
+ background: transparent;
+ color: @egg_shell;
+ background-color: @english_violet;
+ border-radius: 25px;
+ padding: 0px 10px 0px 10px;
+}
+/* Every modules */
+#clock,
+#cpu,
+#custom-spotify,
+#memory,
+#network,
+#pulseaudio,
+#taskbar {
+ padding:0.5rem 0.6rem;
+ margin: 1px 0px;
+}
+
+/* -----------------------------------------------------------------------------
+ * Modules styles
+ * -------------------------------------------------------------------------- */
+
+#clock {
+ min-width: 140px;
+}
+
+#cpu.warning,
+#cpu.critical,
+#memory.warning,
+#memory.critical,
+#network.disconnected {
+ color: @indian_red;
+}
+
+#pulseaudio {
+ padding-top:6px;
+}
+
+#pulseaudio.muted {
+ color: @celeste;
+}
+
+#custom-spotify {
+ color: @celadon;
+}
+
+#custom-power {
+ margin-left:15px;
+ margin-right:15px;
+ font-size:15px;
+ color: @indian_red;
+}
diff --git a/jaci/modules/home-manager/home.nix b/jaci/modules/home-manager/home.nix
index 362fe58..f8e350a 100644
--- a/jaci/modules/home-manager/home.nix
+++ b/jaci/modules/home-manager/home.nix
@@ -192,7 +192,7 @@
cursorTheme.package = pkgs.catppuccin-cursors;
cursorTheme.name = "latteFlamingo";
theme = {
- name = "Catppuccin-Latte-Pink";
+ name = "Catppuccin-Latte-Standard-Pink-Light";
package = pkgs.catppuccin-gtk.override {
accents = [ "pink" ];
tweaks = [ ];
diff --git a/jaci/modules/labwc/labwc_conf.nix b/jaci/modules/labwc/labwc_conf.nix
index 0a790f3..8f8b007 100644
--- a/jaci/modules/labwc/labwc_conf.nix
+++ b/jaci/modules/labwc/labwc_conf.nix
@@ -67,7 +67,7 @@
libnotify
kanshi
mako
- ncspot
+ spot
networkmanagerapplet
nwg-dock
nwg-drawer
diff --git a/nate/modules/apps/firefox/firefox.nix b/nate/modules/apps/firefox/firefox.nix
index 27a813a..eb422b5 100644
--- a/nate/modules/apps/firefox/firefox.nix
+++ b/nate/modules/apps/firefox/firefox.nix
@@ -37,7 +37,7 @@ in
};
settings = {
"browser.startup.blankWindow" = true;
- "browser.startup.homepage" = "about:blank";
+ "browser.startup.homepage" = "https://www.startpage.com/do/mypage.pl?prfe=11898a1adf7b7dfb587580692f358773a11ca25e993b8e077476641cec033319e15f2449c345f5be919fd0a082015c3e4ed23143bd4337512466c04c2999831a54abca2eaeb42963c63ff064";
"browser.newtabpage.enabled" = false;
"browser.search.region" = "US";
"browser.search.isUS" = true;