diff --git a/deps/com.github.aiortc.aiortc b/deps/com.github.aiortc.aiortc index 352e3f6..7552bcd 160000 --- a/deps/com.github.aiortc.aiortc +++ b/deps/com.github.aiortc.aiortc @@ -1 +1 @@ -Subproject commit 352e3f68754ab93eb8449ee0751b40991f5a6b73 +Subproject commit 7552bcde773823c51c82daa5d9b23ea045df9ec2 diff --git a/dotfiles/.sway/config b/dotfiles/.sway/config index b2ad10b..0cc555a 100644 --- a/dotfiles/.sway/config +++ b/dotfiles/.sway/config @@ -1,4 +1,3 @@ - # # Copy this to ~/.config/sway/config and edit it to your liking. # @@ -23,18 +22,6 @@ set $term weston-terminal set $dmenu_path /usr/bin/bemenu-run set $menu $dmenu_path | xargs swaymsg exec -- -### Output configuration -# -# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) -#output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill -# -# Example configuration: -# -# output HDMI-A-1 resolution 1920x1080 position 1920,0 -# -# You can get the names of your outputs by running: swaymsg -t get_outputs -output HDMI-A-1 resolution 1920x1080 position 0,0 -output eDP-1 resolution 1366x748 position 277,1080 ### Idle configuration # @@ -62,14 +49,21 @@ output eDP-1 resolution 1366x748 position 277,1080 # # You can get the names of your inputs by running: swaymsg -t get_inputs # Read `man 5 sway-input` for more information about this section. +input type:pointer { + # tap enabled + natural_scroll enabled +} input type:touchpad { tap enabled natural_scroll enabled + # natural_scroll disabled } bindgesture swipe:4:left workspace next bindgesture swipe:4:right workspace prev +for_window [shell="xwayland"] title_format "[XWayland] %title" + set $lock_cmd \ loginctl list-sessions | \ tail '-n' +2 | head -n -2 | awk '{print $1}' | \ @@ -84,36 +78,46 @@ bindgesture swipe:4:up exec $lock_cmd # bindsym $mod+Shift+l exec $lock_cmd -bindsym --locked XF86KbdBrightnessDown \ - exec commands \ +bindsym Shift+mod1+1 \ + exec ~/.local/bin/commands \ desktop-services \ - --backlight-decrease \ - --backlight-type keyboard + --cpufreq-action performance -bindsym --locked XF86KbdBrightnessUp \ - exec commands \ +bindsym Shift+mod1+2 \ + exec ~/.local/bin/commands \ desktop-services \ - --backlight-increase \ - --backlight-type keyboard + --cpufreq-action powersave bindsym --locked XF86MonBrightnessDown \ - exec commands \ + exec ~/.local/bin/commands \ desktop-services \ --backlight-decrease \ --backlight-type output bindsym --locked XF86MonBrightnessUp \ - exec commands \ + exec ~/.local/bin/commands \ desktop-services \ --backlight-increase \ --backlight-type output -bindsym --locked XF86AudioPlay exec bash -c "commands media-play-pause" -bindsym --locked XF86AudioRaiseVolume exec bash -c "commands media-raise-volume" -bindsym --locked XF86AudioLowerVolume exec bash -c "commands media-lower-volume" -bindsym --locked XF86AudioMute exec bash -c "commands media-toggle-volume" -bindsym --locked XF86AudioNext exec bash -c "commands media-next" -bindsym --locked XF86AudioPrev exec bash -c "commands media-prev" +bindsym --locked XF86KbdBrightnessDown \ + exec ~/.local/bin/commands \ + desktop-services \ + --backlight-decrease \ + --backlight-type keyboard + +bindsym --locked XF86KbdBrightnessUp \ + exec ~/.local/bin/commands \ + desktop-services \ + --backlight-increase \ + --backlight-type keyboard + +bindsym --locked XF86AudioPlay exec zsh -c "commands media-play-pause" +bindsym --locked XF86AudioRaiseVolume exec zsh -c "commands media-raise-volume" +bindsym --locked XF86AudioLowerVolume exec zsh -c "commands media-lower-volume" +bindsym --locked XF86AudioMute exec zsh -c "commands media-toggle-volume" +bindsym --locked XF86AudioNext exec zsh -c "commands media-next" +bindsym --locked XF86AudioPrev exec zsh -c "commands media-prev" # Start a terminal @@ -141,6 +145,10 @@ bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. # Moving around: # # Move your focus around +bindsym Shift+mod1+tab focus prev +bindsym mod1+tab focus next +#bindsym mod1+tab focus mode_toggle + bindsym $mod+$left focus left bindsym $mod+$down focus down bindsym $mod+$up focus up @@ -204,6 +212,7 @@ bindsym $mod+v splitv #bindsym $mod+s layout stacking #bindsym $mod+w layout tabbed #bindsym $mod+e layout toggle split +bindsym $mod+e layout toggle all # Make the current focus fullscreen bindsym $mod+f fullscreen @@ -266,7 +275,7 @@ bar { # When the status_command prints a new line to stdout, swaybar updates. # The default just shows the current date and time. status_command while true; \ - do commands status --config ~/.config/commands-status.json; \ + do ~/.local/bin/commands status --config ~/.config/commands-status.json; \ sleep 1; \ done @@ -303,3 +312,5 @@ input * { input type:keyboard xkb_model "pc101" include /etc/sway/config.d/* +include ~/.sway/config.d/* + diff --git a/dotfiles/.sway/config.d/macbook-air.conf b/dotfiles/.sway/config.d/macbook-air.conf new file mode 100644 index 0000000..c3f0e92 --- /dev/null +++ b/dotfiles/.sway/config.d/macbook-air.conf @@ -0,0 +1,20 @@ +### Output configuration +# +# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/) +#output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill +# +# Example configuration: +# +# output HDMI-A-1 resolution 1920x1080 position 1920,0 +# +# You can get the names of your outputs by running: swaymsg -t get_outputs +#2560 x 1440 +output 'Dell Inc. DELL P2418D MY3ND8220WKT' resolution 1920x1080 position 0,0 +#output 'Dell Inc. DELL P2418D MY3ND8220WKT' mode resolution 2560x1440 position 0,0 +#output HDMI-A-1 resolution 1920x1080 transform 90 position 0,0 +output 'LG Electronics LG FHD 403TOAG3C208 ' resolution 1920x1080 transform 90 position 0,0 +#output eDP-1 resolution 1366x748 position 277,1080 +#output eDP-1 resolution 1366x748 disable power off position 277,1080 +output 'Apple Computer Inc Color LCD Unknown' \ + resolution 1366x748 enable power on position 277,1080 +bindsym --locked $mod+u output 'Apple Computer Inc Color LCD Unknown' toggle diff --git a/python/online/fxreader/pr34/commands.py b/python/online/fxreader/pr34/commands.py index be2e24a..9ec6b05 100644 --- a/python/online/fxreader/pr34/commands.py +++ b/python/online/fxreader/pr34/commands.py @@ -2144,6 +2144,13 @@ def desktop_services(argv): default=False, help='enable backlight_service', ) + parser.add_option( + '--polkit_service', + dest='polkit_service', + action='store_true', + default=False, + help='enable polkit_service', + ) options, args = parser.parse_args(argv) @@ -2995,6 +3002,13 @@ echo 6500 > /sys/bus/platform/devices/applesmc.768/fan1_output; self.background_check() + if options.polkit_service: + services.extend([ + subprocess.Popen( + ['/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1'] + ) + ]) + services.extend([ subprocess.Popen( ['ibus-daemon'], diff --git a/python/pyproject.toml b/python/pyproject.toml index 45fcafc..003c373 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -1,6 +1,6 @@ [project] name = 'online.fxreader.pr34' -version = '0.1.4.12' +version = '0.1.4.13' dependencies = [ #"-r requirements.txt",