diff --git a/home/desktop/config/waybar/layout.json b/home/desktop/config/waybar/layout.json deleted file mode 100644 index b65f62fc..00000000 --- a/home/desktop/config/waybar/layout.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "layer": "top", - "position": "top", - "spacing": 10, - "margin-top": 10, - "margin-left": 20, - "margin-right": 20, - "margin-bottom": 5 -} - -// vim: ft=json diff --git a/home/desktop/config/waybar/macchiato.css b/home/desktop/config/waybar/macchiato.css deleted file mode 100644 index 68804731..00000000 --- a/home/desktop/config/waybar/macchiato.css +++ /dev/null @@ -1,37 +0,0 @@ -/* -* -* Catppuccin Macchiato palette -* Maintainer: rubyowo -* -*/ - -@define-color base #24273a; -@define-color mantle #1e2030; -@define-color crust #181926; - -@define-color text #cad3f5; -@define-color subtext0 #a5adcb; -@define-color subtext1 #b8c0e0; - -@define-color surface0 #363a4f; -@define-color surface1 #494d64; -@define-color surface2 #5b6078; - -@define-color overlay0 #6e738d; -@define-color overlay1 #8087a2; -@define-color overlay2 #939ab7; - -@define-color blue #8aadf4; -@define-color lavender #b7bdf8; -@define-color sapphire #7dc4e4; -@define-color sky #91d7e3; -@define-color teal #8bd5ca; -@define-color green #a6da95; -@define-color yellow #eed49f; -@define-color peach #f5a97f; -@define-color maroon #ee99a0; -@define-color red #ed8796; -@define-color mauve #c6a0f6; -@define-color pink #f5bde6; -@define-color flamingo #f0c6c6; -@define-color rosewater #f4dbd6; diff --git a/home/desktop/config/waybar/modules.json b/home/desktop/config/waybar/modules.json deleted file mode 100644 index eaacc389..00000000 --- a/home/desktop/config/waybar/modules.json +++ /dev/null @@ -1,192 +0,0 @@ -{ - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": "{name} {icon}", - "format-icons": { - "locked": "", - "unlocked": "" - } - }, - "tray": { - "spacing": 10 - }, - "clock": { - "format": "{:%A %Y-%m-%d 󰃭 | %R 󰅐 }", - "tooltip-format": "{calendar}", - "calendar": { - "mode": "year", - "mode-mon-col": 3, - "weeks-pos": "right", - "on-scroll": 1, - "on-click-right": "mode", - "format": { - "months": "{}", - "days": "{}", - "weeks": "W{}", - "weekdays": "{}", - "today": "{}" - } - }, - "actions": { - "on-click-right": "mode", - "on-click-forward": "tz_up", - "on-click-backward": "tz_down", - "on-scroll-up": "shift_up", - "on-scroll-down": "shift_down" - } - }, - "clock#compact": { - "format": "{:%R 󰅐 }", - "tooltip-format": "{:%A %Y-%m-%d 󰃭 }" - }, - "cpu": { - "format": "{usage}% 󰻠", - "tooltip": false - }, - "memory": { - "format": "{}% 󰍛" - }, - "temperature": { - "critical-threshold": 80, - "format": "{temperatureC}°C {icon}", - "format-icons": [ - "󱃃", - "󰔏", - "󱃂" - ] - }, - "backlight": { - "format": "{percent}% {icon}", - "format-icons": [ - "", - "", - "", - "", - "", - "", - "", - "", - "" - ] - }, - "battery": { - "states": { - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-charging": "{capacity}% 󰂄", - "format-plugged": "{capacity}% 󰚥", - "format-alt": "{time} {icon}", - "format-icons": [ - "󱃍", - "󰁺", - "󰁻", - "󰁼", - "󰁽", - "󰁾", - "󰁿", - "󰂀", - "󰂁", - "󰂂", - "󰁹" - ] - }, - "network": { - "format-wifi": "{essid} ({signalStrength}%) 󰖩", - "format-ethernet": "Connected 󰈁", - "tooltip-format": "{ifname}", - "format-linked": "{ifname} (No IP) 󰈁", - "format-disconnected": "Disconnected 󰈂", - "format-alt": "{ifname}: {ipaddr}/{cidr}", - "on-click": "nm-connection-editor" - }, - "network#compact": { - "format-wifi": "({signalStrength}%) 󰖩", - "format-ethernet": "󰈁", - "tooltip-format": "{essid}", - "format-linked": "(No IP) 󰈁", - "format-disconnected": "󰈂", - "on-click": "nm-connection-editor" - }, - "bluetooth": { - "format": "󰂯 {status}", - "format-disabled": "󰂲 {status}", - "format-off": "󰂲 {status}", - "format-on": "󰂯 {status}", - "format-connected": "󰂱 {device_alias}", - "on-click": "blueman-manager" - }, - "pulseaudio": { - "scroll-step": 5, - "format": "{volume}% {icon} {format_source}", - "format-bluetooth": "{volume}% {icon} {format_source}", - "format-bluetooth-muted": "󰝟 {icon} {format_source}", - "format-muted": "󰝟 {format_source}", - "format-source": "{volume}% 󰍬", - "format-source-muted": "󰍭", - "format-icons": { - "headphone": "󰋋", - "hands-free": "󰥰", - "headset": "󰋎", - "phone": "󰏲", - "portable": "󰏳", - "car": "󰄍", - "default": [ - "󰕿", - "󰖀", - "󰕾" - ] - }, - "on-click": "pavucontrol" - }, - "pulseaudio#compact": { - "scroll-step": 5, - "format": "{icon} {format_source}", - "format-bluetooth": "{icon} {format_source}", - "format-bluetooth-muted": "󰝟 {icon} {format_source}", - "format-muted": "󰝟 {format_source}", - "format-source": "󰍬", - "format-source-muted": "󰍭", - "format-icons": { - "headphone": "󰋋", - "hands-free": "󰥰", - "headset": "󰋎", - "phone": "󰏲", - "portable": "󰏳", - "car": "󰄍", - "default": [ - "󰕿", - "󰖀", - "󰕾" - ] - }, - "on-click": "pavucontrol" - }, - "custom/power": { - "format": "󰐥", - "on-click": "powermenu" - }, - "wlr/workspaces": { - "on-click": "activate", - "disable-scroll": true, - "all-outputs": true, - "format": "{icon}", - "format-icons": { - "1": "󰟀", - "2": "󰅴", - "3": "󰈹", - "4": "󰝰", - "5": "󰭹", - "6": "", - "7": "󰓓", - "8": "󰣙", - "urgent": "", - "default": "󰣘" - }, - "sort-by-name": true, - "sort-by-coordinates": false, - "sort-by-number": false - } -} diff --git a/home/desktop/config/waybar/style.css b/home/desktop/config/waybar/style.css deleted file mode 100644 index 6aa32280..00000000 --- a/home/desktop/config/waybar/style.css +++ /dev/null @@ -1,122 +0,0 @@ -@import 'macchiato.css'; - -* { - border: none; - border-radius: 10px; - font-family: "FiraCode Nerd Font"; - font-size: 18px; -} - -window#waybar { - background: transparent; -} -window#waybar.hidden { - opacity: 0.2; -} -#window { - margin-top: 6px; - padding-left: 10px; - padding-right: 10px; - border-radius: 10px; - transition: none; - color: transparent; - background: transparent; -} - -#workspaces button { - transition: none; - color: @overlay0; - box-shadow: inset 0 -3px transparent; - border-radius: 2px; -} -#workspaces button.active, -#workspaces button.focused { - color: @base; -} -#workspaces button:hover { - transition: none; - box-shadow: inherit; - text-shadow: inherit; - color: @base; - border-color: #e8a2af; - color: @base; -} -#workspaces button.focused:hover { - color: @base; -} - -/* left section */ -#clock, -#cpu, -#memory, -#temperature, -/* centre section */ -#workspaces, -/* right section */ -#pulseaudio, -#bluetooth, -#network, -#backlight, -#battery, -#tray { - margin-top: 0px; - margin-bottom: 0px; - margin-left: 0px; - margin-right: 0px; - padding-left: 10px; - padding-right: 10px; - transition: none; - color: @crust; - background: @lavender; -} - -#clock { - background: @lavender; -} -#cpu { - background: @pink; -} -#memory { - background: @mauve; -} -#temperature { - background: @red; -} -#workspaces { - background: @yellow; -} -#pulseaudio { - background: @green; -} -#bluetooth { - background: @teal; -} -#network { - background: @sky; -} -#backlight { - background: @sapphire; -} -#battery { - background: @blue; -} -#battery.charging, -#battery.plugged { - background-color: @blue; -} -#battery.critical:not(.charging) { - background-color: @blue; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: linear; - animation-iteration-count: infinite; - animation-direction: alternate; -} -@keyframes blink { -to { - color: @red; -} -} -#tray { - color: @base; -} diff --git a/home/desktop/hyprland.nix b/home/desktop/hyprland.nix index b1151f74..804dc2ea 100644 --- a/home/desktop/hyprland.nix +++ b/home/desktop/hyprland.nix @@ -49,7 +49,8 @@ in { hidpi = true; }; extraConfig = '' - exec-once = waybar & hyprpaper & dunst + exec-once = dunst + exec-once = hyprpaper source = ./macchiato.conf source = ./display.conf @@ -112,14 +113,14 @@ in { # See https://wiki.hyprland.org/Configuring/Keywords/ for more bind = SUPER, Return, exec, wezterm bind = SUPER, Space, exec, pkill rofi || rofi -show drun - bind = SUPER, W, exec, firefox + bind = SUPER SHIFT, Space, togglefloating, + bind = SUPER, W, exec, pgrep firefox > /dev/null || firefox bind = SUPER, E, exec, thunar bind = SUPER, Q, killactive, + bind = SUPER SHIFT, Q, exec, powermenu bind = SUPER, F1, exec, swaylock bind = SUPER, M, fullscreen, 1 bind = SUPER SHIFT, M, fullscreen, 0 - bind = SUPER SHIFT, P, exec, powermenu - bind = SUPER SHIFT, Space, togglefloating, bind=,Print,exec,grim -g "$(slurp)" bind=,XF86AudioMute,exec,pamixer -t @@ -139,41 +140,40 @@ in { bind = SUPER, A, moveworkspacetomonitor, 1 current bind = SUPER, A, workspace, 1 - bind = SUPER, S, moveworkspacetomonitor, 2 current - bind = SUPER, S, workspace, 2 - bind = SUPER, D, moveworkspacetomonitor, 3 current - bind = SUPER, D, workspace, 3 + bind = SUPER SHIFT, A, movetoworkspace, 1 + bind = SUPER, D, moveworkspacetomonitor, 2 current + bind = SUPER, D, workspace, 2 + bind = SUPER SHIFT, D, movetoworkspace, 2 + bind = SUPER, W, moveworkspacetomonitor, 3 current + bind = SUPER, W, workspace, 3 + bind = SUPER SHIFT, W, movetoworkspace, 3 bind = SUPER, F, moveworkspacetomonitor, 4 current bind = SUPER, F, workspace, 4 - bind = SUPER, U, moveworkspacetomonitor, 5 current - bind = SUPER, U, workspace, 5 - bind = SUPER, I, moveworkspacetomonitor, 6 current - bind = SUPER, I, workspace, 6 - bind = SUPER, O, moveworkspacetomonitor, 7 current - bind = SUPER, O, workspace, 7 - bind = SUPER, P, moveworkspacetomonitor, 8 current - bind = SUPER, P, workspace, 8 - bind = SUPER SHIFT, A, movetoworkspace, 1 - bind = SUPER SHIFT, S, movetoworkspace, 2 - bind = SUPER SHIFT, D, movetoworkspace, 3 bind = SUPER SHIFT, F, movetoworkspace, 4 - bind = SUPER SHIFT, U, movetoworkspace, 5 - bind = SUPER SHIFT, I, movetoworkspace, 6 - bind = SUPER SHIFT, O, movetoworkspace, 7 - bind = SUPER SHIFT, P, movetoworkspace, 8 + bind = SUPER, C, moveworkspacetomonitor, 5 current + bind = SUPER, C, workspace, 5 + bind = SUPER SHIFT, C, movetoworkspace, 5 + bind = SUPER, R, moveworkspacetomonitor, 6 current + bind = SUPER, R, workspace, 6 + bind = SUPER SHIFT, R, movetoworkspace, 6 + bind = SUPER, S, moveworkspacetomonitor, 7 current + bind = SUPER, S, workspace, 7 + bind = SUPER SHIFT, S, movetoworkspace, 7 bind = SUPER, period, workspace, m+1 + bind = SUPER SHIFT, period, movetoworkspace, r+1 bind = SUPER, comma, workspace, m-1 + bind = SUPER SHIFT, comma, movetoworkspace, r-1 bind = SUPER, bracketright, focusmonitor, +1 - bind = SUPER, bracketleft, focusmonitor, -1 bind = SUPER SHIFT, bracketright, movecurrentworkspacetomonitor, +1 + bind = SUPER, bracketleft, focusmonitor, -1 bind = SUPER SHIFT, bracketleft, movecurrentworkspacetomonitor, -1 bind = SUPER, N, workspace, empty - bind = SUPER, C, togglespecialworkspace - bind = SUPER, tab, workspace, previous bind = SUPER SHIFT, N, movetoworkspace, empty - bind = SUPER SHIFT, C, movetoworkspace, special + bind = SUPER, minus, togglespecialworkspace + bind = SUPER SHIFT, minus, movetoworkspace, special + bind = SUPER, tab, workspace, previous bind = SUPER SHIFT, tab, movetoworkspace, previous # Move/resize windows with mainMod + LMB/RMB and dragging diff --git a/home/desktop/waybar/modules/wlr_workspaces.nix b/home/desktop/waybar/modules/wlr_workspaces.nix index ebc54aba..819c1107 100644 --- a/home/desktop/waybar/modules/wlr_workspaces.nix +++ b/home/desktop/waybar/modules/wlr_workspaces.nix @@ -11,9 +11,9 @@ "5" = "󰭹"; "6" = ""; "7" = "󰓓"; - "8" = "󰣙"; + "8" = "󰣘"; + "9" = "󰣙"; urgent = ""; - default = "󰣘"; }; sort-by-number = true; }