Changes Feb 2022

6 files changed, 131 insertions, 61 deletions

diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index ac21adb..e1b8988 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -71,7 +71,7 @@ window:
     instance: Alacritty
     # General application class
     general: Alacritty
-
+  opacity: 0.89
   # GTK theme variant (Linux/BSD only)
   #
   # Override the variant of the GTK theme. Commonly supported values are `dark` and `light`.
@@ -303,7 +303,7 @@ schemes:
         white:   '#e6e6d1'
 
 # Choose ONE color scheme from those available in the above list.
-colors: *doom-one
+colors: *dracula
 
 # Visual Bell
 #
@@ -335,7 +335,6 @@ colors: *doom-one
 #
 # Window opacity as a floating point number from `0.0` to `1.0`.
 # The value `0.0` is completely transparent and `1.0` is opaque.
-background_opacity: 0.9
 # background_opacity: 0.80
 
 #selection:
diff --git a/.config/deadbeef/config b/.config/deadbeef/config
index 9ca0b12..d52b8e5 100644
--- a/.config/deadbeef/config
+++ b/.config/deadbeef/config
@@ -1,8 +1,10 @@
 cli_add_playlist_name Default
 deadbeef_version 1.8.8
-gtkui.columns.playlist [{"title":"♫","id":"1","format":"%playstatus%","sort_format":"","size":"50","align":"0","color_override":"0","color":"#ff000000"},{"title":"Artist / Album","id":"-1","format":"$if(%artist%,%artist%,Unknown Artist)[ - %album%]","sort_format":"","size":"449","align":"0","color_override":"0","color":"#ff000000"},{"title":"Track No","id":"-1","format":"%tracknumber%","sort_format":"","size":"57","align":"1","color_override":"0","color":"#ff000000"},{"title":"Title","id":"-1","format":"%title%","sort_format":"","size":"650","align":"0","color_override":"0","color":"#ff000000"},{"title":"Duration","id":"-1","format":"%length%","sort_format":"","size":"50","align":"0","color_override":"0","color":"#ff000000"},{"title":"Codec","id":"-1","format":"%codec%","sort_format":"","size":"100","align":"0","color_override":"0","color":"#ffd3dae3"},{"title":"Bitrate","id":"-1","format":"%bitrate%","sort_format":"","size":"100","align":"0","color_override":"0","color":"#ffd3dae3"}]
+filechooser.lastdir file:///home/yui/Downloads
+gtkui.columns.playlist [{"title":"♫","id":"1","format":"%playstatus%","sort_format":"","size":"50","align":"0","color_override":"0","color":"#ff000000"},{"title":"Artist / Album","id":"-1","format":"$if(%artist%,%artist%,Unknown Artist)[ - %album%]","sort_format":"","size":"449","align":"0","color_override":"0","color":"#ff000000"},{"title":"Track No","id":"-1","format":"%tracknumber%","sort_format":"","size":"57","align":"1","color_override":"0","color":"#ff000000"},{"title":"Year","id":"-1","format":"%year%","sort_format":"","size":"100","align":"0","color_override":"0","color":"#ffd3dae3"},{"title":"Title","id":"-1","format":"%title%","sort_format":"","size":"650","align":"0","color_override":"0","color":"#ff000000"},{"title":"Duration","id":"-1","format":"%length%","sort_format":"","size":"50","align":"0","color_override":"0","color":"#ff000000"},{"title":"Codec","id":"-1","format":"%codec%","sort_format":"","size":"100","align":"0","color_override":"0","color":"#ffd3dae3"},{"title":"Bitrate","id":"-1","format":"%bitrate%","sort_format":"","size":"100","align":"0","color_override":"0","color":"#ffd3dae3"}]
+gtkui.columns.search [{"title":"Artist / Album","id":"-1","format":"$if(%artist%,%artist%,Unknown Artist)[ - %album%]","sort_format":"","size":"150","align":"0","color_override":"0","color":"#ff000000"},{"title":"Track No","id":"-1","format":"%tracknumber%","sort_format":"","size":"50","align":"1","color_override":"0","color":"#ff000000"},{"title":"Title","id":"-1","format":"%title%","sort_format":"","size":"435","align":"0","color_override":"0","color":"#ff000000"},{"title":"Duration","id":"-1","format":"%length%","sort_format":"","size":"50","align":"0","color_override":"0","color":"#ff000000"}]
 gtkui.eq.visible 0
