remove qs, fixes to waybar

This commit is contained in:
2025-06-30 17:19:24 +02:00
parent 4b71da350f
commit ce5379ffc7
165 changed files with 16249 additions and 374 deletions

View File

@@ -91,6 +91,11 @@
args = ["-" "--quiet" "--line-length 100"];
};
}
{
name = "qml";
auto-format = true;
language-servers = ["qmlls"];
}
{
name = "typescript";
auto-format = true;
@@ -173,6 +178,11 @@
args = ["lsp"];
};
qmlls = {
command = "${pkgs.qt6.qtdeclarative}/bin/qmlls";
args = ["-E"];
};
pyright = {
command = "${pkgs.pyright}/bin/pyright-langserver";
args = ["--stdio"];

View File

@@ -31,6 +31,7 @@ in {
home.packages = with pkgs; [
protontricks
lutris
monero-gui
# misc.gui
# virt-manager
gnome-calculator
@@ -70,6 +71,8 @@ in {
gnutar
p7zip
unrar
material-icons
material-symbols
];
};
}

View File

@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="60"
height="45"
viewBox="0 0 15.875 11.90625"
version="1.1"
id="svg1"
inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
sodipodi:docname="button.svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview1"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="mm"
inkscape:zoom="4.4257576"
inkscape:cx="28.695652"
inkscape:cy="59.763779"
inkscape:window-width="1587"
inkscape:window-height="1401"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer1" />
<defs
id="defs1">
<rect
x="63.266006"
y="57.843204"
width="682.36908"
height="582.95105"
id="rect1" />
</defs>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-19.208647,-19.184876)">
<path
style="font-size:14.6667px;line-height:14.6667px;font-family:'Input Mono';-inkscape-font-specification:'Input Mono';letter-spacing:0px;word-spacing:0px;white-space:pre;fill:#7daea3;fill-opacity:1;stroke-width:0.0799522"
d="m 26.15396,27.783766 v 0.661508 h 0.330683 v 0.661331 h 0.661504 0.661505 0.661366 0.661504 0.661505 v 0.661506 h 0.330682 v 0.661508 h 0.330684 v 0.661507 h 0.661504 0.330683 v -0.661507 h 0.330822 V 29.768111 H 31.44558 v -0.661506 h 0.330822 0.661366 0.661504 0.330683 v -0.661331 h 0.330822 v -0.661508 h -0.661505 -0.661504 -0.661366 -0.661505 -0.661504 -0.661366 -0.661505 -0.661504 -0.661366 -0.661505 -0.661504 z"
id="path125" />
<path
style="font-size:14.6667px;line-height:14.6667px;font-family:'Input Mono';-inkscape-font-specification:'Input Mono';letter-spacing:0px;word-spacing:0px;white-space:pre;fill:#89b482;fill-opacity:1;stroke-width:0.0799522"
d="m 23.838763,25.79942 v 0.661508 H 23.50808 v 0.661331 h 0.330683 v 1.323015 H 23.50808 v 0.661331 h -0.330683 v 0.661506 h -0.330822 v 0.661508 h -0.330682 v 0.661507 h 0.661504 0.661366 v -0.661507 h 0.330821 v -0.661508 h 0.330684 v -0.661506 h 0.330683 v 0.661506 h 0.330821 v 0.661508 h 0.330683 v 0.661507 h 0.330683 0.661505 0.330821 V 30.429619 H 26.484643 V 29.768111 H 26.15396 V 29.106605 H 25.823138 V 28.445274 H 25.492455 V 27.783766 H 25.161772 V 27.122259 H 24.830951 V 26.460928 H 24.500268 V 25.79942 Z"
id="path124" />
<path
style="font-size:14.6667px;line-height:14.6667px;font-family:'Input Mono';-inkscape-font-specification:'Input Mono';letter-spacing:0px;word-spacing:0px;white-space:pre;fill:#7daea3;fill-opacity:1;stroke-width:0.0799522"
d="m 22.846575,23.153567 v 0.661507 h -0.330682 v 0.661508 H 21.854388 21.193022 20.531517 19.870013 19.53933 v 0.661331 h -0.330683 v 0.661507 h 0.661366 0.661504 0.661505 0.330683 v 0.661508 h -0.330683 v 0.661331 h -0.330821 v 0.661507 h 0.330821 v 0.661508 h 0.330683 v 0.661331 h 0.330683 v -0.661331 h 0.330821 v -0.661508 h 0.330684 v -0.661507 h 0.330682 v -0.661331 h 0.330822 V 25.79942 h 0.330683 v -0.661507 h 0.330683 v -0.661331 h 0.330821 v -0.661508 h 0.330684 v -0.661507 h -0.661505 -0.661366 z"
id="path123" />
<path
style="font-size:14.6667px;line-height:14.6667px;font-family:'Input Mono';-inkscape-font-specification:'Input Mono';letter-spacing:0px;word-spacing:0px;white-space:pre;fill:#89b482;fill-opacity:1;stroke-width:0.0799522"
d="m 32.437768,21.169222 v 0.661507 h -0.330684 v 0.661507 h -0.330682 v 0.661331 H 31.44558 v 0.661507 h -0.330683 v 0.661508 h -0.330683 v 0.661331 h -0.330821 v 0.661507 h -0.330684 v 0.661508 h -0.330682 v 0.661331 h 0.661366 0.661504 0.330683 v -0.661331 h 0.330822 V 25.79942 h 0.661366 0.661504 0.661505 0.661366 0.330821 v -0.661507 h 0.330683 v -0.661331 h -0.661504 -0.661366 -0.661505 -0.330683 v -0.661508 h 0.330683 v -0.661507 h 0.330683 v -0.661331 h -0.330683 v -0.661507 h -0.330683 v -0.661507 z"
id="path122" />
<path
style="font-size:14.6667px;line-height:14.6667px;font-family:'Input Mono';-inkscape-font-specification:'Input Mono';letter-spacing:0px;word-spacing:0px;white-space:pre;fill:#7daea3;fill-opacity:1;stroke-width:0.0799522"
d="m 27.47683,19.184876 v 0.661507 h 0.330822 v 0.661507 h 0.330682 v 0.661332 h 0.330684 v 0.661507 h 0.330821 v 0.661507 h 0.330683 v 0.661331 h 0.330683 v 0.661507 h 0.330822 v 0.661508 h 0.661366 v -0.661508 h 0.330821 v -0.661507 h -0.330821 v -1.322838 h 0.330821 v -0.661507 h 0.330683 V 20.50789 h 0.330683 v -0.661507 h 0.330822 v -0.661507 h -0.661505 -0.661504 v 0.661507 h -0.330684 v 0.661507 h -0.330682 v 0.661332 H 29.461205 V 20.50789 h -0.330683 v -0.661507 h -0.330683 v -0.661507 h -0.330821 -0.661366 z"
id="path121" />
<path
style="font-size:14.6667px;line-height:14.6667px;font-family:'Input Mono';-inkscape-font-specification:'Input Mono';letter-spacing:0px;word-spacing:0px;white-space:pre;fill:#89b482;fill-opacity:1;stroke-width:0.0799522"
d="m 22.846575,19.184876 v 0.661507 h -0.330682 v 0.661507 h 0.330682 v 0.661332 h -0.330682 -0.661505 -0.661366 -0.330821 v 0.661507 h -0.330684 v 0.661507 h 0.661505 0.661366 0.661505 0.661504 0.661366 0.661505 0.661504 0.661366 0.661505 0.661504 0.661505 0.330682 V 21.830729 H 27.807652 V 21.169222 H 27.146147 26.484643 25.823138 25.161772 24.500268 V 20.50789 h -0.330684 v -0.661507 h -0.330821 v -0.661507 h -0.661366 z"
id="text121" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

