bchmnn/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: change style to be more concise

Browse source
This commit is contained in:
Jacob Bachmann 2024-08-25 12:53:14 +02:00
parent a751b35d7a
commit 68d9de9244
Signed by: bchmnn
GPG key ID: 732A612DAD28067D
2 changed files with 64 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

3
users/gandalf/modules/gui/sway/default.nix
View file

@ -241,9 +241,6 @@ in
titlebar = false; titlebar = false;
border = 4; border = 4;
}; };
gaps = {
inner = 5;
};
colors = { colors = {
focused = { focused = {
border = common.colorschemes.default.active; border = common.colorschemes.default.active;

126
users/gandalf/modules/gui/waybar.nix
View file

@ -20,9 +20,9 @@ let
''; '';
tailscale-status = pkgs.writeShellScript "tailscale-status" '' tailscale-status = pkgs.writeShellScript "tailscale-status" ''
if ${nixosConfig.services.tailscale.package}/bin/tailscale status > /dev/null 2>&1; then if ${nixosConfig.services.tailscale.package}/bin/tailscale status > /dev/null 2>&1; then
echo echo " "
else else
echo echo " "
fi fi
''; '';
tailscale-toggle = pkgs.writeShellScript "tailscale-toggle" '' tailscale-toggle = pkgs.writeShellScript "tailscale-toggle" ''
@ -40,7 +40,7 @@ in
{ {
"backlight": { "backlight": {
"device": "intel_backlight", "device": "intel_backlight",
"format": "{percent}% {icon}", "format": "{percent}% {icon} ",
"format-icons": [ "format-icons": [
"󰌶", "󰌶",
"󱩎", "󱩎",
@ -56,9 +56,9 @@ in
] ]
}, },
"battery": { "battery": {
"format": "{capacity}% {icon}", "format": "{capacity}% {icon} ",
"format-alt": "{time} {icon}", "format-alt": "{time} {icon} ",
"format-charging": "{capacity}% 󰂄", "format-charging": "{capacity}% 󰂄 ",
"format-icons": [ "format-icons": [
"󰂃", "󰂃",
"󰁺", "󰁺",
@ -72,7 +72,7 @@ in
"󰂂", "󰂂",
"󰁹" "󰁹"
], ],
"format-plugged": "{capacity}% ", "format-plugged": "{capacity}% ",
"on-update": "${check-battery}", "on-update": "${check-battery}",
"states": { "states": {
"critical": 15, "critical": 15,
@ -88,12 +88,17 @@ in
}, },
"custom/mem": { "custom/mem": {
"exec": "free -h | awk '/Mem:/{printf $3}'", "exec": "free -h | awk '/Mem:/{printf $3}'",
"format": "{} 󰍛", "format": "{} 󰍛 ",
"interval": 3, "interval": 3,
"tooltip": false "tooltip": false
}, },
"custom/separator": {
"format": "|",
"interval": "once",
"tooltip": false
},
"disk": { "disk": {
"format": "{specific_free:0.0f}GB ", "format": "{specific_free:0.0f}GB ",
"unit": "GB" "unit": "GB"
}, },
"sway/mode": { "sway/mode": {
@ -118,7 +123,6 @@ in
} }
}, },
"layer": "top", "layer": "top",
"margin": "5 5 5 5",
"modules-center": [ "modules-center": [
], ],
"modules-left": [ "modules-left": [
@ -130,25 +134,32 @@ in
"tray", "tray",
"network", "network",
"custom/tailscale", "custom/tailscale",
"custom/separator",
"pulseaudio", "pulseaudio",
"custom/separator",
"disk", "disk",
"custom/separator",
"custom/mem", "custom/mem",
"custom/separator",
"temperature", "temperature",
"custom/separator",
"backlight", "backlight",
"custom/separator",
"battery", "battery",
"custom/separator",
"clock" "clock"
], ],
"name": "swaybar", "name": "swaybar",
"network": { "network": {
"format": "{ifname}", "format": "{ifname}",
"format-disconnected": "󰈂", "format-disconnected": "󰈂 ",
"format-ethernet": "eth 󰈁", "format-ethernet": "eth 󰈁 ",
"format-wifi": "{signalStrength}% ", "format-wifi": "{signalStrength}% ",
"interval": 1, "interval": 1,
"tooltip-format": "{ifname} via {gwaddr} 󰈁", "tooltip-format": "{ifname} via {gwaddr} 󰈁 ",
"tooltip-format-disconnected": "Disconnected", "tooltip-format-disconnected": "Disconnected",
"tooltip-format-ethernet": "{ifname} ", "tooltip-format-ethernet": "{ifname} ",
"tooltip-format-wifi": "{essid} ({signalStrength}%) " "tooltip-format-wifi": "{essid} ({signalStrength}%) "
}, },
"custom/tailscale": { "custom/tailscale": {
"exec": "${tailscale-status}", "exec": "${tailscale-status}",
@ -173,15 +184,14 @@ in
"portable": "" "portable": ""
}, },
"format-muted": "󰖁 {format_source}", "format-muted": "󰖁 {format_source}",
"format-source": "{volume}% ", "format-source": "{volume}% ",
"format-source-muted": "", "format-source-muted": " ",
"min-length": 13,
"on-click": "${pkgs.pavucontrol}/bin/pavucontrol", "on-click": "${pkgs.pavucontrol}/bin/pavucontrol",
"reverse-scrolling": 1 "reverse-scrolling": 1
}, },
"temperature": { "temperature": {
"critical-threshold": 80, "critical-threshold": 80,
"format": "{temperatureC}°C {icon}", "format": "{temperatureC}°C {icon} ",
"format-icons": [ "format-icons": [
"", "",
"", "",
@ -204,13 +214,17 @@ in
window.swaybar, window.swaybar,
window.swaybar * { window.swaybar * {
border: none; border: none;
border-radius: 10px;
font-family: DejaVuSansM Nerd Font; font-family: DejaVuSansM Nerd Font;
min-height: 20px; font-size: 13px;
}
window.swaybar #custom-separator {
padding-right: 6px;
color: #d3d3d3;
} }
window.swaybar#waybar { window.swaybar#waybar {
background: #ffffff; background: linear-gradient(to bottom, #ffffff, #f9f9f9);
} }
window.swaybar#waybar.hidden { window.swaybar#waybar.hidden {
@ -228,8 +242,8 @@ in
transition: none; transition: none;
color: black; color: black;
background: transparent; background: transparent;
padding: 5px; padding: 2px;
font-size: 18px; /* font-size: 18px; */
border-radius: 0px; border-radius: 0px;
} }
@ -238,12 +252,12 @@ in
} }
window.swaybar #workspaces button.persistent { window.swaybar #workspaces button.persistent {
font-size: 12px; /* font-size: 12px; */
} }
window.swaybar #workspaces button.visible { window.swaybar #workspaces button.visible {
color: black; color: black;
font-size: 18px; /* font-size: 18px; */
} }
window.swaybar #workspaces button.focused { window.swaybar #workspaces button.focused {
@ -256,8 +270,8 @@ in
} }
window.swaybar #window { window.swaybar #window {
padding-left: 16px; padding-left: 8px;
padding-right: 16px; padding-right: 8px;
transition: none; transition: none;
color: black; color: black;
background: transparent; background: transparent;
@ -275,29 +289,27 @@ in
margin-right: 10px; margin-right: 10px;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
border-radius: 10px;
transition: none; transition: none;
color: white; color: white;
background: rgb(66, 118, 185); background: rgb(66, 118, 185);
} }
window.swaybar #network { window.swaybar #network {
padding-left: 10px; padding-left: 6px;
padding-right: 10px;
transition: none; transition: none;
color: black; color: black;
background: transparent; background: transparent;
} }
window.swaybar #custom-tailscale { window.swaybar #custom-tailscale {
padding-right: 10px; padding-right: 6px;
transition: none; transition: none;
color: black; color: black;
background: transparent; background: transparent;
} }
window.swaybar #pulseaudio { window.swaybar #pulseaudio {
padding-left: 10px;
padding-right: 10px;
transition: none; transition: none;
color: black; color: black;
background: transparent; background: transparent;
@ -308,82 +320,72 @@ in
} }
window.swaybar #disk { window.swaybar #disk {
padding-left: 10px;
padding-right: 10px;
transition: none; transition: none;
color: black; color: black;
background: transparent; background: transparent;
} }
window.swaybar #custom-mem { window.swaybar #custom-mem {
padding-left: 10px;
padding-right: 10px;
transition: none; transition: none;
color: black; color: black;
background: transparent; background: transparent;
} }
window.swaybar #temperature { window.swaybar #temperature {
padding-left: 10px;
padding-right: 10px;
transition: none; transition: none;
color: black; color: black;
background: transparent; background: transparent;
} }
window.swaybar #temperature.critical { window.swaybar #temperature.critical {
background-color: #eb4d4b; background-color: #eb4d4b;
} }
window.swaybar #backlight { window.swaybar #backlight {
padding-left: 10px;
padding-right: 10px;
transition: none; transition: none;
color: black; color: black;
background: transparent; background: transparent;
} }
window.swaybar #battery { window.swaybar #battery {
padding-left: 10px;
padding-right: 10px;
transition: none; transition: none;
color: black; color: black;
background: transparent; background: transparent;
} }
window.swaybar #battery.charging { window.swaybar #battery.charging {
color: #ffffff; color: #ffffff;
background-color: #26A65B; background-color: #26A65B;
} }
window.swaybar #battery.warning:not(.charging) { window.swaybar #battery.warning:not(.charging) {
background-color: #ffbe61; background-color: #ffbe61;
color: black; color: black;
} }
window.swaybar #battery.critical:not(.charging) { window.swaybar #battery.critical:not(.charging) {
background-color: #f53c3c; background-color: #f53c3c;
color: #ffffff; color: #ffffff;
animation-name: blink; animation-name: blink;
animation-duration: 0.5s; animation-duration: 0.5s;
animation-timing-function: linear; animation-timing-function: linear;
animation-iteration-count: infinite; animation-iteration-count: infinite;
animation-direction: alternate; animation-direction: alternate;
} }
window.swaybar #clock { window.swaybar #clock {
padding-left: 10px; padding-right: 6px;
padding-right: 16px; margin-right: 8px;
transition: none; transition: none;
color: black; color: black;
background: transparent; background: transparent;
} }
@keyframes blink { @keyframes blink {
to { to {
background-color: #ffffff; background-color: #ffffff;
color: #000000; color: #000000;
} }
} }
''; '';
}; };