From 57936b7890d0919ed5b2ae98cd43edecb67df4cc Mon Sep 17 00:00:00 2001 From: Jaci Anderson Date: Sat, 20 Jan 2024 20:00:22 -0700 Subject: [PATCH 1/2] Had to add dconf without sway config, added labwc config files and waybar --- jaci/dotfiles/kanshi/config | 3 + jaci/dotfiles/labwc/.paper-config/autostart | 29 - jaci/dotfiles/labwc/.paper-config/bullet.xbm | 5 - jaci/dotfiles/labwc/.paper-config/close.xbm | 5 - jaci/dotfiles/labwc/.paper-config/desk.xbm | 5 - .../labwc/.paper-config/desk_toggled.xbm | 5 - jaci/dotfiles/labwc/.paper-config/iconify.xbm | 5 - jaci/dotfiles/labwc/.paper-config/max.xbm | 5 - .../labwc/.paper-config/max_disabled.xbm | 5 - .../labwc/.paper-config/max_toggled.xbm | 5 - jaci/dotfiles/labwc/.paper-config/menu.xml | 52 -- jaci/dotfiles/labwc/.paper-config/rc.xml | 774 ------------------ jaci/dotfiles/labwc/.paper-config/shade.xbm | 5 - .../labwc/.paper-config/shade_toggled.xbm | 5 - jaci/dotfiles/labwc/.paper-config/themerc | 70 -- jaci/dotfiles/labwc/autostart | 2 +- jaci/dotfiles/labwc/rc.xml | 18 +- jaci/dotfiles/labwc/themerc-override | 71 ++ jaci/dotfiles/waybar/config | 208 +++++ jaci/modules/apps/firefox/firefox.nix | 2 +- jaci/modules/home-manager/home.nix | 2 +- jaci/modules/labwc/labwc_conf.nix | 8 +- 22 files changed, 299 insertions(+), 990 deletions(-) create mode 100644 jaci/dotfiles/kanshi/config delete mode 100644 jaci/dotfiles/labwc/.paper-config/autostart delete mode 100644 jaci/dotfiles/labwc/.paper-config/bullet.xbm delete mode 100644 jaci/dotfiles/labwc/.paper-config/close.xbm delete mode 100644 jaci/dotfiles/labwc/.paper-config/desk.xbm delete mode 100644 jaci/dotfiles/labwc/.paper-config/desk_toggled.xbm delete mode 100644 jaci/dotfiles/labwc/.paper-config/iconify.xbm delete mode 100644 jaci/dotfiles/labwc/.paper-config/max.xbm delete mode 100644 jaci/dotfiles/labwc/.paper-config/max_disabled.xbm delete mode 100644 jaci/dotfiles/labwc/.paper-config/max_toggled.xbm delete mode 100644 jaci/dotfiles/labwc/.paper-config/menu.xml delete mode 100644 jaci/dotfiles/labwc/.paper-config/rc.xml delete mode 100644 jaci/dotfiles/labwc/.paper-config/shade.xbm delete mode 100644 jaci/dotfiles/labwc/.paper-config/shade_toggled.xbm delete mode 100644 jaci/dotfiles/labwc/.paper-config/themerc create mode 100644 jaci/dotfiles/labwc/themerc-override create mode 100644 jaci/dotfiles/waybar/config diff --git a/jaci/dotfiles/kanshi/config b/jaci/dotfiles/kanshi/config new file mode 100644 index 0000000..980fdff --- /dev/null +++ b/jaci/dotfiles/kanshi/config @@ -0,0 +1,3 @@ +profile { + output HDMI-A-1 position 0,0 mode 1920x1080@143.998001Hz +} diff --git a/jaci/dotfiles/labwc/.paper-config/autostart b/jaci/dotfiles/labwc/.paper-config/autostart deleted file mode 100644 index 023e367..0000000 --- a/jaci/dotfiles/labwc/.paper-config/autostart +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/dash - -# Autostart Apps -xset +fp ~/.fonts/misc/ -xset b off -xset r rate 250 25 -xbacklight -set 5 -/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 & -pcmanfm -d & -compton -b -hsetroot -tile ~/.wallpaper.png -xsettingsd & -dunst -geometry "300x60-28+56" & - -# Touchpad settings -synclient \ -VertEdgeScroll=0 HorizEdgeScroll=0 \ -VertTwoFingerScroll=1 HorizTwoFingerScroll=1 \ -VertScrollDelta=320 HorizScrollDelta=320 \ -MinSpeed=0.05 MaxSpeed=1.2 \ -AccelFactor=0.04 CoastingSpeed=10 \ -TapButton1=0 TapButton2=0 TapButton3=0 - -# Panel -panel & -trayer \ ---align right --widthtype request --heighttype pixel --height 28 \ ---transparent true --alpha 255 & - diff --git a/jaci/dotfiles/labwc/.paper-config/bullet.xbm b/jaci/dotfiles/labwc/.paper-config/bullet.xbm deleted file mode 100644 index 79432ba..0000000 --- a/jaci/dotfiles/labwc/.paper-config/bullet.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define bullet_width 9 -#define bullet_height 9 -static unsigned char bullet_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x20, 0x00, 0x40, 0x00, 0x20, 0x00, - 0x10, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/jaci/dotfiles/labwc/.paper-config/close.xbm b/jaci/dotfiles/labwc/.paper-config/close.xbm deleted file mode 100644 index 6677987..0000000 --- a/jaci/dotfiles/labwc/.paper-config/close.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define close_width 12 -#define close_height 12 -static unsigned char close_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x01, 0x90, 0x00, 0x60, 0x00, - 0x60, 0x00, 0x90, 0x00, 0x08, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/jaci/dotfiles/labwc/.paper-config/desk.xbm b/jaci/dotfiles/labwc/.paper-config/desk.xbm deleted file mode 100644 index a9498e4..0000000 --- a/jaci/dotfiles/labwc/.paper-config/desk.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define desk_width 12 -#define desk_height 12 -static unsigned char desk_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x01, 0x98, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x98, 0x01, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/jaci/dotfiles/labwc/.paper-config/desk_toggled.xbm b/jaci/dotfiles/labwc/.paper-config/desk_toggled.xbm deleted file mode 100644 index 02ada31..0000000 --- a/jaci/dotfiles/labwc/.paper-config/desk_toggled.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define desk_toggled_width 12 -#define desk_toggled_height 12 -static unsigned char desk_toggled_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x01, 0x98, 0x01, 0x60, 0x00, - 0x60, 0x00, 0x98, 0x01, 0x98, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/jaci/dotfiles/labwc/.paper-config/iconify.xbm b/jaci/dotfiles/labwc/.paper-config/iconify.xbm deleted file mode 100644 index 8689c16..0000000 --- a/jaci/dotfiles/labwc/.paper-config/iconify.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define iconify_width 12 -#define iconify_height 12 -static unsigned char iconify_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/jaci/dotfiles/labwc/.paper-config/max.xbm b/jaci/dotfiles/labwc/.paper-config/max.xbm deleted file mode 100644 index d7e925e..0000000 --- a/jaci/dotfiles/labwc/.paper-config/max.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define max_width 12 -#define max_height 12 -static unsigned char max_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x80, 0x01, 0x40, 0x01, - 0x28, 0x00, 0x18, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/jaci/dotfiles/labwc/.paper-config/max_disabled.xbm b/jaci/dotfiles/labwc/.paper-config/max_disabled.xbm deleted file mode 100644 index 4ff5bce..0000000 --- a/jaci/dotfiles/labwc/.paper-config/max_disabled.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define max_disabled_width 12 -#define max_disabled_height 12 -static unsigned char max_disabled_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x80, 0x01, 0x40, 0x01, - 0x28, 0x00, 0x18, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/jaci/dotfiles/labwc/.paper-config/max_toggled.xbm b/jaci/dotfiles/labwc/.paper-config/max_toggled.xbm deleted file mode 100644 index 272bba8..0000000 --- a/jaci/dotfiles/labwc/.paper-config/max_toggled.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define max_toggled_width 12 -#define max_toggled_height 12 -static unsigned char max_toggled_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x01, 0x80, 0x01, 0x40, 0x01, - 0x28, 0x00, 0x18, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/jaci/dotfiles/labwc/.paper-config/menu.xml b/jaci/dotfiles/labwc/.paper-config/menu.xml deleted file mode 100644 index deeef9b..0000000 --- a/jaci/dotfiles/labwc/.paper-config/menu.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - x-terminal-emulator - - - - - x-www-browser - - - - - - - - - obconf - - - - - - - - - - - - - systemctl suspend - - - - - systemctl reboot - - - - - systemctl poweroff - - - - - diff --git a/jaci/dotfiles/labwc/.paper-config/rc.xml b/jaci/dotfiles/labwc/.paper-config/rc.xml deleted file mode 100644 index 668eda0..0000000 --- a/jaci/dotfiles/labwc/.paper-config/rc.xml +++ /dev/null @@ -1,774 +0,0 @@ - - - - 10 - 20 - - - yes - - no - - yes - - no - - 200 - - no - - - - Smart - -
yes
- - Primary - - 1 - - - - Adiantum - CLM - - yes - yes - - cinnamonroll - 8 - - Normal - - Normal - - - - cinnamonroll - 8 - - Normal - - Normal - - - - cinnamonroll - 8 - - Normal - - Normal - - - - cinnamonroll - 8 - - Normal - - Normal - - - - cinnamonroll - 8 - - Normal - - Normal - - - - cinnamonroll - 8 - - Normal - - Normal - - - - - - 4 - 1 - - 1 - 2 - 3 - 4 - - 1000 - - - - yes - Nonpixel - - Center - - - - 10 - - 10 - - - - - - 48 - 16 - 16 - 16 - - - TopLeft - - 0 - 0 - no - Above - - Vertical - - no - 300 - - 300 - - Middle - - - - C-g - - - - left - no - - - - - right - no - - - - - - left - no - - - - - right - no - - - - - - 1 - - - - - 2 - - - - - 3 - - - - - 4 - - - - - - 1 - no - - - - - 2 - no - - - - - 3 - no - - - - - 4 - no - - - - - - - -0 - +0 - 50/100 - 100/100 - - - - - - +0 - +0 - 50/100 - 100/100 - - - - - - 75/100 - 75/100 - - - - - - - 50/100 - 50/100 - - - - - - - 75/100 - 75/100 - - - - - - - east - - - - - west - - - - - north - - - - - south - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - client-menu - - - - - - list - no - - - - - - - - - - list - no - - - - - - - - - - list - yes - yes - - - - - - - - - - list - yes - yes - - - - - - - - - - - right - no - - - - - left - no - - - - - up - no - - - - - down - no - - - - - - launch - - - - - client-list-combined-menu - - - - - root-menu - - - - - - x-terminal-emulator - - - - - x-www-browser - - - - - pcmanfm - - - - - geany - - - - - pavucontrol - - - - - - screeny - - - - - screeny -f - - - - - screeny -s - - - - - - mpc stop - - - - - mpc toggle - - - - - mpc prev - - - - - mpc next - - - - - xbacklight -dec 5 - - - - - xbacklight -inc 5 - - - - - - pulsevol --up - - - - - pulsevol --down - - - - - pulsevol --mute - - - - - - - - - - - - - - - 1 - - 500 - - 0 - - false - - - - - right - no - - - - - left - no - - - - - - - right - no - - - - - left - no - - - - - - - - - - - - - - - - - - no - - - - - - - - yes - - - - - - - - - - - - - - - - - client-menu - - - - - - - top - - - - - - - left - - - - - - - right - - - - - - - bottom - - - - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - client-menu - - - - - - - client-menu - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - root-menu - - - - - client-list-combined-menu - - - - - - menu.xml - 200 - - no - - 100 - - 400 - - no - - yes - - - diff --git a/jaci/dotfiles/labwc/.paper-config/shade.xbm b/jaci/dotfiles/labwc/.paper-config/shade.xbm deleted file mode 100644 index b24c8d3..0000000 --- a/jaci/dotfiles/labwc/.paper-config/shade.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define shade_width 12 -#define shade_height 12 -static unsigned char shade_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/jaci/dotfiles/labwc/.paper-config/shade_toggled.xbm b/jaci/dotfiles/labwc/.paper-config/shade_toggled.xbm deleted file mode 100644 index 6eed12e..0000000 --- a/jaci/dotfiles/labwc/.paper-config/shade_toggled.xbm +++ /dev/null @@ -1,5 +0,0 @@ -#define shade_toggled_width 12 -#define shade_toggled_height 12 -static unsigned char shade_toggled_bits[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; diff --git a/jaci/dotfiles/labwc/.paper-config/themerc b/jaci/dotfiles/labwc/.paper-config/themerc deleted file mode 100644 index e941218..0000000 --- a/jaci/dotfiles/labwc/.paper-config/themerc +++ /dev/null @@ -1,70 +0,0 @@ -!! Menu -menu.border.width: 8 -menu.border.color: #f9faf4 -menu.overlap.x: -10 -menu.title.bg: flat -menu.title.bg.color: #f9faf4 -menu.title.text.color: #947e7b -menu.title.text.justify: center -menu.items.bg: flat -menu.items.bg.color: #f9faf4 -menu.items.text.color: #947e7b -menu.items.active.bg: flat -menu.items.active.bg.color: #aecdad -menu.items.active.text.color: #526b6e -menu.items.disabled.text.color: #4d5066 -menu.items.justify: left -menu.separator.padding.height: 2 -menu.separator.color: #f9faf4 - -!! Titlebar -window.*.title.bg: flat -window.*.label.bg: parentrelative -window.active.title.bg.color: #e7e8eb -window.active.label.text.color: #70788d -window.inactive.title.bg.color: #e7e8eb -window.inactive.label.text.color: #d3d3d6 -window.label.text.justify: center - -!! Titlebar buttons -window.*.button.*.bg: parentrelative -window.*.button.*.pressed.bg: flat -window.active.button.*.image.color: #70788d -window.active.button.*.hover.image.color: #aecdad -window.active.button.*.pressed.bg.color: #aecdad -window.active.button.disabled.image.color: #d3d3d6 -window.inactive.button.*.image.color: #d3d3d6 -window.inactive.button.disabled.image.color: #d3d3d6 - -!! Borders -border.width: 0 -padding.width: 12 -padding.height: 8 -window.client.padding.width: 0 -window.client.padding.height: 0 -window.handle.width: 2 -window.active.border.color: #e7e8eb -window.active.client.color: #e7e8eb -window.active.handle.bg: flat -window.active.handle.bg.color: #e7e8eb -window.active.grip.bg: flat -window.active.grip.bg.color: #e7e8eb -window.inactive.grip.bg: flat -window.inactive.grip.bg.color: #e7e8eb -window.inactive.border.color: #e7e8eb -window.inactive.handle.bg: flat -window.inactive.handle.bg.color: #e7e8eb -window.inactive.client.color: #e7e8eb - -!! OSD -osd.border.width: 1 -osd.border.color: #e7e8eb -osd.label.text.color: #5c616c -osd.bg: flat -osd.bg.color: #e7e8eb -osd.label.bg: flat -osd.label.bg.color: #e7e8eb -osd.hilight.bg: flat -osd.hilight.bg.color: #aecdad -osd.unhilight.bg: flat solid -osd.unhilight.bg.color: #70788d diff --git a/jaci/dotfiles/labwc/autostart b/jaci/dotfiles/labwc/autostart index 72a9eb9..6aa46a4 100644 --- a/jaci/dotfiles/labwc/autostart +++ b/jaci/dotfiles/labwc/autostart @@ -11,7 +11,7 @@ swww img ~/.config/labwc/backgrounds/cat1.jpg >/dev/null 2>&1 & # output HDMI-A-1 position 1366,0 # output eDP-1 position 0,0 # } -# kanshi >/dev/null 2>&1 & +kanshi >/dev/null 2>&1 & # Launch a panel such as yambar or waybar. waybar >/dev/null 2>&1 & diff --git a/jaci/dotfiles/labwc/rc.xml b/jaci/dotfiles/labwc/rc.xml index 92f8b5a..e43c171 100644 --- a/jaci/dotfiles/labwc/rc.xml +++ b/jaci/dotfiles/labwc/rc.xml @@ -11,7 +11,7 @@ server 0 - fullscreen + yes yes no @@ -27,7 +27,7 @@ 16 yes - GohuFont Nerd Font + GohuFont 10 normal normal @@ -65,9 +65,9 @@ --> - - - + + @@ -164,16 +164,16 @@ on global - 25 - 600 + 40 + 400 - + - + diff --git a/jaci/dotfiles/labwc/themerc-override b/jaci/dotfiles/labwc/themerc-override new file mode 100644 index 0000000..ee474cc --- /dev/null +++ b/jaci/dotfiles/labwc/themerc-override @@ -0,0 +1,71 @@ + +# This file contains all themerc options with default values +# +# System-wide and local themes can be overridden by creating a copy of this +# file and renaming it to $HOME/.config/labwc/themerc-override. Be careful +# though - if you only want to override a small number of specific options, +# make sure all other lines are commented out or deleted. + +# general +border.width: 10 +padding.height: 3 + +# The following options has no default, but fallbacks back to +# font-height + 2x padding.height if not set. +# titlebar.height: + +# window border +window.active.border.color: #e1dedb +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.inactive.title.bg.color: #f6f5f4 + +# window titlebar text +window.active.label.text.color: #000000 +window.inactive.label.text.color: #000000 +window.label.text.justify: center + +# window buttons +window.active.button.unpressed.image.color: #000000 +window.inactive.button.unpressed.image.color: #000000 + +# Note that "menu", "iconify", "max", "close" buttons colors can be defined +# individually by inserting the type after the button node, for example: +# +# window.active.button.iconify.unpressed.image.color: #333333 + +# menu +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.separator.width: 1 +menu.separator.padding.width: 6 +menu.separator.padding.height: 3 +menu.separator.color: #888888 + +# on screen display (window-cycle dialog) +osd.bg.color: #dddda6 +osd.border.color: #000000 +osd.border.width: 1 +osd.label.text.color: #000000 + +osd.window-switcher.width: 600 +osd.window-switcher.padding: 4 +osd.window-switcher.item.padding.x: 10 +osd.window-switcher.item.padding.y: 1 +osd.window-switcher.item.active.border.width: 2 + +osd.workspace-switcher.boxes.width: 20 +osd.workspace-switcher.boxes.height: 20 diff --git a/jaci/dotfiles/waybar/config b/jaci/dotfiles/waybar/config new file mode 100644 index 0000000..9ec8de2 --- /dev/null +++ b/jaci/dotfiles/waybar/config @@ -0,0 +1,208 @@ +{ + "modules-left": ["wlr/taskbar"], + "modules-center": [], + "modules-right": [ + "network", + "idle_inhibitor", + "memory", + "cpu", + "pulseaudio", + "custom/spotify", + "clock", + "custom/power", + ], + // Modules + "wlr/taskbar": { + "format": "{app_id}", + "on-click": "minimize-raise", + }, + + + "idle_inhibitor": { + "format": "{icon} ", + "format-icons":{ + "activated": "", + "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}" + }, + + "cpu": { + "interval": 5, + "format": " {usage}% ({load})", // Icon: microchip + "states": { + "warning": 70, + "critical": 90, + }, + "on-click": "xfce4-terminal -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'", + "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}", + "format-bluetooth": "{volume}% {icon}  {format_source}", + "format-bluetooth-muted": " {icon}  {format_source}", + "format-muted": "婢 {format_source}", + "format-source": "{volume}% ", + "format-source-muted": "", + "format-icons": { + "headphone": "", + "hands-free": "וֹ", + "headset": "  ", + "phone": "", + "portable": "", + "car": "", + "default": [""] + }, + "on-click": "pavucontrol", + "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 with your city or town + // note: do not use spaces: new york would be newyork + "custom/weather": { + "exec": "~/.config/waybar/scripts/weather.sh ", + "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'", + "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/modules/apps/firefox/firefox.nix b/jaci/modules/apps/firefox/firefox.nix index 1b9dae5..a8134ff 100644 --- a/jaci/modules/apps/firefox/firefox.nix +++ b/jaci/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.search.region" = "US"; "browser.search.isUS" = true; "distribution.searchplugins.defaultLocale" = "en-US"; diff --git a/jaci/modules/home-manager/home.nix b/jaci/modules/home-manager/home.nix index 9ac7a5b..362fe58 100644 --- a/jaci/modules/home-manager/home.nix +++ b/jaci/modules/home-manager/home.nix @@ -96,7 +96,7 @@ obs-studio # Install fonts - (nerdfonts.override { fonts = [ "Hermit" "GohuFont" ]; }) + (nerdfonts.override { fonts = [ "Hermit" "Gohu" ]; }) # # You can also create simple shell scripts directly inside your # # configuration. For example, this adds a command 'my-hello' to your diff --git a/jaci/modules/labwc/labwc_conf.nix b/jaci/modules/labwc/labwc_conf.nix index bf92bad..0a790f3 100644 --- a/jaci/modules/labwc/labwc_conf.nix +++ b/jaci/modules/labwc/labwc_conf.nix @@ -24,7 +24,7 @@ ### config = lib.mkIf config.labwc.enable { - # programs.sway.enable = true; + programs.dconf.enable = true; nixpkgs.config.allowUnfree = config.labwc.useNonFree; # For R2ModMan @@ -65,9 +65,13 @@ ghostscript labwc libnotify + kanshi mako ncspot networkmanagerapplet + nwg-dock + nwg-drawer + nwg-look pavucontrol slurp swaylock @@ -76,10 +80,8 @@ wl-clipboard waybar wdisplays - wofi xdg-utils zsh - # Fonts ] config.labwc.systemPackages # (lib.mkIf config.labwc.installGaming [ From efbd44ca4b367c17ebd95fdfd3ecd408dd8f72b7 Mon Sep 17 00:00:00 2001 From: Jaci Anderson Date: Sat, 27 Jan 2024 12:34:48 -0700 Subject: [PATCH 2/2] 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 @@ + + + + - + - + 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 @@ 16 yes - GohuFont - 10 + GohuFont 14 Nerd Font + 14 normal - normal + bold