@@ -0,0 +1,188 @@
[
{
"backlight": {
"format": "<span foreground='#928374'>{icon}</span> {percent}%",
"format-icons": [
""
],
"tooltip": false
},
"battery": {
"format": "<span foreground='#928374'>{icon}</span> {capacity}%",
"format-charging": "<span foreground='#928374'></span> {capacity}%",
"format-icons": [
"",
"",
"",
"",
""
],
"states": {
"critical": 15,
"warning": 30
}
},
"clock": {
"format": "<span foreground='#928374'></span> {:%a, %d %b <span foreground='#928374'></span> %H:%M}",
"on-click": "calcurse-toggle.sh",
"on-click-right": "calsync.sh",
"rotate": 0,
"tooltip": false
},
"cpu": {
"format": "<span foreground='#928374'></span> {usage}%",
"states": {
"critical": 90,
"warning": 70
}
},
"custom/dunst": {
"exec": "dunst.sh",
"on-click": "dunstctl set-paused toggle",
"restart-interval": 1,
"tooltip": false
},
"custom/logo": {
"format": " ",
"tooltip": false
},
"custom/mako": {
"exec": "mako.sh",
"on-click": "mako-toggle.sh",
"restart-interval": 1,
"tooltip": false
},
"custom/progress": {
"exec": "waybar-progress.sh",
"interval": 1,
"return-type": "json"
},
"custom/systemd": {
"exec": "waybar-systemd.sh",
"interval": 10,
"return-type": "json"
},
"custom/trayicon": {
"format": "󰅁",
"tooltip": false
},
"disk": {
"format": "<span foreground='#928374'></span> {percentage_free}%",
"states": {
"critical": 90,
"warning": 70
}
},
"group/system": {
"drawer": {
"click-to-reveal": true,
"transistion-left-to-right": true,
"transition-duration": 250
},
"modules": [
"custom/logo",
"cpu",
"memory",
"disk",
"network"
],
"orientation": "inherit"
},
"group/tray": {
"drawer": {
"click-to-reveal": true,
"transistion-duration": 250,
"transition-left-to-right": false
},
"modules": [
"custom/trayicon",
"tray"
],
"orientation": "inherit"
},
"height": 25,
"hyprland/workspaces": {
"active-only": false,
"all-outputs": false,
"disable-scroll": true,
"format": "{icon}",
"format-icons": {
"4": "",
"active": "",
"default": "",
"empty": "",
"persistent": ""
},
"on-click": "activate",
"persistent-workspaces": {
"*": 3
},
"rotate": 0
},
"memory": {
"format": "<span foreground='#928374'></span> {}%",
"states": {
"critical": 90,
"warning": 70
}
},
"modules-center": [
"hyprland/workspaces"
],
"modules-left": [
"group/system"
],
"modules-right": [
"custom/progress",
"custom/systemd",
"group/tray",
"pulseaudio",
"backlight",
"battery",
"clock",
"custom/dunst"
],
"network": {
"format-disconnected": " <span foreground='#928374'></span> ",
"format-ethernet": "<span foreground='#928374'></span> {ifname}",
"format-linked": "<span foreground='#928374'></span> {ifname}",
"format-wifi": "<span foreground='#928374'></span> {essid}",
"interval": 2,
"tooltip-format": "{ifname}: {ipaddr}/{cidr}\n {bandwidthDownBits}\n {bandwidthUpBits}"
},
"output": [
"DP-3",
"eDP-1"
],
"pulseaudio": {
"format": "<span foreground='#928374'>{icon}</span> {volume}% {format_source}",
"format-bluetooth": "<span foreground='#928374'>{icon}</span> {volume}% {format_source}",
"format-bluetooth-muted": "<span foreground='#928374'> {icon}</span> {format_source}",
"format-icons": {
"car": "",
"default": [
"",
"",
""
],
"hands-free": "",
"headphone": "",
"headset": "",
"phone": "",
"portable": ""
},
"format-muted": "<span foreground='#928374'></span> {format_source}",
"format-source": "<span foreground='#928374'></span> {volume}%",
"format-source-muted": "<span foreground='#928374'></span>",
"on-click": "/nix/store/2894dhb9zixl8a46hai9rh20k91mw5p3-pavucontrol-6.1/bin/pavucontrol",
"on-click-middle": "/nix/store/xfwsp8vl887ks0hbb227i0fj4lijz082-helvum-0.5.1/bin/helvum",
"on-scroll-down": "volume-control.sh --dec",
"on-scroll-up": "volume-control.sh --inc"
},
"tray": {
"icon-size": 12,
"rotate": 0,
"spacing": 5
}
}
]

