gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Restyle

Browse source
This commit is contained in:
kat witch 2021-12-21 22:09:59 +00:00 • committed by kat
parent a87ac0e008
commit c84b650fea
Signed by: kat
GPG key ID: 465E64DECEA8CF0F
4 changed files with 132 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/profiles/hardware/ryzen.nix
View file

@ -13,6 +13,7 @@
}; };
waybarExtend2 = { config, ... }: { waybarExtend2 = { config, ... }: {
config = { config = {
modules."temperature#icon".hwmon-path = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon2/temp2_input";
modules.temperature.hwmon-path = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon2/temp2_input"; modules.temperature.hwmon-path = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon2/temp2_input";
}; };
}; };

2
config/users/kat/sway/konawall.nix
View file

@ -10,7 +10,7 @@ with lib;
commonTags = [ "width:>=1600" ]; commonTags = [ "width:>=1600" ];
tagList = map (toList) [ tagList = map (toList) [
(["score:>=50" (["score:>=50"
"touhou"] ++ optional (nixos.networking.hostName == "koishi") "rating:s") "touhou" "rating:s"]) #++ optional (nixos.networking.hostName == "koishi") "rating:s")
]; ];
}; };
} }

97
config/users/kat/sway/waybar/default.nix
View file

@ -9,15 +9,35 @@
enable = true; enable = true;
systemd.enable = true; systemd.enable = true;
settings = [{ settings = [{
modules-center = [ "clock#s" "clock#arc" "clock#hex" "clock#miku" "clock" ]; modules-left = [
modules-left = [ "sway/workspaces" "sway/mode" "sway/window" ]; "sway/workspaces"
"sway/mode"
"sway/window#icon"
"sway/window"
];
modules-center = [
"custom/arc-h"
"clock#arc"
"custom/hex-h"
"clock#hex"
"custom/miku-h"
"clock#miku"
"clock#original"
];
modules-right = [ modules-right = [
"pulseaudio#icon"
"pulseaudio" "pulseaudio"
"custom/mail-icon"
"custom/mail" "custom/mail"
"custom/cpu-icon"
"cpu" "cpu"
"custom/memory-icon"
"memory" "memory"
"temperature#icon"
"temperature" "temperature"
"battery#icon"
"battery" "battery"
"backlight#icon"
"backlight" "backlight"
"network" "network"
"idle_inhibitor" "idle_inhibitor"
@ -27,10 +47,9 @@
]; ];
modules = { modules = {
"sway/workspaces" = { format = "{name}"; }; "sway/workspaces".format = "{name}";
"sway/window" = { "sway/window#icon".format = "";
format = " {}"; "sway/window".format = "{}";
};
tray = { tray = {
icon-size = 12; icon-size = 12;
spacing = 2; spacing = 2;
@ -54,18 +73,25 @@
on-click-right = "systemctl --user restart konawall"; on-click-right = "systemctl --user restart konawall";
signal = 8; signal = 8;
}; };
"custom/mail-icon".format = "";
"custom/mail" = { "custom/mail" = {
format = " {}"; format = "{}";
interval = 30; interval = 30;
exec = "${pkgs.notmuch-arc}/bin/notmuch count tag:flagged OR tag:inbox AND NOT tag:killed"; exec = "${pkgs.notmuch-arc}/bin/notmuch count tag:flagged OR tag:inbox AND NOT tag:killed";
}; };
cpu = { format = " {usage}%"; }; "custom/cpu-icon".format = "";
memory = { format = " {percentage}%"; }; cpu.format = "{usage}%";
temperature = { "custom/memory-icon".format = "";
format = "{icon} {temperatureC}°C"; memory.format = "{percentage}%";
"temperature#icon" = {
format = "{icon}";
format-icons = ["" "" ""]; format-icons = ["" "" ""];
critical-threshold = 80; critical-threshold = 80;
}; };
temperature = {
format = "{temperatureC}°C";
critical-threshold = 80;
};
idle_inhibitor = { idle_inhibitor = {
format = "{icon}"; format = "{icon}";
format-icons = { format-icons = {
@ -73,20 +99,30 @@
deactivated = ""; deactivated = "";
}; };
}; };
"battery#icon" = {
states = {
good = 90;
warning = 30;
critical = 15;
};
format = "{icon}";
format-charging = "";
format-plugged = "";
format-icons = [ "" "" "" "" "" ];
};
battery = { battery = {
states = { states = {
good = 90; good = 90;
warning = 30; warning = 30;
critical = 15; critical = 15;
}; };
format = "{icon} {capacity}%"; format = "{capacity}%";
format-charging = " {capacity}%"; format-charging = "{capacity}%";
format-plugged = " {capacity}%"; format-plugged = "{capacity}%";
format-alt = "{icon} {time}"; format-alt = "{time}";
format-icons = [ "" "" "" "" "" ];
}; };
pulseaudio = { "pulseaudio#icon" = {
format = "{icon} {volume}%"; format = "{icon}";
format-muted = "婢"; format-muted = "婢";
on-click = "foot pulsemixer"; on-click = "foot pulsemixer";
format-icons = { format-icons = {
@ -97,6 +133,10 @@
]; ];
}; };
}; };
pulseaudio = {
format = "{volume}%";
on-click = "foot pulsemixer";
};
network = { network = {
format-wifi = "直"; format-wifi = "直";
format-ethernet = ""; format-ethernet = "";
@ -105,7 +145,7 @@
format-alt = "{ifname}: {ipaddr}/{cidr}"; format-alt = "{ifname}: {ipaddr}/{cidr}";
tooltip-format-wifi = "{essid} ({signalStrength}%)"; tooltip-format-wifi = "{essid} ({signalStrength}%)";
}; };
clock = { "clock#original" = {
format = "{:%a, %F %T}"; format = "{:%a, %F %T}";
tooltip = true; tooltip = true;
tooltip-format = "{:%A, %F %T %z (%Z)}"; tooltip-format = "{:%A, %F %T %z (%Z)}";
@ -114,26 +154,29 @@
]; ];
interval = 1; interval = 1;
}; };
"clock#s" = { "custom/arc-h" = {
format = "-{:%H}"; format = "";
tooltip = true; };
timezone = "America/Chicago"; "custom/hex-h" = {
tooltip-format = "{:%A, %F %R %z (%Z)}"; format = "";
};
"custom/miku-h" = {
format = "";
}; };
"clock#arc" = { "clock#arc" = {
format = "-{:%H}"; format = "-{:%H}";
tooltip = true; tooltip = true;
timezone = "America/Vancouver"; timezone = "America/Vancouver";
tooltip-format = "{:%A, %F %R %z (%Z)}"; tooltip-format = "{:%A, %F %R %z (%Z)}";
}; };
"clock#miku" = { "clock#miku" = {
format = "+{:%H}"; format = "+{:%H}";
tooltip = true; tooltip = true;
timezone = "Pacific/Auckland"; timezone = "Pacific/Auckland";
tooltip-format = "{:%A, %F %R %z (%Z)}"; tooltip-format = "{:%A, %F %R %z (%Z)}";
}; };
"clock#hex" = { "clock#hex" = {
format = "+{:%H}"; format = "+{:%H}";
tooltip = true; tooltip = true;
timezone = "Europe/Berlin"; timezone = "Europe/Berlin";
tooltip-format = "{:%A, %F %R %z (%Z)}"; tooltip-format = "{:%A, %F %R %z (%Z)}";

133
config/users/kat/sway/waybar/waybar.sass
View file

@ -1,5 +1,5 @@
%extend_1 %extend_1
padding: 0 8px padding: 0 6px
transition: none transition: none
color: $base00 color: $base00
@ -13,112 +13,125 @@
text-shadow: none text-shadow: none
box-shadow: none box-shadow: none
window#waybar
background: $base00t
tooltip tooltip
background: $base00t background: $base00t
border-radius: 1em
label label
color: $base07 color: $base07
#mode #mode
background: $base01
color: $base06 color: $base06
padding: 0 4px padding: 0 4px
#clock #clock
@extend %extend_1 @extend %extend_1
background: $base00t background: $base01
color: $base07 color: $base07
&.s
background: $base0Ft
&.arc #custom-arc-h
background: $base0Bt @extend %extend_1
background: $base0B
&.miku #custom-miku-h
background: $base0Ct @extend %extend_1
background: $base0C
&.hex #custom-hex-h
background: $base0Et @extend %extend_1
background: $base0E
#memory #cpu, #memory, #temperature, #pulseaudio, #backlight, #battery, #custom-mail, #clock.arc, #clock.hex, #clock.miku
background: $base01
padding: 0 6px
margin-right: 4px
#network, #custom-gpg-status, #custom-konawall, #idle_inhibitor
margin: 0 4px
#temperature.icon, #pulseaudio.icon, #battery.icon, #backlight.icon, #custom-cpu-icon, #custom-memory-icon, #custom-mail-icon, #custom-arc-h, #custom-hex-h, #custom-miku-h, #clock.original, #tray
margin-left: 4px
margin-right: 0px
#custom-memory-icon
@extend %extend_1 @extend %extend_1
background: $base09t background: $base09
#cpu #custom-cpu-icon
@extend %extend_1 @extend %extend_1
background: $base08t background: $base08
#temperature #temperature.icon
@extend %extend_1 @extend %extend_1
background: $base0Bt background: $base0B
#pulseaudio #pulseaudio.icon
@extend %extend_1 @extend %extend_1
background: $base06t background: $base06
&.muted &.muted
background: $base03t background: $base03
#network #network
@extend %extend_1 @extend %extend_1
background: $base0Ct background: $base0C
#mpd #mpd
@extend %extend_1 @extend %extend_1
#backlight #backlight.icon
@extend %extend_1 @extend %extend_1
background: $base0Dt background: $base0D
#battery #battery.icon
@extend %extend_1 @extend %extend_1
background: $base0Ct background: $base0C
#custom-mail #custom-mail-icon
@extend %extend_1 @extend %extend_1
background: $base0Ft background: $base0F
#custom-konawall #custom-konawall
@extend %extend_1 @extend %extend_1
&.enabled &.enabled
background: $base0Et background: $base0E
&.disabled &.disabled
background: $base0Dt background: $base0D
#custom-gpg-status #custom-gpg-status
@extend %extend_1 @extend %extend_1
&.enabled &.enabled
background: $base0Bt background: $base0B
&.disabled &.disabled
background: $base08t background: $base08
#idle_inhibitor #idle_inhibitor
@extend %extend_1 @extend %extend_1
&.activated &.activated
background: $base0Et background: $base0E
&.deactivated &.deactivated
background: $base0Dt background: $base0D
#tray #tray
@extend %extend_1 @extend %extend_1
background: $base00t background: $base01
border-top-right-radius: 1em
border-bottom-right-radius: 1em
padding: 0 10px 0 8px padding: 0 10px 0 8px
menu menu
background: $base00t background: $base00t
border-radius: 1em
color: $base07 color: $base07
.modules-left .modules-left
margin: 2px 4px margin: 0 4px
border-radius: 1em #window
margin-right: 0px
widget widget
label label
margin: 0 4px margin: 0
border-radius: 1em
&:first-child &:first-child
margin-left: 0 margin-left: 0
@ -127,43 +140,17 @@ tooltip
margin-right: 0 margin-right: 0
.modules-center .modules-center
margin: 2px 4px margin: 0 4px
border-radius: 1em
widget
&:first-child label
border-top-left-radius: 1em
border-bottom-left-radius: 1em
&:last-child label
border-top-right-radius: 1em
border-bottom-right-radius: 1em
.modules-right .modules-right
margin: 2px 4px margin: 0 4px
border-radius: 1em
widget
&:first-child *
border-top-left-radius: 1em
border-bottom-left-radius: 1em
&:last-child *
border-top-right-radius: 1em
border-bottom-right-radius: 1em
#workspaces #workspaces
background: $base00t background: $base01
padding: 0 padding: 0
border-radius: 1em margin-right: 8px
button button
color: $base06 color: $base06
&:first-child
border-top-left-radius: 1em
border-bottom-left-radius: 1em
&:last-child
border-top-right-radius: 1em
border-bottom-right-radius: 1em
&.focused &.focused
color: $base07 color: $base07
background: $base0D background: $base0D
@ -176,8 +163,8 @@ tooltip
color: $base0C color: $base0C
#window #window
background: $base00t background: $base01
padding: 0 8px padding: 0 4px
color: $base06 color: $base06
border-bottom: 2px solid transparent border-bottom: 2px solid transparent