diff --git a/river/.config/river/init b/river/.config/river/init index eb1c434..57a3bf4 100755 --- a/river/.config/river/init +++ b/river/.config/river/init @@ -4,7 +4,7 @@ term="foot" term_client="footclient" term_float="foot --app-id=float -w 1120x700" -browser="qutebrowser" +browser="librewolf" email="thunderbird" emacs="emacsclient --create-frame --alternate-editor='emacs'" mod=Super @@ -177,7 +177,7 @@ riverctl rule-add -app-id com.github.xournalpp.xournalpp ssd # spawn stuff pgrep wbg || wbg ~/.config/wallpaper.png & -wlr-randr --output eDP-1 --scale 1.25 +wlr-randr --output eDP-1 --scale 1.25 & pgrep waybar || waybar & # mako stuff diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config deleted file mode 100644 index 9cbcc5d..0000000 --- a/waybar/.config/waybar/config +++ /dev/null @@ -1,99 +0,0 @@ -// -*- mode: json -*- - -{ - "layer": "top", - "position": "bottom", - "height" : 36, - - "modules-left": [ - "niri/workspaces", - ], - "modules-center": [ - "clock", - ], - "modules-right": [ - "tray", - "pulseaudio", - "network", - "battery", - ], - - "river/tags": { - "format": "{icon}", - "format-icons": { - "1": " 1 ", - "2": " 2 ", - "3": " 3 ", - "4": " 4 ", - "5": " 5 ", - "6": " 6 ", - "7": " 7 ", - "8": " 8 ", - "9": " 9 ", - }, - }, - - "clock": { - "format": "{:%H:%M %A, %B %d}", - "tooltip": false - }, - - "pulseaudio": { - "format": "{icon} {volume:2}%", - "format-bluetooth": "{icon} {volume}%", - "format-muted": "MUTE", - "format-icons": { - "headphones": "", - "default": [ - "", - "" - ] - }, - "scroll-step": 5, - "on-click": "pamixer -t", - "on-click-right": "pavucontrol" - }, - - "network": { - "interface": "wlan0", - "format": "{ifname}", - "format-wifi": "{essid} ({signalStrength}%)  ", - "format-ethernet": "{ipaddr}/{cidr} ", - "format-disconnected": "", - "tooltip-format": "{ifname} via {gwaddr} ", - "tooltip-format-wifi": "{essid} ({signalStrength}%)  ", - "tooltip-format-ethernet": "{ifname} ", - "tooltip-format-disconnected": "Disconnected", - "max-length": 50 - }, - - "battery": { - "bat": "BAT0", - "interval": 60, - "states": { - "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{icon} {capacity}%", - "format-icons": [ - "", - "", - "", - "", - "" - ] - }, - - "tray": { - "icon-size": 20 - }, - - "niri/workspaces": { - "format": "{icon}", - "format-icons": { - "active": "", - "default": "" - } - } -} diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config new file mode 120000 index 0000000..891ea04 --- /dev/null +++ b/waybar/.config/waybar/config @@ -0,0 +1 @@ +config-niri \ No newline at end of file diff --git a/waybar/.config/waybar/config-niri b/waybar/.config/waybar/config-niri new file mode 100644 index 0000000..9cbcc5d --- /dev/null +++ b/waybar/.config/waybar/config-niri @@ -0,0 +1,99 @@ +// -*- mode: json -*- + +{ + "layer": "top", + "position": "bottom", + "height" : 36, + + "modules-left": [ + "niri/workspaces", + ], + "modules-center": [ + "clock", + ], + "modules-right": [ + "tray", + "pulseaudio", + "network", + "battery", + ], + + "river/tags": { + "format": "{icon}", + "format-icons": { + "1": " 1 ", + "2": " 2 ", + "3": " 3 ", + "4": " 4 ", + "5": " 5 ", + "6": " 6 ", + "7": " 7 ", + "8": " 8 ", + "9": " 9 ", + }, + }, + + "clock": { + "format": "{:%H:%M %A, %B %d}", + "tooltip": false + }, + + "pulseaudio": { + "format": "{icon} {volume:2}%", + "format-bluetooth": "{icon} {volume}%", + "format-muted": "MUTE", + "format-icons": { + "headphones": "", + "default": [ + "", + "" + ] + }, + "scroll-step": 5, + "on-click": "pamixer -t", + "on-click-right": "pavucontrol" + }, + + "network": { + "interface": "wlan0", + "format": "{ifname}", + "format-wifi": "{essid} ({signalStrength}%)  ", + "format-ethernet": "{ipaddr}/{cidr} ", + "format-disconnected": "", + "tooltip-format": "{ifname} via {gwaddr} ", + "tooltip-format-wifi": "{essid} ({signalStrength}%)  ", + "tooltip-format-ethernet": "{ifname} ", + "tooltip-format-disconnected": "Disconnected", + "max-length": 50 + }, + + "battery": { + "bat": "BAT0", + "interval": 60, + "states": { + "good": 95, + "warning": 30, + "critical": 15 + }, + "format": "{icon} {capacity}%", + "format-icons": [ + "", + "", + "", + "", + "" + ] + }, + + "tray": { + "icon-size": 20 + }, + + "niri/workspaces": { + "format": "{icon}", + "format-icons": { + "active": "", + "default": "" + } + } +} diff --git a/waybar/.config/waybar/config-river b/waybar/.config/waybar/config-river new file mode 100644 index 0000000..c0df4ad --- /dev/null +++ b/waybar/.config/waybar/config-river @@ -0,0 +1,91 @@ +// -*- mode: json -*- + +{ + "layer": "top", + "position": "bottom", + "height" : 36, + + "modules-left": [ + "river/tags", + ], + "modules-center": [ + "clock", + ], + "modules-right": [ + "tray", + "pulseaudio", + "network", + "battery", + ], + + "river/tags": { + "format": "{icon}", + "format-icons": { + "1": " 1 ", + "2": " 2 ", + "3": " 3 ", + "4": " 4 ", + "5": " 5 ", + "6": " 6 ", + "7": " 7 ", + "8": " 8 ", + "9": " 9 ", + }, + }, + + "clock": { + "format": "{:%H:%M %A, %B %d}", + "tooltip": false + }, + + "pulseaudio": { + "format": "{icon} {volume:2}%", + "format-bluetooth": "{icon} {volume}%", + "format-muted": "MUTE", + "format-icons": { + "headphones": "", + "default": [ + "", + "" + ] + }, + "scroll-step": 5, + "on-click": "pamixer -t", + "on-click-right": "pavucontrol" + }, + + "network": { + "interface": "wlan0", + "format": "{ifname}", + "format-wifi": "{essid} ({signalStrength}%)  ", + "format-ethernet": "{ipaddr}/{cidr} ", + "format-disconnected": "", + "tooltip-format": "{ifname} via {gwaddr} ", + "tooltip-format-wifi": "{essid} ({signalStrength}%)  ", + "tooltip-format-ethernet": "{ifname} ", + "tooltip-format-disconnected": "Disconnected", + "max-length": 50 + }, + + "battery": { + "bat": "BAT0", + "interval": 60, + "states": { + "good": 95, + "warning": 30, + "critical": 15 + }, + "format": "{icon} {capacity}%", + "format-icons": [ + "", + "", + "", + "", + "" + ] + }, + + "tray": { + "icon-size": 20 + } +}