View File

@@ -1,33 +1,29 @@
* {
all: unset;
background: #282828;
border: none;
border-radius: 0;
font-family:
Input Mono Narrow Light,
"Font Awesome 6 Free Solid";
font-size: 13px;
font-size: 14px;
min-height: 0;
}
window#waybar {
background: transparent;
color: #fbf1c7;
/* transition-property: background-color; */
/* transition-duration: 0.5s; */
background-color: rgba(43, 45, 50, 0.5);
}
#workspaces button {
padding: 0 0px;
margin: 0 6px;
padding: 0 6px;
margin: 0 0px;
background-color: transparent;
color: #fbf1c7;
border-top: 3px solid transparent;
border-bottom: 3px solid transparent;
}
#workspaces button:hover {
background-color: #282828;
background: #282828;
color: #ebdbb2;
animation: ws_active 0s ease-in-out 1;
transition: all 0.2s cubic-bezier(0.55, -0.68, 0.48, 1.682);
@@ -41,7 +37,7 @@ window#waybar {
#custom-logo {
font-size: 16px;
background-image: url("../waybar/images/button.svg");
background-image: url("assets/button.svg");
background-position: center;
background-repeat: no-repeat;
background-size: 18px 15px;
@@ -54,12 +50,9 @@ window#waybar {
margin: 1px 0px 0px 0px;
padding-left: 2px;
padding-right: 2px;
font-family: "Cantarell";
font-size: 14px;
}
#custom-usbguard,
#custom-decrypted,
#custom-mail,
#battery.warning,
#disk.warning,
@@ -126,20 +119,23 @@ window#waybar {
color: #fbf1c7;
}
#custom-dunst,
#custom-mako {
color: #928374;
color: #fbf1c7;
background: transparent;
opacity: 1;
margin: 1px 0px 0px 0px;
padding-right: 12px;
padding-left: 8px;
font-family: "Cantarell";
font-size: 16px;
padding-right: 6px;
padding-left: 4px;
/* font-size: 14px; */
}
#tray menu * {
color: #fbf1c7;
background-color: rgba(50, 48, 47, 0.9);
font-family: "Input Sans Compressed";
padding: 2px 2px;
}
#tray menu menuitem:hover {
color: #4c7a5d;
}
#tray {