-gtkui.layout.0.6.2 vbox expand="0 1" fill="1 1" homogeneous=0 {hbox expand="0 1 0" fill="1 1 1" homogeneous=0 {playtb {} seekbar {} volumebar {} } hsplitter locked=0 ratio=0.849606 pos=0 size2=0 {vsplitter locked=0 ratio=0.854421 pos=0 size2=0 {playlist hideheaders=0 width=1632 {} hsplitter locked=0 ratio=0.205283 pos=0 size2=0 {scope {} spectrum {} } } tabs active=1 num_tabs=2 tab000="Playlist browser" tab001="Properties" {pltbrowser {} vsplitter locked=0 ratio=0.857813 pos=0 size2=0 {selproperties {} coverart {} } } } } 
+gtkui.layout.0.6.2 vbox expand="0 1" fill="1 1" homogeneous=0 {hbox expand="0 1 0" fill="1 1 1" homogeneous=0 {playtb {} seekbar {} volumebar {} } hsplitter locked=0 ratio=0.849606 pos=0 size2=0 {vsplitter locked=0 ratio=0.854421 pos=0 size2=0 {playlist hideheaders=0 width=3263 {} hsplitter locked=0 ratio=0.205283 pos=0 size2=0 {scope {} spectrum {} } } tabs active=0 num_tabs=2 tab000="Playlist browser" tab001="Properties" {pltbrowser {} vsplitter locked=0 ratio=0.857813 pos=0 size2=0 {selproperties {} coverart {} } } } } 
 gtkui.statusbar.visible 1
 gtkui.tabscroll 0
 gtkui.titlebar_playing_tf %artist% - %title% - DeaDBeeF-%_deadbeef_version%
@@ -39,34 +41,58 @@ hotkey.key30 b 0 0 next
 hotkey.key31 n 0 0 playback_random
 hotkey.key32 "Ctrl k" 0 0 toggle_stop_after_album
 hotkeys_created 1
-logwindow.geometry.h 1440
-logwindow.geometry.w 2560
-logwindow.geometry.x 0
-logwindow.geometry.y 0
-mainwin.geometry.h 1050
-mainwin.geometry.w 1920
-mainwin.geometry.x 0
-mainwin.geometry.y 30
+logwindow.geometry.h 513
+logwindow.geometry.w 748
+logwindow.geometry.x 1160
+logwindow.geometry.y 555
+mainwin.geometry.h 2115
+mainwin.geometry.w 3840
+mainwin.geometry.x 4480
+mainwin.geometry.y 45
 network.proxy.port 8080
 output_plugin pulseaudio
 playback.loop 1
-playback.volume -33.57143
-playlist.current 1
-playlist.cursor.0 -1
-playlist.cursor.1 123
-playlist.scroll.0 0
-playlist.scroll.1 -123
+playback.order 1
+playback.volume -27.14285
+playlist.current 0
+playlist.cursor.0 1209
+playlist.cursor.1 60
+playlist.cursor.2 0
+playlist.cursor.3 -1
+playlist.cursor.4 0
+playlist.cursor.5 205
+playlist.cursor.6 22
+playlist.scroll.0 -1209
+playlist.scroll.1 -60
+playlist.scroll.2 0
+playlist.scroll.3 0
+playlist.scroll.4 0
+playlist.scroll.5 0
+playlist.scroll.6 4560
 playlist.scroll.cursorfollowplayback 1
