Compare commits

...

3 Commits

4 changed files with 73 additions and 24 deletions

View File

@ -8,6 +8,6 @@
./browsers.nix ./browsers.nix
./productivity.nix ./productivity.nix
./media.nix ./media.nix
./hyprland/hyprland.nix #./hyprland/hyprland.nix
]; ];
} }

View File

@ -199,6 +199,7 @@
gestures = { gestures = {
workspace_swipe = true; workspace_swipe = true;
workspace_swipe_fingers = 3; workspace_swipe_fingers = 3;
workspace_swipe_distance = 450;
}; };
}; };

View File

@ -11,16 +11,21 @@
"HDMI-A-1" "HDMI-A-1"
]; ];
modules-left = ["hyprland/workspaces" "hyprland/window"]; modules-left = ["hyprland/workspaces" "hyprland/window"];
modules-center = ["tray"]; modules-center = ["bluetooth" "tray"];
modules-right = ["pulseaudio" "backlight" "bluetooth" "network" "battery" "clock" "custom/power"]; modules-right = ["pulseaudio" "backlight" "battery" "clock" "custom/power"];
"hyprland/workspaces" = { "hyprland/workspaces" = {
on-scroll-up = "hyprctl dispatch workspace e+1"; on-scroll-up = "hyprctl dispatch workspace e+1";
on-scroll-down = "hyprctl dispatch workspace e-1"; on-scroll-down = "hyprctl dispatch workspace e-1";
}; };
"hyrland/window" = { "hyprland/window" = {
separate-outputs = true; separate-outputs = true;
format = " 󱂬 {class}";
icon = true;
rewrite = {
"(.*) Mozilla Firefox" = "Firefox";
};
}; };
# ---------------------------------------------- # ----------------------------------------------
@ -44,6 +49,26 @@
format = "󰃠 {percent}%"; format = "󰃠 {percent}%";
}; };
"bluetooth" = {
format-disabled = "󰂲";
format-off = "󰂲";
format-on = "󰂯";
format-connected = "󰂱";
tooltip-format-connected = "Connected to {device_alias}";
format-connected-battery = "󰂱 {device_battery_percentage}%";
};
"network" = {
format = "{ifname}";
format-ethernet = "󰈀";
tooltip-format-ethernet = "{ifname}";
format-wifi = "{icon}";
tooltip-format-wifi = "Connected to {essid} with IP: {ipaddr} and signal strength: {signalStrength}";
format-disconnected = "󰤭";
tooltip-format-disconnected = "Disconnected";
format-icons = [ "󰤯" "󰤟" "󰤢" "󰤥" "󰤨" ];
};
"battery" = { "battery" = {
states = { states = {
warning = 30; warning = 30;
@ -101,32 +126,31 @@
@define-color flamingo #f2cdcd; @define-color flamingo #f2cdcd;
@define-color rosewater #f5e0dc; @define-color rosewater #f5e0dc;
* { * {
font-family: JetBrainsMono NF; font-family: JetBrainsMono NF;
font-size: 15px; font-size: 15px;
} }
#custom-power { #custom-power {
background-color: @base; background-color: @base;
color: @red; color: @red;
padding: 0.5rem 1rem; padding: 0.5rem 1rem;
margin: 5px 0; margin: 5px 0;
border-radius: 5px 20px 20px 5px; border-radius: 5px 20px 20px 5px;
} }
#battery { #battery {
color: @green; color: @green;
} }
#battery.charging { #battery.charging {
background-color: @green; color: @green;
}
#battery.warning:not(.charging), #battery.critical:not(.charging) {
background-color: @red;
color: @base; color: @base;
} }
#battery.warning:not(.charging) {
background-color: @red;
color: @base;
}
#waybar { #waybar {
background: transparent; background: transparent;
@ -142,13 +166,13 @@
} }
#workspaces button { #workspaces button {
color: @lavender; color: @text;
border-radius: 1rem; border-radius: 1rem;
padding: 0.4rem; padding: 0.4rem;
} }
#workspaces button.active { #workspaces button.active {
color: @sky; color: @mauve;
border-radius: 1rem; border-radius: 1rem;
} }
@ -178,6 +202,18 @@
border-radius: 0; border-radius: 0;
} }
#bluetooth.off {
color: @red;
}
#bluetooth.on {
color: @blue;
}
#bluetooth.connected {
color: @blue;
}
#pulseaudio { #pulseaudio {
color: @maroon; color: @maroon;
border-radius: 1rem 0px 0px 1rem; border-radius: 1rem 0px 0px 1rem;
@ -204,6 +240,18 @@
margin-right: 1rem; margin-right: 1rem;
border-radius: 1rem; border-radius: 1rem;
} }
#network {
color: @text;
}
#network.disabled {
color: @red;
}
#network.disconnected {
color: @red;
}
''; '';
}; };
} }

View File

@ -4,7 +4,7 @@
./graphics.nix ./graphics.nix
./powerManagement.nix ./powerManagement.nix
./wireless.nix ./wireless.nix
./wayland.nix #./wayland.nix
./syncthing.nix ./syncthing.nix
./kdePlasma.nix ./kdePlasma.nix
./media.nix ./media.nix