diff --git a/users/modules/eww/default.nix b/users/modules/eww/default.nix index 21835bf..f07b009 100644 --- a/users/modules/eww/default.nix +++ b/users/modules/eww/default.nix @@ -25,6 +25,9 @@ upower wget wireplumber + # fonts + material-icons + material-design-icons ]; programs.eww = { diff --git a/users/modules/eww/eww.scss b/users/modules/eww/eww.scss index c04cbce..a21d505 100644 --- a/users/modules/eww/eww.scss +++ b/users/modules/eww/eww.scss @@ -12,7 +12,7 @@ * { all: unset; - font-family: Roboto; + font-family: Comic Mono; font-size: 1.3rem; } diff --git a/users/modules/eww/modules/net.yuck b/users/modules/eww/modules/net.yuck index f100ca8..d47dee0 100644 --- a/users/modules/eww/modules/net.yuck +++ b/users/modules/eww/modules/net.yuck @@ -14,6 +14,5 @@ :text {net.essid})) (button :class "module-net module" - :onclick "networkmanager_dmenu" :style "color: ${net.color};" {net.icon})))) diff --git a/users/modules/eww/scripts/battery b/users/modules/eww/scripts/battery index 7783377..e48c773 100755 --- a/users/modules/eww/scripts/battery +++ b/users/modules/eww/scripts/battery @@ -48,5 +48,5 @@ while true; do STATE=$(cat /sys/class/power_supply/BAT0/status) echo '{ "percentage": '"$CAPACITY"', "wattage": "'"$(wattage)"'", "status": "'"$(status)"'", "color": "'"$(color)"'" }' - sleep 3 + sleep 60 done \ No newline at end of file diff --git a/users/modules/eww/scripts/bluetooth b/users/modules/eww/scripts/bluetooth index 3f6e0c0..89e7e7b 100755 --- a/users/modules/eww/scripts/bluetooth +++ b/users/modules/eww/scripts/bluetooth @@ -31,5 +31,5 @@ while true; do echo '{ "icon": "'"$icon"'", "text": "'"$text"'", "color": "'"$color"'" }' - sleep 3 + sleep 10 done diff --git a/users/modules/eww/scripts/memory b/users/modules/eww/scripts/memory index 749fc4a..7da8446 100755 --- a/users/modules/eww/scripts/memory +++ b/users/modules/eww/scripts/memory @@ -16,5 +16,5 @@ while true; do echo '{ "total": "'"$total"'", "used": "'"$used"'", "free": "'"$free"'", "percentage": '"$perc"' }' - sleep 3 + sleep 5 done diff --git a/users/modules/eww/scripts/net b/users/modules/eww/scripts/net index 530c0b4..050941e 100755 --- a/users/modules/eww/scripts/net +++ b/users/modules/eww/scripts/net @@ -1,9 +1,11 @@ #!/usr/bin/env bash while true; do - status=$(nmcli g | tail -n 1 | awk '{print $1}') - signal=$(nmcli dev wifi | rg "\*" | awk '{ print $8 }') - essid=$(nmcli -t -f NAME connection show --active | head -n1) + info="$(iwctl station wlan0 show)" + status=$(echo "$info" | awk 'FNR == 6 {print $2}') + _signal=$(echo "$info" | awk 'FNR == 13 {print $2}') + signal=${_signal#"-"} + essid=$(echo "$info" | awk 'FNR == 7 {print $3}') icons=("󰤯" "󰤟" "󰤢" "󰤥" "󰤨") @@ -12,7 +14,7 @@ while true; do text="" color="#988ba2" else - level=$(awk -v n="$signal" 'BEGIN{print int(n/20)}') + level=$(awk -v n="$signal" 'BEGIN{print int(n/15)}') if [ "$level" -gt 4 ]; then level=4 fi @@ -23,5 +25,5 @@ while true; do echo '{ "essid": "'"$essid"'", "icon": "'"$icon"'", "color": "'"$color"'" }' - sleep 3 + sleep 10 done \ No newline at end of file diff --git a/users/patriot/default.nix b/users/patriot/default.nix index 06903eb..f217bfe 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -54,6 +54,7 @@ in { kdeconnect.enable = true; # gnome stuffs seahorse.enable = true; + dconf.enable = true; }; services = { syncthing.folders = { @@ -153,6 +154,35 @@ in { size = 13; package = pkgs.comic-mono; }; + + home.pointerCursor = { + package = pkgs.quintom-cursor-theme; + name = "Quintom_Ink"; + size = 24; + gtk.enable = true; + x11.enable = true; + }; + + gtk = { + enable = true; + + font = { + inherit (config.settings.font) name package; + }; + + gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; + + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.papirus-icon-theme; + }; + + theme = { + name = "Catppuccin-Orange-Dark-Compact"; + package = pkgs.catppuccin-gtk.override {size = "compact";}; + }; + }; + home = { homeDirectory = nixosConfig.users.users.patriot.home; packages = with pkgs; [