-playlist.tab.00000 Default
-playlist.tab.00001 New Playlist
+playlist.tab.00000 Weeb
+playlist.tab.00001 Tatsuro
+playlist.tab.00002 Pepper Lunch
+playlist.tab.00003 Katamari
+playlist.tab.00004 Default
+playlist.tab.00005 Best Of Citypop
+playlist.tab.00006 2hu
 prefwin.geometry.h 563
 prefwin.geometry.w 684
 prefwin.geometry.x 1578
 prefwin.geometry.y 802
 resume.paused 0
-resume.playlist -1
-resume.position -1.000000
-resume.track -1
+resume.playlist 0
+resume.position 265.07870
+resume.track 1209
+searchwin.geometry.h 2115
+searchwin.geometry.w 3840
+searchwin.geometry.x 0
+searchwin.geometry.y 45
 streamer.samplerate 44100
 streamer.samplerate_mult_44 44100
 streamer.samplerate_mult_48 48000
+trkproperties.geometry.h 2095
+trkproperties.geometry.w 1516
+trkproperties.geometry.x 2312
+trkproperties.geometry.y 53
diff --git a/.config/gtk-3.0/bookmarks b/.config/gtk-3.0/bookmarks
index 5b0268c..0cfa569 100644
--- a/.config/gtk-3.0/bookmarks
+++ b/.config/gtk-3.0/bookmarks
@@ -1 +1,2 @@
 sftp://yui@hirasawa.moe:69/ hirasawa
+file:///home/yui/Downloads Downloads
diff --git a/.config/qtile/__pycache__/config.cpython-39.pyc b/.config/qtile/__pycache__/config.cpython-39.pyc
index 73a3383..9c0f3ac 100644
--- a/.config/qtile/__pycache__/config.cpython-39.pyc
+++ b/.config/qtile/__pycache__/config.cpython-39.pyc
diff --git a/.config/qtile/autostart.sh b/.config/qtile/autostart.sh
index 0f4c556..36981ea 100755
--- a/.config/qtile/autostart.sh
+++ b/.config/qtile/autostart.sh
@@ -7,8 +7,8 @@
 xrdb -merge ~/.Xresources
 numlockx on &
 lxsession &
-picom &
 nitrogen --restore &
+picom &
 volumeicon &
 nm-applet &
 #ibus-daemon -drxR &
diff --git a/.config/qtile/config.py b/.config/qtile/config.py
index 39153be..8cec341 100644
--- a/.config/qtile/config.py
+++ b/.config/qtile/config.py
@@ -27,32 +27,62 @@ import os
 import subprocess
 from typing import List  # noqa: F401
 
-from libqtile import bar, layout, widget, hook 
+from libqtile import bar, layout, widget, hook
 from libqtile.config import Click, Drag, Group, Key, Match, Screen
 from libqtile.lazy import lazy
+from libqtile.log_utils import logger
+from libqtile.command.client import CommandClient
 #from libqtile.utils import guess_terminal
 
 mod = "mod4"
 #terminal = guess_terminal()
 terminal = "alacritty"
-selector =  "rofi -show drun -show-icons -theme 'Arc-Dark'"
+selector = "rofi -show drun -show-icons -theme 'Arc-Dark'"
 weather_location = "Melbourne"
 slimeshot = "/home/yui/Scripts/slimeshot.sh/slimeshot.sh"
+global_font = "IBM Plex Sans"
 
 colors = {
     "active": "#7069b8",
-    "passive": "#888888",
-    "inactive": "#404040",
+    "passive": "#999999",
+    "inactive": "#666666",
     "text": "#ffffff",
     "background": "#000000"
 }
 
+widget_settings_1k = dict(
+    font=global_font,
+    fontsize=16,
+    padding=4,
+)
+
+widget_settings_2k = dict(
+    font=global_font,
+    fontsize=16,
+    padding=4,
+)
+
+widget_settings_4k = dict(
+    font=global_font,
+    fontsize=20,
+    padding=6,
+)
 
