diff options
9 files changed, 290 insertions, 295 deletions
diff --git a/home/ebisu/fortune/communication/default.nix b/home/ebisu/fortune/communication/default.nix index 551e90c..a6d40b1 100644 --- a/home/ebisu/fortune/communication/default.nix +++ b/home/ebisu/fortune/communication/default.nix @@ -8,5 +8,6 @@ home.packages = with pkgs; [ revolt-desktop newsboat + pidgin ]; } diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/animations.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/animations.nix index c47c164..a61026d 100644 --- a/home/ebisu/fortune/desktop/hyprland/hyprland/animations.nix +++ b/home/ebisu/fortune/desktop/hyprland/hyprland/animations.nix @@ -1,86 +1,84 @@ -_: { - wayland.windowManager.hyprland = { - extraConfig = '' - # animations { - # enabled = yes +{ + wayland.windowManager.hyprland.extraConfig = '' + # animations { + # enabled = yes - # # bezier = myBezier, 0.05, 0.9, 0.1, 1.05 + # # bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - # # animation = windows, 1, 5, myBezier - # # animation = windowsOut, 1, 7, default, popin - # # animation = border, 1, 10, default - # # animation = fade, 1, 7, default - # # animation = workspaces, 1, 6, default, slidevert + # # animation = windows, 1, 5, myBezier + # # animation = windowsOut, 1, 7, default, popin + # # animation = border, 1, 10, default + # # animation = fade, 1, 7, default + # # animation = workspaces, 1, 6, default, slidevert - # # bezier = overshot,0.5,0.1,0.4,1.2 + # # bezier = overshot,0.5,0.1,0.4,1.2 - # # animation = global, 1, 3, default - # # animation = workspaces, 1, 4, default - # # animation = windowsMove, 1, 2, default - # # animation = fade, 1, 2, default + # # animation = global, 1, 3, default + # # animation = workspaces, 1, 4, default + # # animation = windowsMove, 1, 2, default + # # animation = fade, 1, 2, default - # bezier = overshot, 0.05, 0.5, 0.1, 1.05 - # bezier = smoothOut, 0.36, 0, 0.66, -0.56 - # bezier = smoothIn, 0.25, 0.8, 0.5, 1 + # bezier = overshot, 0.05, 0.5, 0.1, 1.05 + # bezier = smoothOut, 0.36, 0, 0.66, -0.56 + # bezier = smoothIn, 0.25, 0.8, 0.5, 1 - # animation = windows, 1, 5, overshot, slide - # animation = windowsOut, 1, 4, smoothOut, slide - # animation = windowsMove, 1, 4, default - # animation = border, 1, 10, default - # animation = fade, 1, 10, smoothIn - # animation = fadeDim, 1, 10, smoothIn - # animation = workspaces, 1, 6, default - # } + # animation = windows, 1, 5, overshot, slide + # animation = windowsOut, 1, 4, smoothOut, slide + # animation = windowsMove, 1, 4, default + # animation = border, 1, 10, default + # animation = fade, 1, 10, smoothIn + # animation = fadeDim, 1, 10, smoothIn + # animation = workspaces, 1, 6, default + # } - bezier = smoothIn, 0.25, 1, 0.5, 1 - bezier = wind, 0.05, 0.9, 0.1, 1.06 - bezier = winIn, 0.1, 1.1, 0.1, 1.05 - bezier = linear, 1, 1, 1, 1 + bezier = smoothIn, 0.25, 1, 0.5, 1 + bezier = wind, 0.05, 0.9, 0.1, 1.06 + bezier = winIn, 0.1, 1.1, 0.1, 1.05 + bezier = linear, 1, 1, 1, 1 - animations { - enabled = yes + animations { + enabled = yes - # buttery_smoooooooth... (slide) - # animation = windows, 1, 5, default, slide - # animation = windowsOut, 1, 8, smoothIn, slide - # animation = windowsMove, 1, 7, default - # animation = fade, 1, 5, smoothIn - # animation = fadeOut, 1, 4, smoothIn - # animation = fadeDim, 1, 3, smoothIn - # animation = workspaces, 1, 5, default, slidefadevert - # animation = specialWorkspace, 1, 5, default, fade + # buttery_smoooooooth... (slide) + # animation = windows, 1, 5, default, slide + # animation = windowsOut, 1, 8, smoothIn, slide + # animation = windowsMove, 1, 7, default + # animation = fade, 1, 5, smoothIn + # animation = fadeOut, 1, 4, smoothIn + # animation = fadeDim, 1, 3, smoothIn + # animation = workspaces, 1, 5, default, slidefadevert + # animation = specialWorkspace, 1, 5, default, fade - # buttery_smoooooooth... (Popin...) - # animation = windows, 1, 3, default, popin 70% - # animation = windowsOut, 1, 20, default, popin 85% - # animation = windowsMove, 1, 7, default - # animation = fade, 1, 6, smoothIn - # animation = fadeOut, 1, 3, smoothIn - # animation = fadeDim, 1, 3, smoothIn - # animation = workspaces, 1, 5, wind, slidefadevert 40% + # buttery_smoooooooth... (Popin...) + # animation = windows, 1, 3, default, popin 70% + # animation = windowsOut, 1, 20, default, popin 85% + # animation = windowsMove, 1, 7, default + # animation = fade, 1, 6, smoothIn + # animation = fadeOut, 1, 3, smoothIn + # animation = fadeDim, 1, 3, smoothIn + # animation = workspaces, 1, 5, wind, slidefadevert 40% - # fasssstt popin - animation = windows, 1, 2, default, popin 80% - animation = windowsOut, 1, 5, default, popin 90% - animation = windowsMove, 1, 5, default - animation = layers, 1, 3, default, popin 90% - animation = fade, 1, 4, smoothIn - animation = fadeOut, 1, 2, smoothIn - animation = fadeDim, 1, 3, smoothIn - animation = workspaces, 1, 3, default, slidefadevert 15% - animation = specialWorkspace, 1, 3, default, slidefadevert 15% + # fasssstt popin + animation = windows, 1, 2, default, popin 80% + animation = windowsOut, 1, 5, default, popin 90% + animation = windowsMove, 1, 5, default + animation = layers, 1, 3, default, popin 90% + animation = fade, 1, 4, smoothIn + animation = fadeOut, 1, 2, smoothIn + animation = fadeDim, 1, 3, smoothIn + animation = workspaces, 1, 3, default, slidefadevert 15% + animation = specialWorkspace, 1, 3, default, slidefadevert 15% - # Random... - # animation = windows, 1, 5, wind, slide - # animation = windowsIn, 1, 4, winIn, slide - # animation = windowsOut, 1 , 7, smoothIn, slide - # animation = windowsMove, 1, 6, default - # animation = fade, 1, 5, smoothIn - # animation = fadeOut, 1, 3, smoothIn - # animation = fadeDim, 1, 3, smoothIn - # animation = workspaces, 1, 4, wind, slidefadevert 15% - # animation = specialWorkspace, 1, 3, default, slidefadevert 15% - } - ''; - }; + # Random... + # animation = windows, 1, 5, wind, slide + # animation = windowsIn, 1, 4, winIn, slide + # animation = windowsOut, 1 , 7, smoothIn, slide + # animation = windowsMove, 1, 6, default + # animation = fade, 1, 5, smoothIn + # animation = fadeOut, 1, 3, smoothIn + # animation = fadeDim, 1, 3, smoothIn + # animation = workspaces, 1, 4, wind, slidefadevert 15% + # animation = specialWorkspace, 1, 3, default, slidefadevert 15% + } + ''; } diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/decoration.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/decoration.nix index feb9145..2625f42 100644 --- a/home/ebisu/fortune/desktop/hyprland/hyprland/decoration.nix +++ b/home/ebisu/fortune/desktop/hyprland/hyprland/decoration.nix @@ -1,4 +1,4 @@ -_: { +{ wayland.windowManager.hyprland.settings.decoration = { rounding = 10; drop_shadow = true; diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/default.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/default.nix index a121177..acebb6a 100644 --- a/home/ebisu/fortune/desktop/hyprland/hyprland/default.nix +++ b/home/ebisu/fortune/desktop/hyprland/hyprland/default.nix @@ -1,4 +1,4 @@ -_: { +{ imports = [ ./animations.nix ./binds.nix diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/executions.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/executions.nix index 2b2d18f..f9cd3c4 100644 --- a/home/ebisu/fortune/desktop/hyprland/hyprland/executions.nix +++ b/home/ebisu/fortune/desktop/hyprland/hyprland/executions.nix @@ -1,54 +1,52 @@ { pkgs, ... }: { - wayland.windowManager.hyprland.settings = { - exec-once = [ - # One-shots - "hyprctl dispatch workspace 1" - "swww-daemon" - "gammastep -l 45.540750:-122.385330 >/dev/null" - "${pkgs.pyprland}/bin/pypr" - "hyprpm reload" - "swaddle" - # "${pkgs.waybar}/bin/waybar" - "waybar" - "hyprctl setcursor Bibata-Modern-Ice 18" - "trayscale" + wayland.windowManager.hyprland.settings.exec-once = [ + # One-shots + "hyprctl dispatch workspace 1" + "swww-daemon" + "gammastep -l 45.540750:-122.385330 >/dev/null" + "${pkgs.pyprland}/bin/pypr" + "hyprpm reload" + "swaddle" + # "${pkgs.waybar}/bin/waybar" + "waybar" + "hyprctl setcursor Bibata-Modern-Ice 18" + "trayscale" - # Fcitx5 - "fcitx5-remote -r" - "fcitx5 -d --replace" - "fcitx5-remote -r" + # Fcitx5 + "fcitx5-remote -r" + "fcitx5 -d --replace" + "fcitx5-remote -r" - # KWallet - # "pam_kwallet_init" - # "kwalletd6" + # KWallet + # "pam_kwallet_init" + # "kwalletd6" - # GNOME/Keyring - "gnome-keyring-daemon --replace --components=pkcs11,secrets,ssh,gpg" - "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 || /usr/libexec/polkit-gnome-authentication-agent-1" + # GNOME/Keyring + "gnome-keyring-daemon --replace --components=pkcs11,secrets,ssh,gpg" + "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 || /usr/libexec/polkit-gnome-authentication-agent-1" - # XDG, XDPH, & Qt - "dbus-update-activation-environment --systemd --all" - "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - "systemctl --user import-environment QT_QPA_PLATFORMTHEME" - "$script_path/initialise_xdg_portal" + # XDG, XDPH, & Qt + "dbus-update-activation-environment --systemd --all" + "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" + "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" + "systemctl --user import-environment QT_QPA_PLATFORMTHEME" + "$script_path/initialise_xdg_portal" - # Clipboard - "wl-paste --type text --watch cliphist store" - "wl-paste --type image --watch cliphist store" + # Clipboard + "wl-paste --type text --watch cliphist store" + "wl-paste --type image --watch cliphist store" - # JamesDSP & Solaar - "jamesdsp -t" - # "solaar -w hide" + # JamesDSP & Solaar + "jamesdsp -t" + # "solaar -w hide" - # SSH - # "killall -q ssh-agent" - # "eval $(ssh-agent -c)" - # "set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK" - # "set -Ux SSH_AGENT_PID $SSH_AGENT_PID" - # "set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK" - # "export SSH_AUTH_SOCK=\"$XDG_RUNTIME_DIR/ssh-agent.socket\"" - ]; - }; + # SSH + # "killall -q ssh-agent" + # "eval $(ssh-agent -c)" + # "set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK" + # "set -Ux SSH_AGENT_PID $SSH_AGENT_PID" + # "set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK" + # "export SSH_AUTH_SOCK=\"$XDG_RUNTIME_DIR/ssh-agent.socket\"" + ]; } diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/general.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/general.nix index 088c7da..1ab0f8e 100644 --- a/home/ebisu/fortune/desktop/hyprland/hyprland/general.nix +++ b/home/ebisu/fortune/desktop/hyprland/hyprland/general.nix @@ -1,120 +1,118 @@ { config, ... }: { - wayland.windowManager.hyprland = { - settings = { - monitor = [ - "HDMI-A-2, [email protected], 0x0, 1" - "DP-2, [email protected], 1920x0, 1" - "DP-1, [email protected], 3840x0, 1" - ]; + wayland.windowManager.hyprland.settings = { + monitor = [ + "HDMI-A-2, [email protected], 0x0, 1" + "DP-2, [email protected], 1920x0, 1" + "DP-1, [email protected], 3840x0, 1" + ]; - source = "${config.home.homeDirectory}/.cache/wal/colors-hyprland"; + source = "${config.home.homeDirectory}/.cache/wal/colors-hyprland"; - general = { - gaps_in = 5; - gaps_out = 10; - border_size = 0; - layout = "master"; - allow_tearing = true; - resize_on_border = true; - no_focus_fallback = true; - }; - - input = { - kb_layout = "us"; - # kb_variant = - # kb_model = - # kb_options = - # kb_rules = - repeat_rate = 35; # 50 - repeat_delay = 250; # 200 - follow_mouse = 1; - special_fallthrough = true; + general = { + gaps_in = 5; + gaps_out = 10; + border_size = 0; + layout = "master"; + allow_tearing = true; + resize_on_border = true; + no_focus_fallback = true; + }; - touchpad = { - natural_scroll = true; - disable_while_typing = true; - clickfinger_behavior = true; - scroll_factor = 0.15; - tap-to-click = true; - middle_button_emulation = true; - }; + input = { + kb_layout = "us"; + # kb_variant = + # kb_model = + # kb_options = + # kb_rules = + repeat_rate = 35; # 50 + repeat_delay = 250; # 200 + follow_mouse = 1; + special_fallthrough = true; - sensitivity = -0.5; - accel_profile = "flat"; - scroll_factor = 1.0; - # natural_scroll = false; + touchpad = { + natural_scroll = true; + disable_while_typing = true; + clickfinger_behavior = true; + scroll_factor = 0.15; + tap-to-click = true; + middle_button_emulation = true; }; - binds = { - allow_workspace_cycles = true; - scroll_event_delay = 0; - workspace_back_and_forth = true; - }; + sensitivity = -0.5; + accel_profile = "flat"; + scroll_factor = 1.0; + # natural_scroll = false; + }; - dwindle = { - pseudotile = true; - preserve_split = true; - force_split = 2; - smart_split = false; - smart_resizing = false; - no_gaps_when_only = 0; - special_scale_factor = 0.98; - }; + binds = { + allow_workspace_cycles = true; + scroll_event_delay = 0; + workspace_back_and_forth = true; + }; - master = { - allow_small_split = true; - new_status = "master"; - mfact = 0.55; - # no_gaps_when_only = yes; - orientation = "left"; - inherit_fullscreen = false; - }; + dwindle = { + pseudotile = true; + preserve_split = true; + force_split = 2; + smart_split = false; + smart_resizing = false; + no_gaps_when_only = 0; + special_scale_factor = 0.98; + }; - gestures = { - workspace_swipe = true; - workspace_swipe_distance = 700; - workspace_swipe_fingers = 4; - workspace_swipe_cancel_ratio = 0.2; - workspace_swipe_min_speed_to_force = 5; - workspace_swipe_direction_lock = true; - workspace_swipe_direction_lock_threshold = 10; - workspace_swipe_create_new = true; - }; + master = { + allow_small_split = true; + new_status = "master"; + mfact = 0.55; + # no_gaps_when_only = yes; + orientation = "left"; + inherit_fullscreen = false; + }; - misc = { - vrr = false; - vfr = false; - enable_swallow = true; - swallow_regex = "^(kitty|footclient|foot|Alacritty|wezterm)$"; - disable_hyprland_logo = true; - disable_splash_rendering = true; - force_default_wallpaper = 0; - mouse_move_enables_dpms = true; - # key_press_enables_dpms = true; - # focus_on_activate = true; - animate_manual_resizes = true; - # animate_mouse_windowdragging = false; - mouse_move_focuses_monitor = true; - # new_window_takes_over_fullscreen = 2; - allow_session_lock_restore = true; - initial_workspace_tracking = false; - }; + gestures = { + workspace_swipe = true; + workspace_swipe_distance = 700; + workspace_swipe_fingers = 4; + workspace_swipe_cancel_ratio = 0.2; + workspace_swipe_min_speed_to_force = 5; + workspace_swipe_direction_lock = true; + workspace_swipe_direction_lock_threshold = 10; + workspace_swipe_create_new = true; + }; - cursor = { - hide_on_key_press = true; - enable_hyprcursor = true; - }; + misc = { + vrr = false; + vfr = false; + enable_swallow = true; + swallow_regex = "^(kitty|footclient|foot|Alacritty|wezterm)$"; + disable_hyprland_logo = true; + disable_splash_rendering = true; + force_default_wallpaper = 0; + mouse_move_enables_dpms = true; + # key_press_enables_dpms = true; + # focus_on_activate = true; + animate_manual_resizes = true; + # animate_mouse_windowdragging = false; + mouse_move_focuses_monitor = true; + # new_window_takes_over_fullscreen = 2; + allow_session_lock_restore = true; + initial_workspace_tracking = false; + }; - xwayland = { - force_zero_scaling = true; - }; + cursor = { + hide_on_key_press = true; + enable_hyprcursor = true; + }; - debug = { - watchdog_timeout = 0; - disable_logs = false; - damage_blink = false; - }; + xwayland = { + force_zero_scaling = true; + }; + + debug = { + watchdog_timeout = 0; + disable_logs = false; + damage_blink = false; }; }; } diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/plugins.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/plugins.nix index dc36858..5507491 100644 --- a/home/ebisu/fortune/desktop/hyprland/hyprland/plugins.nix +++ b/home/ebisu/fortune/desktop/hyprland/hyprland/plugins.nix @@ -1,4 +1,4 @@ -_: { +{ wayland.windowManager.hyprland.settings.plugin = { # split-monitor-workspaces = { # count = 10; diff --git a/home/ebisu/fortune/desktop/hyprland/hyprland/rules.nix b/home/ebisu/fortune/desktop/hyprland/hyprland/rules.nix index d933d5e..50d9262 100644 --- a/home/ebisu/fortune/desktop/hyprland/hyprland/rules.nix +++ b/home/ebisu/fortune/desktop/hyprland/hyprland/rules.nix @@ -1,79 +1,77 @@ -_: { - wayland.windowManager.hyprland = { - settings = { - # Layer Rules - layerrule = [ - "animation slide, notifications" - "noanim, selection" - "noanim, picker" - ]; +{ + wayland.windowManager.hyprland.settings = { + # Layer Rules + layerrule = [ + "animation slide, notifications" + "noanim, selection" + "noanim, picker" + ]; - windowrulev2 = [ - # Dialog Rules - "float, class:file_progress" - "float, class:confirm" - "float, class:dialog" - "float, class:download" - "float, class:notification" - "float, class:error" - "float, class:splash" - "float, class:confirmreset" - "float, title:Open File" - "float, title:Save File" - "float, title:branchdialog" - "float, title:^(Open File)(.*)$" - "float, title:^(Select a File)(.*)$" - "float, title:^(Choose wallpaper)(.*)$" - "float, title:^(Open Folder)(.*)$" - "float, title:^(Save As)(.*)$" - "float, title:^(Library)(.*)$" - "float, initialClass:^(xdg-desktop-portal-.*)$" + windowrulev2 = [ + # Dialog Rules + "float, class:file_progress" + "float, class:confirm" + "float, class:dialog" + "float, class:download" + "float, class:notification" + "float, class:error" + "float, class:splash" + "float, class:confirmreset" + "float, title:Open File" + "float, title:Save File" + "float, title:branchdialog" + "float, title:^(Open File)(.*)$" + "float, title:^(Select a File)(.*)$" + "float, title:^(Choose wallpaper)(.*)$" + "float, title:^(Open Folder)(.*)$" + "float, title:^(Save As)(.*)$" + "float, title:^(Library)(.*)$" + "float, initialClass:^(xdg-desktop-portal-.*)$" - # Control Application Rules - "float, class:^(Network)$" - "float, class:^(pavucontrol)$" - "float, class:^(Color Picker)$" - "float, class:^(File Picker)$" - "float, class:^(nm-connection-editor)$" - "float, class:pavucontrol-qt" - "float, class:pavucontrol" - "float, title:^(Media viewer)$" - "float, title:^(Volume Control)$" - "float, title:^(Picture-in-Picture)$" - "float, class:^(blueberry.py)$" - "float, class:Lxappearance" - "pseudo, class:fcitx" - "size 50% 50%, title:^(Volume Control)$" + # Control Application Rules + "float, class:^(Network)$" + "float, class:^(pavucontrol)$" + "float, class:^(Color Picker)$" + "float, class:^(File Picker)$" + "float, class:^(nm-connection-editor)$" + "float, class:pavucontrol-qt" + "float, class:pavucontrol" + "float, title:^(Media viewer)$" + "float, title:^(Volume Control)$" + "float, title:^(Picture-in-Picture)$" + "float, class:^(blueberry.py)$" + "float, class:Lxappearance" + "pseudo, class:fcitx" + "size 50% 50%, title:^(Volume Control)$" - # Application Rules - "float, class:^(transmission-gtk)$" - "float, class:viewnior" - "float, class:feh" - "float, class:^(steam)$" - "float, class:file-roller" - "center, class:feh" - "workspace 9, initialTitle:^(Spotify Premium)$" - "tile, initialTitle:^(Photopea)$" - "tile, initialTitle:^(WorldsPlayer by Worlds Inc)$" - # "size 75% 75%, class:feh" + # Application Rules + "float, class:^(transmission-gtk)$" + "float, class:viewnior" + "float, class:feh" + "float, class:^(steam)$" + "float, class:file-roller" + "center, class:feh" + "workspace 9, initialTitle:^(Spotify Premium)$" + "tile, initialTitle:^(Photopea)$" + "tile, initialTitle:^(WorldsPlayer by Worlds Inc)$" + # "size 75% 75%, class:feh" - # XWayland Video Bridge - "noblur, class:^(xwaylandvideobridge)$" - "noanim, class:^(xwaylandvideobridge)$" - "noinitialfocus, class:^(xwaylandvideobridge)$" - "opacity 0.0 override, class:^(xwaylandvideobridge)$" - "maxsize 1 1, class:^(xwaylandvideobridge)$" + # XWayland Video Bridge + "noblur, class:^(xwaylandvideobridge)$" + "noanim, class:^(xwaylandvideobridge)$" + "noinitialfocus, class:^(xwaylandvideobridge)$" + "opacity 0.0 override, class:^(xwaylandvideobridge)$" + "maxsize 1 1, class:^(xwaylandvideobridge)$" - # Tearing - "immediate, class:.*\.exe" - "immediate, class:(steam_app)" + # Tearing + "immediate, class:.*\.exe" + "immediate, class:(steam_app)" - # Idle Inhibit - # "idleinhibit fullscreen, class:^(*)$" - # "idleinhibit fullscreen, title:^(*)$" - "idleinhibit fullscreen, fullscreen:1" - "idleinhibit focus, class:mpv" - ]; - }; + # Idle Inhibit + # "idleinhibit fullscreen, class:^(*)$" + # "idleinhibit fullscreen, title:^(*)$" + "idleinhibit fullscreen, fullscreen:1" + "idleinhibit focus, class:mpv" + ]; }; } diff --git a/home/ebisu/fortune/desktop/waybar/style.css b/home/ebisu/fortune/desktop/waybar/style.css index 121c792..b7e7f48 100644 --- a/home/ebisu/fortune/desktop/waybar/style.css +++ b/home/ebisu/fortune/desktop/waybar/style.css @@ -44,8 +44,9 @@ window#waybar { #custom-PBPbattery { /* padding: 0.25rem 0.75rem; */ /* margin: 10px 5px 0px 0; */ - padding: 5px 15px; - margin: 10px 1rem 0px 0; + /* padding: 6px 11.31px; */ /* 6 + (3 * (16 / 9)) */ + padding: 5px 10px; + margin: 10px 10px 0px 0; background-color: @background; border-radius: 10px; /* 9 */ color: @foreground; @@ -102,6 +103,7 @@ window#custom-media.empty #window { border-bottom-left-radius: 0; margin-left: 0; padding-left: 0.5rem; + margin-right: 0; } #bluetooth { |