Compare commits

...

2 Commits

Author SHA1 Message Date
Ryan 9f60672b4e feat(waybar): update waybar and xdg-desktop-portal 2024-01-24 20:53:24 +08:00
Ryan d9b78e8b0b feat: mpv, waybar, zathura 2024-01-14 17:53:01 +08:00
11 changed files with 56 additions and 202 deletions

View File

@ -30,7 +30,7 @@ layer = overlay
[colors]
background=282828ff
text=665c54ff
match=bdae93ff
match=928374ff
selection=3c3836ff
selection-text=ebdbb2ff
selection-match=ebdbb2ff

View File

@ -1,87 +0,0 @@
import argparse
import collections
import json
import pathlib
class Profile:
def __init__(self, object, json, groups_key="setting-groups"):
self.json = json
self.groups_key = groups_key
self._settings = []
self._shaders = []
self._collect(object)
def _collect(self, object):
self._settings.extend(object.get("settings", []))
self._shaders.extend(object.get("shaders", []))
for key in object.get(self.groups_key, []):
self._collect(self.json["setting-groups"][key])
parser = argparse.ArgumentParser()
parser.add_argument("--profile", default=None)
parser.add_argument(
"--path", default=f"{pathlib.Path.home()}/.config/mpv/default-shader-pack")
parser.add_argument("--config", default=False, action="store_true")
arguments = parser.parse_args()
arguments.path = str(pathlib.Path(arguments.path))
# with open(pathlib.Path(arguments.path, "pack.json"), "rb") as file:
with open(pathlib.Path(arguments.path, "pack-hq.json"), "rb") as file:
json_ = json.load(file)
if arguments.profile is None:
for profile in json_["profiles"].values():
print(profile["displayname"])
else:
if arguments.config:
prefix = ""
end = None
else:
prefix = "--"
end = " "
default_profile = Profile(
json_, json_, groups_key="default-setting-groups")
(_,) = (
profile
for profile in json_["profiles"].values()
if profile["displayname"] == arguments.profile
)
profile = Profile(_, json_)
for key, value in collections.OrderedDict(
default_profile._settings + profile._settings
).items():
key = key.replace("_", "-")
if value is True:
print(prefix, key, sep="", end=end)
continue
print(prefix, key, "=", value, sep="", end=end)
print(
prefix,
"glsl-shaders=",
":".join(
str(pathlib.Path(arguments.path, "shaders", shader))
for shader in collections.OrderedDict(
(_, None) for _ in default_profile._shaders + profile._shaders
).keys()
),
sep="",
end=end,
)
print()

@ -1 +0,0 @@
Subproject commit ca506a6bf3937881ebd1ab35bfbaf3d9b0221e0d

View File

@ -1,3 +1,3 @@
volume=70
sub-auto=fuzzy
# hwdec=auto-safe
hwdec=auto-safe

View File

@ -7,9 +7,6 @@ set $laptop eDP-1
bindswitch --reload --locked lid:on output $laptop disable
bindswitch --reload --locked lid:off output $laptop enable
# bar
# bar swaybar_command waybar
#workspace_auto_back_and_forth yes
force_display_urgency_hint 500 ms
smart_borders no_gaps

View File

@ -14,11 +14,12 @@ choice=$(printf "%s\n" "${choices[@]}" | fuzzel -d --prompt "󰚥: ")
if test "$choice" = lock ; then
# sleep less when power on
if acpi -a | grep -q on; then
sleep_time=3600
else
sleep_time=10
fi
# if acpi -a | grep -q on; then
# sleep_time=3600
# else
# sleep_time=10
# fi
sleep_time=10
sleep 0.3
bright=`light`

View File

