diff options
Diffstat (limited to 'common/modules')
| -rw-r--r-- | common/modules/mango/default.nix | 25 | ||||
| -rw-r--r-- | common/modules/mango/waybar.nix | 17 |
2 files changed, 23 insertions, 19 deletions
diff --git a/common/modules/mango/default.nix b/common/modules/mango/default.nix index c7634e9..f8b1297 100644 --- a/common/modules/mango/default.nix +++ b/common/modules/mango/default.nix @@ -84,6 +84,8 @@ in { wayland.windowManager.mango = { enable = true; + systemd.enable = true; + systemd.variables = [ "--all" ]; settings = '' ${lib.optionalString (config.beeMods.matugen.enable) '' source=~/.config/mango/mango-colors.conf @@ -387,25 +389,20 @@ in env=GDK_BACKEND,wayland,x11 env=GDK_SCALE,1 - # exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP - exec-once = /bin/sh -c 'eval $(gnome-keyring-daemon --start --components=secrets,ssh); dbus-update-activation-environment --systemd --all' - exec-once = ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1 - + exec-once = ~/.config/mango/autostart.sh + ''; + autostart_sh = '' + wl-clip-persist --clipboard regular & + ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1 & ${lib.optionalString (config.services.picom.enable) '' - exec-once = systemctl --user stop picom.service + systemctl --user stop picom.service ''} - exec-once = sh ~/.swaybg - - ${lib.optionalString (cfg.waybar) '' - exec-once = waybar & - ''} - exec-once = dunst & - - exec-once = wl-clip-persist --clipboard regular + gnome-keyring-daemon --start --components=secrets,ssh,pkcs11 & + swww-daemon -q & ''; }; home.packages = with pkgs; [ - swaybg + swww wl-clipboard-rs wl-clip-persist ]; diff --git a/common/modules/mango/waybar.nix b/common/modules/mango/waybar.nix index f1e6712..fddaed4 100644 --- a/common/modules/mango/waybar.nix +++ b/common/modules/mango/waybar.nix @@ -8,6 +8,11 @@ in { programs.waybar = { enable = config.beeMods.mango.waybar; + systemd.enable = true; + systemd.target = "mango-session.target"; + package = pkgs.waybar.overrideAttrs (oldAttrs: { + mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; + }); settings = { mainBar = { @@ -27,6 +32,7 @@ in ]; modules-center = [ + # "cava" "mpris" ]; @@ -110,16 +116,17 @@ in network = { interval = 2; - format-wifi = "{essid} ({signalStrength}%) \uf1eb "; + format-wifi = " {essid} ({signalStrength}%)"; format-ethernet = " {ifname}"; - format-linked = "\uf059 No IP ({ifname})"; - format-disconnected = "\uf071 Disconnected"; + format-linked = " No IP ({ifname})"; + format-disconnected = " Disconnected"; tooltip-format = "{ifname} {ipaddr}/{cidr} via {gwaddr}"; format-alt = "↓{bandwidthDownBytes} ↑{bandwidthUpBytes}"; }; clock = { - format = "{:%H:%M} "; + # format = "{:%H:%M} "; # 24 hrs + format = "{:%I:%M %p} "; format-alt = "{:%A, %b %d} "; tooltip-format = "{:%Y}"; calendar = { @@ -157,7 +164,7 @@ in default = [ "" "" - "" + " " ]; }; ignored-sinks = [ "Easy Effects Sink" ]; |