-@hook.subscribe.startup_complete
-def fix_screen_groups():
-    lazy.group['1'].toscreen(1)
-    lazy.group['2'].toscreen(0)
-    lazy.group['3'].toscreen(2)
+def fix_screen_groups(qtile=None):
+    global screens
+    screens[1].cmd_toggle_group("1")
+    screens[0].cmd_toggle_group("2")
+    screens[2].cmd_toggle_group("3")
+    #screens[1].set_group(qtile.groups_map.get("1"))
+    #screens[0].set_group(qtile.groups_map.get("2"))
+    #screens[2].set_group(qtile.groups_map.get("3"))
+
+
+# fix_screen_groups = [
+#     lazy.group['1'].toscreen(1),
+#     lazy.group['2'].toscreen(0),
+#     lazy.group['3'].toscreen(2)
+# ]
 
 keys = [
     # Switch between windows
@@ -82,7 +112,8 @@ keys = [
     Key([mod, "control"], "Down", lazy.layout.grow_down(),
         desc="Grow window down"),
     Key([mod, "control"], "Up", lazy.layout.grow_up(), desc="Grow window up"),
-    Key([mod, "control"], "n", lazy.layout.normalize(), desc="Reset all window sizes"),
+    Key([mod, "control"], "n", lazy.layout.normalize(),
+        desc="Reset all window sizes"),
 
     Key([mod], "Page_Up", lazy.layout.grow()),
     Key([mod], "Page_Down", lazy.layout.shrink()),
@@ -129,7 +160,8 @@ keys = [
     Key([mod], "Return", lazy.spawn(terminal), desc="Launch terminal"),
     Key([mod], "d", lazy.spawn(selector), desc="Launch rofi"),
     Key([mod], "f", lazy.spawn("firefox"), desc="Launch firefox"),
-    Key([mod], "e", lazy.spawn("/home/yui/Scripts/emoji.sh"), desc="Launch an emoji rofi"),
+    Key([mod], "e", lazy.spawn("/home/yui/Scripts/emoji.sh"),
+        desc="Launch an emoji rofi"),
 
     Key([mod], "b", lazy.hide_show_bar("top")),
 
@@ -137,7 +169,9 @@ keys = [
     Key(["control"], "Print", lazy.spawn(f"{slimeshot}")),
     Key([mod, "control"], "Print", lazy.spawn(f"{slimeshot} l")),
     Key(["control", "shift"], "Print", lazy.spawn(f"{slimeshot} c")),
-    Key([mod], "j",  lazy.group['1'].toscreen(1), lazy.group['2'].toscreen(0), lazy.group['3'].toscreen(2)),
+    #Key([mod], "j",  lazy.group['1'].toscreen(1),
+    #    lazy.group['2'].toscreen(0), lazy.group['3'].toscreen(2)),
+    Key([mod], "j", lazy.function(fix_screen_groups)),
 
 ]
 
@@ -145,8 +179,10 @@ group_labels = "零壱弐参四伍六七八九"
 groups = [Group(i, label=group_labels[int(i)]) for i in "123456789"]
 
 for i in groups:
-    keys.append(Key([mod], i.name, lazy.group[i.name].toscreen()))        # Switch to another group
-    keys.append(Key([mod, "shift"], i.name, lazy.window.togroup(i.name))) # Send current window to another group
+    # Switch to another group
+    keys.append(Key([mod], i.name, lazy.group[i.name].toscreen()))
+    # Send current window to another group
+    keys.append(Key([mod, "shift"], i.name, lazy.window.togroup(i.name)))
 
 layout_theme = {"border_width": 2,
                 "margin": 8,
@@ -155,13 +191,13 @@ layout_theme = {"border_width": 2,
                 }
 
 layouts = [
-    #layout.Columns(border_focus_stack='#d75f5f'),
+    # layout.Columns(border_focus_stack='#d75f5f'),
     layout.Max(**layout_theme, name="全"),
     # Try more layouts by unleashing below layouts.
     # layout.Stack(num_stacks=2),
     # layout.Bsp(**layout_theme),
     # layout.Matrix(),
-     layout.MonadTall(**layout_theme, name=">>=", ratio=0.6),
+    layout.MonadTall(**layout_theme, name=">>=", ratio=0.6),
     # layout.MonadWide(),
     # layout.RatioTile(),
     # layout.Tile(),
@@ -170,29 +206,28 @@ layouts = [
     # layout.Zoomy(),
 ]
 
-widget_defaults = dict(
-    font='IBM Plex Sans',
-    fontsize=16,
-    padding=4,
-)
-extension_defaults = widget_defaults.copy()
+# widget_defaults = widget_settings_2k.copy()
+# extension_defaults = widget_defaults.copy()
 
 
-def generate_widgets(main_monitor=False):
+def generate_widgets(main_monitor=False, settings=None):
 
-    clock = [widget.Clock(format='%m月%d日 %a %H:%M')]
+    clock = [widget.Clock(format='%m月%d日 %a %H:%M', **settings)]
 
     base_widgets = [
-        widget.CurrentLayout(),
-        widget.GroupBox(highlight_method="block", rounded=False, spacing=0, this_current_screen_border=colors["active"], this_screen_border=colors["passive"], foreground=colors["text"]),
+        widget.CurrentLayout(**settings),
+        widget.GroupBox(highlight_method="block", rounded=False, spacing=0, this_current_screen_border=colors[
+                        "active"], this_screen_border=colors["passive"], inactive=colors["inactive"], block_highlight_text_color=colors["text"], **settings),
         #widget.WindowTabs(max_chars=60, selected=('<span color="red">', "</span>")),
-        widget.TaskList(highlight_method="block", border=colors["active"], unfocused_border=colors["inactive"], fontsize=14, rounded=False, txt_floating="🗗 ", max_title_width=800),
+        widget.TaskList(highlight_method="block", border=colors["active"], unfocused_border=colors[
+                        "inactive"],  rounded=False, txt_floating="🗗 ", max_title_width=800, **settings),
     ]
 
     extra_widgets = [
-        widget.GenPollUrl(url=f"https://wttr.in/{weather_location}?format=1", json=False, update_interval=600, parse=lambda x: x.replace("+", "").strip()),
-        widget.GenPollUrl(url="https://hirasawa.moe/vax.txt", json=False, update_interval=3600, parse=lambda x: x.decode("UTF-8").split("\t")[1]),
-        widget.Systray(),
+        widget.GenPollUrl(url=f"https://wttr.in/{weather_location}?format=1", json=False, update_interval=600,
+                          parse=lambda x: x.replace("+", "").strip(), **settings),
+        #widget.GenPollUrl(url="https://hirasawa.moe/vax.txt", json=False, update_interval=3600, parse=lambda x: x.decode("UTF-8").split("\t")[1]),
+        widget.Systray(**settings),
     ]
 
     if main_monitor:
@@ -201,10 +236,18 @@ def generate_widgets(main_monitor=False):
     return base_widgets + clock
 
 
+def open_weather():
+    global terminal
+    global weather_location
+    home = os.path.expanduser('~')
+    subprocess.call(
+        [terminal, "-e", home + '/.config/qtile/weather.sh', weather_location])
+
+
 screens = [
-    Screen(top=bar.Bar(generate_widgets(main_monitor=True), 30)),
-    Screen(top=bar.Bar(generate_widgets(), 30)),
-    Screen(top=bar.Bar(generate_widgets(), 30)),
+    Screen(top=bar.Bar(generate_widgets(main_monitor=True, settings=widget_settings_2k), 30)),
+    Screen(top=bar.Bar(generate_widgets(settings=widget_settings_1k), 30)),
+    Screen(top=bar.Bar(generate_widgets(settings=widget_settings_4k), 45)),
 ]
 
 
@@ -244,9 +287,10 @@ auto_minimize = False
 
 @hook.subscribe.startup_once
 def start_once():
-        home = os.path.expanduser('~')
-        subprocess.call([home + '/.config/qtile/autostart.sh'])
- 
+    home = os.path.expanduser('~')
+    subprocess.call([home + '/.config/qtile/autostart.sh'])
+    fix_screen_groups()
+
 
 # XXX: Gasp! We're lying here. In fact, nobody really uses or cares about this
 # string besides java UI toolkits; you can see several discussions on the