summaryrefslogtreecommitdiff
path: root/accounts
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2024-08-16 14:51:56 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2024-08-16 14:51:56 +0200
commit82438392e9e3ebdeae7ed0ff7691bcdc00e13539 (patch)
tree3e9786e57023619f17bbb1fa03cf6494ed43784b /accounts
parent20e085ed6e2fba63e3b2453fee45efdb542e2906 (diff)
downloadnixos-82438392e9e3ebdeae7ed0ff7691bcdc00e13539.tar
nixos-82438392e9e3ebdeae7ed0ff7691bcdc00e13539.tar.gz
nixos-82438392e9e3ebdeae7ed0ff7691bcdc00e13539.tar.bz2
nixos-82438392e9e3ebdeae7ed0ff7691bcdc00e13539.tar.xz
nixos-82438392e9e3ebdeae7ed0ff7691bcdc00e13539.zip
...
Diffstat (limited to 'accounts')
-rw-r--r--accounts/gkleen@sif/default.nix19
-rw-r--r--accounts/gkleen@sif/hyprland.nix6
2 files changed, 13 insertions, 12 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 3d352537..7c114856 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -320,7 +320,7 @@ in {
320 output = "eDP-1"; 320 output = "eDP-1";
321 modules-left = [ "hyprland/workspaces" ]; 321 modules-left = [ "hyprland/workspaces" ];
322 modules-center = [ "hyprland/window" ]; 322 modules-center = [ "hyprland/window" ];
323 modules-right = [ "custom/weather" "custom/keymap" "clock" "privacy" "tray" "pulseaudio" "backlight" "battery" "idle_inhibitor" ]; 323 modules-right = [ "custom/weather" "custom/keymap" "clock" "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" ];
324 324
325 "custom/weather" = { 325 "custom/weather" = {
326 format = "{}"; 326 format = "{}";
@@ -411,7 +411,10 @@ in {
411 privacy = { 411 privacy = {
412 icon-spacing = 7; 412 icon-spacing = 7;
413 icon-size = iconSize; 413 icon-size = iconSize;
414 modules = [ { type = "screenshare"; } { type = "audio-in"; } ]; 414 modules = [
415 { type = "screenshare"; }
416 # { type = "audio-in"; }
417 ];
415 }; 418 };
416 idle_inhibitor = { 419 idle_inhibitor = {
417 format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>"; 420 format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
@@ -426,13 +429,13 @@ in {
426 on-scroll-up = "lightctl -d up"; 429 on-scroll-up = "lightctl -d up";
427 on-scroll-down = "lightctl -d down"; 430 on-scroll-down = "lightctl -d down";
428 }; 431 };
429 pulseaudio = { 432 wireplumber = {
430 format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>"; 433 format = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">{icon}</span>";
431 icon-size = iconSize; 434 icon-size = iconSize;
432 tooltip-format = "{volume}% {desc}"; 435 tooltip-format = "{volume}% {desc}";
433 format-icons = ["&#xf057f;" "&#xf0580;" "&#xf057e;"]; 436 format-icons = ["&#xf057f;" "&#xf0580;" "&#xf057e;"];
434 format-muted = "&#xf075f;"; 437 format-muted = "<span font=\"Symbols Nerd Font Mono\" size=\"90%\">&#xf075f;</span>";
435 ignored-sinks = ["Easy Effects Sink"]; 438 # ignored-sinks = ["Easy Effects Sink"];
436 on-scroll-up = "volumectl -d -u up"; 439 on-scroll-up = "volumectl -d -u up";
437 on-scroll-down = "volumectl -d -u down"; 440 on-scroll-down = "volumectl -d -u down";
438 on-click = "volumectl -d toggle-mute"; 441 on-click = "volumectl -d toggle-mute";
@@ -518,10 +521,8 @@ in {
518 #tray { 521 #tray {
519 margin: 0; 522 margin: 0;
520 } 523 }
521 #battery, #idle_inhibitor, #backlight, #pulseaudio { 524 #battery, #idle_inhibitor, #backlight, #wireplumber {
522 color: @grey; 525 color: @grey;
523 }
524 #battery, #pulseaudio, #backlight, #idle_inhibitor {
525 margin: 0 5px 0 2px; 526 margin: 0 5px 0 2px;
526 } 527 }
527 #battery.discharging { 528 #battery.discharging {
@@ -721,7 +722,7 @@ in {
721 722
722 home = { 723 home = {
723 packages = with pkgs; [ 724 packages = with pkgs; [
724 fira fira-code powerline-fonts nerdfonts pavucontrol 725 fira fira-code powerline-fonts nerdfonts pwvucontrol
725 wrappedKeepassxc wl-clipboard-rs mumble pulseaudio-ctl 726 wrappedKeepassxc wl-clipboard-rs mumble pulseaudio-ctl
726 pamixer libnotify screen-message wrappedYTMDesktop qt5ct 727 pamixer libnotify screen-message wrappedYTMDesktop qt5ct
727 playerctl evince thunderbird zoom-us steam steam-run 728 playerctl evince thunderbird zoom-us steam steam-run
diff --git a/accounts/gkleen@sif/hyprland.nix b/accounts/gkleen@sif/hyprland.nix
index bdcd32a6..f77856f3 100644
--- a/accounts/gkleen@sif/hyprland.nix
+++ b/accounts/gkleen@sif/hyprland.nix
@@ -261,7 +261,7 @@ in {
261 261
262 "$mainMod CTRL, return, togglespecialworkspace, term" 262 "$mainMod CTRL, return, togglespecialworkspace, term"
263 "$mainMod CTRL, e, togglespecialworkspace, edit" 263 "$mainMod CTRL, e, togglespecialworkspace, edit"
264 "$mainMod CTRL, a, togglespecialworkspace, pavucontrol" 264 "$mainMod CTRL, a, togglespecialworkspace, pwvucontrol"
265 "$mainMod CTRL, o, togglespecialworkspace, easyeffects" 265 "$mainMod CTRL, o, togglespecialworkspace, easyeffects"
266 "$mainMod CTRL, b, togglespecialworkspace, blueman" 266 "$mainMod CTRL, b, togglespecialworkspace, blueman"
267 "$mainMod CTRL, p, togglespecialworkspace, keepass" 267 "$mainMod CTRL, p, togglespecialworkspace, keepass"
@@ -293,7 +293,7 @@ in {
293 "suppressevent maximize fullscreen, class:.*" 293 "suppressevent maximize fullscreen, class:.*"
294 294
295 # "maximize, class:^(Element|thunderbird)$" 295 # "maximize, class:^(Element|thunderbird)$"
296 "workspace special:pavucontrol, class:^org\.pulseaudio\.pavucontrol$" 296 "workspace special:pwvucontrol, class:^com\.saivert\.pwvucontrol$"
297 "workspace special:easyeffects, class:^com\.github\.wwmm\.easyeffects$" 297 "workspace special:easyeffects, class:^com\.github\.wwmm\.easyeffects$"
298 "workspace special:blueman, class:^\.blueman-manager-wrapped$" 298 "workspace special:blueman, class:^\.blueman-manager-wrapped$"
299 "workspace special:keepass silent, class:^org\.keepassxc\.KeePassXC$, title:^(?!Unlock Database.*)(?!.*Access Request)" 299 "workspace special:keepass silent, class:^org\.keepassxc\.KeePassXC$, title:^(?!Unlock Database.*)(?!.*Access Request)"
@@ -320,7 +320,7 @@ in {
320 320
321 "special:term, on-created-empty:kitty" 321 "special:term, on-created-empty:kitty"
322 "special:edit, on-created-empty:emacsclient -c" 322 "special:edit, on-created-empty:emacsclient -c"
323 "special:pavucontrol, on-created-empty:pavucontrol" 323 "special:pwvucontrol, on-created-empty:pwvucontrol"
324 "special:easyeffects, on-created-empty:easyeffects" 324 "special:easyeffects, on-created-empty:easyeffects"
325 "special:blueman, on-created-empty:blueman-manager" 325 "special:blueman, on-created-empty:blueman-manager"
326 "special:keepass, on-created-empty:keepassxc" 326 "special:keepass, on-created-empty:keepassxc"