@ -1,95 +1,41 @@
{
"layer": "top",
"modules-left": [
"sway/workspaces"
],
"fixed-center": false,
"modules-center": [
"sway/window"
],
"modules-right": [
"tray",
"custom/notification",
"custom/player",
"cpu",
"memory",
"network",
"battery",
"clock"
],
"sway/workspaces": {
"show_special": true,
"on-click": "activate",
"persistent_workspaces": {
"9": ["HDMI-A-1"]
}
},
"sway/window": {
"max-length": 50,
"separate-outputs": true
},
"tray": {
"spacing": 10
},
"cpu": {
"format": " {load}",
"format-alt": " {usage}% @ {avg_frequency}GHz"
},
"memory": {
"format": "󰍛 {used:0.1f}G / {total:0.1f}G",
"format-alt": "󰓡 Swap: {swapUsed:0.1f}G / {swapTotal:0.1f}G"
},
"network": {
"format-wifi": " {essid} ({signalStrength}%)",
"format-ethernet": "󰈀 {ifname}",
"format-linked": " {ifname}",
"format-disconnected": "󰌙 Disconnected",
"format-alt": "󰩟 {ifname}: {ipaddr}/{cidr}",
"tooltip-format": "{ifname} via {gwaddr}"
},
"battery": {
"states": {
"good": 75,
"warning": 15,
"critical": 5
},
"format": "{icon} {capacity}%",
"format-charging": "󰉁 {capacity}%",
"format-plugged": " {capacity}%",
"format-alt": "{icon} ETA: {time}",
"format-icons": [
"",
"",
"",
"",
""
]
},
"clock": {
"format": "{:󰅐 %H:%M\t %m-%d}",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
},
"custom/notification": {
"tooltip": true,
"format": "{icon}",
"format-icons": {
"notification": " <span foreground='red'><sup></sup></span> New notifications",
"none": " No notifications",
"dnd-notification": " DND on",
"dnd-none": " DND on"
},
"return-type": "json",
"exec-if": "which swaync-client",
"exec": "swaync-client -swb",
"on-click": "swaync-client -t -sw",
"on-click-right": "swaync-client -d -sw",
"escape": true
},
"custom/player": {
"format": "󰎈 {}",
"return-type": "json",
"exec": "playerctl -a metadata --format '{\"text\": \"{{uc(playerName)}}: {{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"class\": \"{{status}}\"}' -F",
"max-length": 35,
"on-click": "playerctl play-pause"
}
}
[
{
"layer": "top",
"name": "main",
"output": "!XMI Redmi 27 NU 3948622WH08F4",
"modules-left": [
"sway/workspaces"
],
"fixed-center": false,
"modules-center": [
"sway/window"
],
"modules-right": [
"tray",
"custom/notification",
"custom/player",
"cpu",
"memory",
"network",
"battery",
"clock"
],
"include": [
"~/.config/waybar/sway-modules.json"
]
},
{
"layer": "top",
"name": "alt",
"output": "XMI Redmi 27 NU 3948622WH08F4",
"modules-left": [
"sway/workspaces"
],
"modules-right": [
"sway/window"
],
"sway/window": {
"max-length": 128
}
}
]

View File

@ -5,7 +5,7 @@
* {
border: none;
border-radius: 1px;
font-family: "IBM Plex Sans", "Symbols Nerd Font" ,sans-serif;
font-family: "IBM Plex Sans", "Symbols Nerd Font", sans-serif;
font-size: 14px;
min-height: 0;
}
@ -17,7 +17,8 @@ window#waybar {
border-bottom: 1px solid @selection_background;
}
#workspaces {
#workspaces,
#window {
margin: 5px 10px;
}

View File

@ -1,5 +1,5 @@
[screencast]
max_fps=60
max_fps=120
exec_before=swaynag -m "Screen sharing enabled" -e bottom --background b16286 --text dbdbb2 --button-background b16286 --button-text ebdbb2 --border ebdbb2 --button-border-size 2
; exec_after=enable_notifications.sh
chooser_type=simple

View File

@ -38,3 +38,6 @@ set recolor-lightcolor "#282828" # bg
set recolor-darkcolor "#ebdbb2" # fg
set recolor "true"
# set recolor-keephue true # keep original color
# selection clipboard
set selection-clipboard clipboard

6
.gitmodules vendored
View File

@ -1,6 +0,0 @@
[submodule ".config/mpv/default-shader-pack"]
path = .config/mpv/default-shader-pack
url = https://github.com/iwalton3/default-shader-pack.git
[submodule ".config/hypr/plugins/hy3"]
path = .config/hypr/plugins/hy3
url = https://github.com/outfoxxed/hy3.git