View File

@@ -6,252 +6,37 @@
}: let
inherit (lib) mkIf mkEnableOption;
cfg = config.home.programs.waybar;
uwsm = lib.getExe pkgs.uwsm;
waybar = lib.getExe pkgs.waybar;
waybarAssets = pkgs.runCommand "waybar-config-assets" {} ''
mkdir -p $out/assets
cp ${./assets/button.svg} $out/assets/button.svg
cp ${./config/style.css} $out/style.css
cp ${./config/config.jsonc} $out/config.jsonc
'';
in {
options = {
home.programs.waybar.enable = mkEnableOption "Enables waybar";
};
config = mkIf cfg.enable {
systemd.user.services.waybar = {
Unit.StartLimitBurst = 30;
};
programs.waybar = {
enable = true;
package = pkgs.waybar;
systemd.enable = true;
# style = ./style.css;
Unit = {
After = ["graphical-session.target"];
ConditionEnvironment = "WAYLAND_DISPLAY";
Description = "waybar";
};
settings = [
{
height = 25;
output = ["DP-3" "eDP-1"];
Service = {
ExecStart = "${uwsm} app -- ${waybar} -c ${waybarAssets}/config.jsonc -s ${waybarAssets}/style.css";
Slice = "app-graphical.slice";
Restart = "always";
RestartSec = 10;
};
modules-left = [
"group/system"
];
modules-center = [
"hyprland/workspaces"
];
modules-right = [
"custom/progress"
"custom/systemd"
# "custom/mail"
"group/tray"
"pulseaudio"
"backlight"
"battery"
"clock"
"custom/dunst"
];
"hyprland/workspaces" = {
format = "{icon}";
format-icons = {
"default" = "";
"active" = "";
"empty" = "";
"persistent" = "";
"4" = "";
};
disable-scroll = true;
rotate = 0;
all-outputs = false;
active-only = false;
on-click = "activate";
persistent-workspaces = {
"*" = 3;
};
};
"group/tray" = {
orientation = "inherit";
drawer = {
transition-left-to-right = false;
transistion-duration = 250;
click-to-reveal = true;
};
modules = [
"custom/trayicon"
"tray"
];
};
"group/system" = {
orientation = "inherit";
drawer = {
transistion-left-to-right = true;
transition-duration = 250;
click-to-reveal = true;
};
modules = [
"custom/logo"
"cpu"
"memory"
"disk"
"network"
];
};
"custom/trayicon" = {
format = "󰅁";
tooltip = false;
};
"custom/logo" = {
format = " ";
tooltip = false;
};
"custom/mako" = {
exec = "mako.sh";
on-click = "mako-toggle.sh";
restart-interval = 1;
tooltip = false;
};
"custom/progress" = {
exec = "waybar-progress.sh";
return-type = "json";
interval = 1;
};
"custom/systemd" = {
exec = "waybar-systemd.sh";
return-type = "json";
interval = 10;
};
"custom/dunst" = {
exec = "dunst.sh";
on-click = "dunstctl set-paused toggle";
restart-interval = 1;
tooltip = false;
};
"custom/swaync" = {
tooltip = false;
format = "{} {icon} ";
format-icons = {
"notification" = "󰂚<span foreground='red'><sup></sup></span>";
"none" = "󰂚";
"dnd-notification" = "󱏧<span foreground='red'><sup></sup></span>";
"dnd-none" = "󱏧";
"inhibited-notification" = "󰂚<span foreground='red'><sup></sup></span>";
"inhibited-none" = "󰂚";
"dnd-inhibited-notification" = "󱏧<span foreground='red'><sup></sup></span>";
"dnd-inhibited-none" = "󱏧";
};
return-type = "json";
exec-if = "which swaync-client";
exec = "swaync-client -swb";
on-click = "sleep 0.1 && swaync-client -t -sw";
on-click-right = "swaync-client -d -sw";
escape = true;
};
# "custom/mail" = {
# format-icons = {
# icon = "<span foreground='#928374'> </span>";
# };
# format = "{icon}{}";
# exec = "${app}/bin/waybar-mail";
# return-type = "json";
# };
# "custom/recording" = {
# exec = "${app}/bin/waybar-recording";
# return-type = "json";
# signal = 3;
# interval = "once";
# };
tray = {
icon-size = 12;
rotate = 0;
spacing = 5;
};
clock = {
format = "<span foreground='#928374'></span> {:%a, %d %b <span foreground='#928374'></span> %H:%M}";
rotate = 0;
on-click = "calcurse-toggle.sh";
on-click-right = "calsync.sh";
tooltip = false;
};
cpu = {
format = "<span foreground='#928374'></span> {usage}%";
states = {
warning = 70;
critical = 90;
};
};
disk = {
format = "<span foreground='#928374'></span> {percentage_free}%";
states = {
warning = 70;
critical = 90;
};
};
memory = {
format = "<span foreground='#928374'></span> {}%";
states = {
warning = 70;
critical = 90;
};
};
backlight = {
format = "<span foreground='#928374'>{icon}</span> {percent}%";
format-icons = [""];
tooltip = false;
};
battery = {
states = {
warning = 30;
critical = 15;
};
format = "<span foreground='#928374'>{icon}</span> {capacity}%";
format-charging = "<span foreground='#928374'></span> {capacity}%";
format-icons = ["" "" "" "" ""];
};
network = {
interval = 2;
format-wifi = "<span foreground='#928374'></span> {essid}";
format-ethernet = "<span foreground='#928374'></span> {ifname}";
format-linked = "<span foreground='#928374'></span> {ifname}";
format-disconnected = " <span foreground='#928374'></span> ";
tooltip-format = "{ifname}: {ipaddr}/{cidr}\n {bandwidthDownBits}\n {bandwidthUpBits}";
};
pulseaudio = {
format = "<span foreground='#928374'>{icon}</span> {volume}% {format_source}";
on-scroll-up = "volume-control.sh --inc";
on-scroll-down = "volume-control.sh --dec";
format-bluetooth = "<span foreground='#928374'>{icon}</span> {volume}% {format_source}";
format-bluetooth-muted = "<span foreground='#928374'> {icon}</span> {format_source}";
format-muted = "<span foreground='#928374'></span> {format_source}";
format-source = "<span foreground='#928374'></span> {volume}%";
format-source-muted = "<span foreground='#928374'></span>";
format-icons = {
headphone = "";
hands-free = "";
headset = "";
phone = "";
portable = "";
car = "";
default = ["" "" ""];
};
on-click = lib.getExe pkgs.pavucontrol;
on-click-middle = lib.getExe pkgs.helvum;
};
}
];
Install = {
WantedBy = ["graphical-session.target"];
};
};
};
}