updated dotfiles to latest in sway setup

14 files changed, 162 insertions, 113 deletions

diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index 4863466..335c371 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -120,7 +120,7 @@ font:
 
   # Point size of the font
   #size: 10.0
-  size: 16
+  size: 15
 
   # Offset is the extra space around each character. `offset.y` can be thought of
   # as modifying the line spacing, and `offset.x` as modifying the letter spacing.
@@ -241,7 +241,7 @@ bell:
 #
 # 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.8
 
 # Mouse bindings
 #
@@ -273,27 +273,6 @@ mouse:
   # If this is `true`, the cursor is temporarily hidden when typing.
   hide_when_typing: false
 
-  url:
-    # URL launcher
-    #
-    # This program is executed when clicking on a text which is recognized as a URL.
-    # The URL is always added to the command as the last parameter.
-    #
-    # When set to `None`, URL launching will be disabled completely.
-    #
-    # Default:
-    #   - (macOS) open
-    #   - (Linux) xdg-open
-    #   - (Windows) explorer
-    #launcher:
-    #  program: xdg-open
-    #  args: []
-
-    # URL modifiers
-    #
-    # These are the modifiers that need to be held down for opening URLs when clicking
-    # on them. The available modifiers are documented in the key binding section.
-    modifiers: None
 
 selection:
   semantic_escape_chars: ",│`|:\"' ()[]{}<>"
diff --git a/.config/qutebrowser/bookmarks/urls b/.config/qutebrowser/bookmarks/urls
index 9200d46..4146274 100644
--- a/.config/qutebrowser/bookmarks/urls
+++ b/.config/qutebrowser/bookmarks/urls
@@ -130,3 +130,7 @@ https://amazingribs.com/tested-recipes/vegetables-and-salads/simple-creamy-south
 https://amazingribs.com/tested-recipes/spice-rubs-and-pastes/meatheads-memphis-dust-rub-recipe Meathead's World Famous Memphis Dust Rub
 https://manage.buyvm.net/# Stallion
 https://www.richardphotolab.com/ Premium Film Developing, Scanning and Photo Printing | Richard Photo Lab
+https://www.tradingview.com/chart/1a1NjVtp/ AVIR 32.16 ▲ +1.87% Unnamed
+https://wandererfinancial.com/trade-talk/ Trade Talk - Wanderer Financial
+https://wandererfinancial.com/9-29-21-todays-market/ 9/29/21 Today's Market - Wanderer Financial
+https://www.summitpost.org/ Climbing, Hiking, Mountaineering : SummitPost
diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py
index 09965e0..51f4a0b 100644
--- a/.config/qutebrowser/config.py
+++ b/.config/qutebrowser/config.py
@@ -21,7 +21,7 @@ c.tabs.background = True
 c.tabs.position = "top"
 
 c.content.autoplay = False
-c.editor.command = ['foot', 'nvim', '{}']
+c.editor.command = ['alacritty', 'nvim', '{}']
 
 c.url.default_page = "about:blank"
 # searches
@@ -34,33 +34,43 @@ c.url.searchengines['a'] = 'https://wiki.archlinux.org/?search={}'
 c.url.searchengines['y'] = 'https://www.youtube.com/results?search_query={}'
 c.url.searchengines['ap'] = 'https://www.archlinux.org/packages/?sort=&q={}'
 c.url.searchengines['w'] = 'https://www.google.com/search?q={}+site%3Awired.com'
-c.url.searchengines['t'] = 'https://lite.duckduckgo.com/lite/?q={}%20site%3Ahttps%3A%2F%2Fwww.elliotoracle.com%2Fblog%2F&t=fpas&ia=web'
+
 #tor
 #c.content.proxy = 'socks://localhost:9050/'
 
 # block JS out of the box:
 c.content.javascript.enabled = False
 
+# JS is okay for some sites:
 js_whitelist = [
-    "*://localhost/*",
-    "*://127.0.0.1/*",
-    "*://github.com/*",
-    "*://gitlab.com/*",
-    "*://*.youtube.com/*",
-    "*://*.luxagraf.net/*"
-    "*://translate.google.com/*",
-    "*://schoolsfirst.com/*",
+"*://localhost/*",
+"*://127.0.0.1/*",
+"https://live.luxagraf.net/*",
+"https://cloud.luxagraf.net/*",
+"https://luxagraf.net/*",
+"*://github.com/*",
+"*://gitlab.com/*",
+"*://*.youtube.com/*",
+"*://*.tastyworks.com/*",
+"*://wandererfinancial.com/*",
+"*://*.tradingview.com/*",
+"*://translate.google.com/*",
+"*://*.schoolsfirstfcu.com/*",
+"*://www.ssec.wisc.edu/*",
+"*://bumfuzzle.com/*",
+"*://pmags.com/*",
+"*://*.tastyworks.com/*",
+"https://discuss.pixls.us/*",
+"https://www.startpage.com/*",
+"https://*.schwab.com/*",
+"https://*.hyvor.com/*",
+"https://ecosophia.dreamwidth.org/*",
 ]
-private_whitelist = os.path.expanduser("~/.config/qutebrowser/private-whitelist")
-if os.path.exists(private_whitelist):
-    with open(private_whitelist) as f:
-        js_whitelist += filter(lambda l: bool(l), f.read().split("\n"))
-
 for site in js_whitelist:
     with config.pattern(site) as p:
         p.content.javascript.enabled = True
 
-# ================== Youtube Add Blocking ======================= {{{
+# ================== Youtube Ad Blocking ======================= {{{
 def filter_yt(info: interceptor.Request):
     """Block the given request if necessary."""
     url = info.request_url
@@ -82,6 +92,11 @@ config.unbind('K', mode='normal')
 config.bind('J', 'tab-prev', mode='normal')
 config.bind('K', 'tab-next', mode='normal')
 
+# pinned tab nav
+config.bind('<Ctrl+1>', 'tab-select 1', mode='normal')
+config.bind('<Ctrl+2>', 'tab-select 2', mode='normal')
+config.bind('<Ctrl+3>', 'tab-select 3', mode='normal')
+config.bind('<Ctrl+4>', 'tab-select 4', mode='normal')
 # get rid of things I always hit accidentally
 config.unbind('<Ctrl+v>')
 # however passthru mode is nice on some sites
@@ -94,13 +109,12 @@ config.unbind('<Ctrl+h>')
 config.bind (',r', 'spawn --userscript myread.py', mode='normal')
 
 #download current or hinted video
-config.bind(';y', 'spawn --userscript youtube-dl')
+config.bind(',y', 'spawn --userscript youtube-dl')
 config.bind(';yh', 'hint links --userscript youtube-dl')
 
 # watch current or hinted video
 config.bind(',yl', 'hint links spawn --detach mpv --force-window yes {hint-url}')
 config.bind(',yv', 'spawn --detach mpv --force-window yes {url}')
-config.bind(',ys', 'spawn --userscript youtube-dl')
 
 # open selected text in tab
 config.bind (',f', 'open {primary}')
@@ -471,22 +485,24 @@ c.colors.tabs.indicator.stop = solarized['orange']
 ## Background color of unselected odd tabs.
 ## Type: QtColor
 c.colors.tabs.odd.bg = solarized['base03']
-
+c.colors.tabs.pinned.odd.bg = solarized['base03']
+c.colors.tabs.pinned.even.bg = solarized['base03']
 ## Foreground color of unselected odd tabs.
 ## Type: QtColor
 c.colors.tabs.odd.fg = solarized['base1']
 
 ## Background color of selected even tabs.
 ## Type: QtColor
-c.colors.tabs.selected.even.bg = solarized['violet']
-
+c.colors.tabs.selected.even.bg = solarized['yellow']
+c.colors.tabs.pinned.selected.even.bg = solarized['yellow']
+c.colors.tabs.pinned.selected.odd.bg = solarized['yellow']
 ## Foreground color of selected even tabs.
 ## Type: QtColor
 c.colors.tabs.selected.even.fg = solarized['base2']
 
 ## Background color of selected odd tabs.
 ## Type: QtColor
-c.colors.tabs.selected.odd.bg = solarized['violet']
+c.colors.tabs.selected.odd.bg = solarized['yellow']
 
 ## Foreground color of selected odd tabs.
 ## Type: QtColor
diff --git a/.config/qutebrowser/greasemonkey/twitter-to-nitter.js b/.config/qutebrowser/greasemonkey/twitter-to-nitter.js
new file mode 100644
index 0000000..b9ccc38
--- /dev/null
+++ b/.config/qutebrowser/greasemonkey/twitter-to-nitter.js
@@ -0,0 +1,11 @@
+// ==UserScript==
+// @name           Twitter to Nitter redirector
+// @namespace      mamg22's userscripts
+// @match          http://twitter.com/*
+// @match          https://twitter.com/*
+// @match          http://www.twitter.com/*
+// @match          https://www.twitter.com/*
+// @run-at         document-start
+// ==/UserScript==
+
+location.href=location.href.replace("twitter.com","nitter.net");
diff --git a/.config/qutebrowser/greasemonkey/youtube-to-invidious.js b/.config/qutebrowser/greasemonkey/youtube-to-invidious.js
new file mode 100644
index 0000000..b51c506
--- /dev/null
+++ b/.config/qutebrowser/greasemonkey/youtube-to-invidious.js
@@ -0,0 +1,11 @@
+// ==UserScript==
+// @name           YouTube to Invidious redirector
+// @namespace      lxf userscripts
+// @match          http://youtube.com/*
+// @match          https://youtube.com/*
+// @match          http://www.youtube.com/*
+// @match          https://www.youtube.com/*
+// @run-at         document-start
+// ==/UserScript==
+
+location.href=location.href.replace("www.youtube.com","invidious.fdn.fr");
diff --git a/.config/qutebrowser/private-whitelist b/.config/qutebrowser/private-whitelist
deleted file mode 100644
index d2a8266..0000000
--- a/.config/qutebrowser/private-whitelist
+++ /dev/null
@@ -1,3 +0,0 @@
-*://bumfuzzle.com/*,
-*://pmags.com/*,
-*://git.luxagraf.net/*,
diff --git a/.config/qutebrowser/quickmarks b/.config/qutebrowser/quickmarks
index bdc5e82..4b83a6f 100644
--- a/.config/qutebrowser/quickmarks
+++ b/.config/qutebrowser/quickmarks
@@ -1,15 +1,17 @@
 ad https://live.luxagraf.net/admin/
+tr https://live.luxagraf.net/trading/
+base https://wandererfinancial.com/basecamp/
 li https://live.luxagraf.net/
 lx https://luxagraf.net/
-dev http://10.97.181.153:8000/
-aw https://awstats.luxagraf.net/cgi-bin/awstats.pl?config=luxagraf.net
-stats https://stats.luxagraf.net/
-arch https://www.archlinux.org/news/
+dev http://10.87.144.224:8000/
+stats https://awstats.luxagraf.net/cgi-bin/awstats.pl?config=luxagraf.net
 wind https://earth.nullschool.net/
 weather http://www.ssec.wisc.edu/data/us_comp/large
 map https://maps.usgs.gov/padus/
 trans https://translate.google.com/
 salts https://lovelovething.com/cell-salts-easy-homeopathy/
 sch https://www.schoolsfirstfcu.org/
+tast https://trade.tastyworks.com/login/index.html
 sw http://schwab.com/
 wm https://webmail.luxagraf.net/rainloop/
+arch https://www.archlinux.org/news/
diff --git a/.config/qutebrowser/userscripts/twitter-to-nitter.js b/.config/qutebrowser/userscripts/twitter-to-nitter.js
new file mode 100644
index 0000000..b9ccc38
--- /dev/null
+++ b/.config/qutebrowser/userscripts/twitter-to-nitter.js
@@ -0,0 +1,11 @@
+// ==UserScript==
+// @name           Twitter to Nitter redirector
+// @namespace      mamg22's userscripts
+// @match          http://twitter.com/*
+// @match          https://twitter.com/*
+// @match          http://www.twitter.com/*
+// @match          https://www.twitter.com/*
+// @run-at         document-start
+// ==/UserScript==
+
+location.href=location.href.replace("twitter.com","nitter.net");
diff --git a/.config/qutebrowser/userscripts/youtube-to-invidious.js b/.config/qutebrowser/userscripts/youtube-to-invidious.js
new file mode 100644
index 0000000..b51c506
--- /dev/null
+++ b/.config/qutebrowser/userscripts/youtube-to-invidious.js
@@ -0,0 +1,11 @@
+// ==UserScript==
+// @name           YouTube to Invidious redirector
+// @namespace      lxf userscripts
+// @match          http://youtube.com/*
+// @match          https://youtube.com/*
+// @match          http://www.youtube.com/*
+// @match          https://www.youtube.com/*
+// @run-at         document-start
+// ==/UserScript==
+
+location.href=location.href.replace("www.youtube.com","invidious.fdn.fr");
diff --git a/.config/qutebrowser/whitelists/cookies b/.config/qutebrowser/whitelists/cookies
index 35b04c6..a60c46b 100644
--- a/.config/qutebrowser/whitelists/cookies
+++ b/.config/qutebrowser/whitelists/cookies
@@ -1 +1,15 @@
-google.com
+luxagraf.net
+live.luxagraf.net
+wandererfinancial.com
+www.wandererfinancial.com
+trade.tastyworks.com
+tradingview.com
+www.tradingview.com
+tradingview.com
+www.schwab.com
+schwab.com
+client.schwab.com
+www.schoolsfirstfcu.com
+schoolsfirstfcu.com
+talk.hyvor.com
+webmail.luxagraf.net
diff --git a/.config/ranger/bookmarks b/.config/ranger/bookmarks
index aa71123..bfef72a 100644
--- a/.config/ranger/bookmarks
+++ b/.config/ranger/bookmarks
@@ -10,4 +10,4 @@ c:/home/lxf/pictures/nextcloud-ccg-phone
 t:/home/lxf/temp
 p:/home/lxf/temp/wired
 k:/home/lxf/videos/downloads
-':/mnt/backup/week.0/videos
+':/home/lxf/videos/downloads/darktable
diff --git a/.config/sway/config b/.config/sway/config
index 2d1688a..8c57f55 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,8 +1,7 @@
 set $mod Mod1
 set $mod2 Mod4
 set $term alacritty
-#set $background /mnt/storage/pictures/desktops/isla-dark.jpg
-set $background ~/pictures/desktops/Beach\ -\ Renato\ Giordanelli.jpg
+set $background ~/pictures/desktops/mountains_night_sky_dark.jpg
 set $screenshot grim ~/pictures/screenshots/scrn-$(date +"%Y-%m-%d-%H-%M-%S").png
 set $screenclip slurp | grim -g - ~/pictures/screenshots/scrn-$(date +"%Y-%m-%d-%H-%M-%S").png
 
@@ -21,27 +20,22 @@ exec swayidle -w \
     resume 'swaymsg "output * dpms on"' \
     before-sleep 'swaylock -f -c 000000'
 
-# Launch apps 
-bindsym $mod+Escape exec qutebrowser
-bindsym $mod+Return exec $term
-
-
 # Shortcuts
+bindsym $mod+Return exec $term
 bindsym $mod+F11 exec $screenshot
 bindsym $mod+F12 exec $screenclip
 
 # background
 output * bg $background fill
 
-input "1739:30383:DELL07E6:00_06CB:76AF_Touchpad" {
+input type:touchpad {
     natural_scroll enabled
 }
-
 # change focus
 bindsym $mod2+j focus left
 bindsym $mod2+k focus right 
-#bindsym $mod2+k focus up 
-#bindsym $mod2+j focus down 
+#bindsym $mod+l focus up
+#bindsym $mod+semicolon focus down 
 
 # move focused window
 bindsym $mod+Shift+j move left
@@ -50,14 +44,14 @@ bindsym $mod+Shift+l move up
 bindsym $mod+Shift+semicolon move down 
 
 # split in horizontal orientation
-bindsym $mod2+h split h
+bindsym $mod+Shift+h split h
 
 # split in vertical orientation
-bindsym $mod2+v split v
+bindsym $mod+v split v
 
 # enter fullscreen mode for the focused container
 bindsym $mod+Shift+f fullscreen toggle
-bindsym $mod2+f floating toggle
+bindsym $mod+f floating toggle
 
 # change container layout (stacked, tabbed, toggle split)
 bindsym $mod+Shift+s layout stacking
@@ -80,8 +74,6 @@ set $ws7 "7"
 set $ws8 "8"
 set $ws9 "9"
 
-#gaps outer 0
-default_border pixel 2
 
 # switch to workspace
 bindsym $mod+1 workspace $ws1
@@ -119,36 +111,48 @@ bindsym $mod+Shift+minus move scratchpad
 # If there are multiple scratchpad windows, this command cycles through them.
 bindsym $mod+minus scratchpad show
 
+for_window [class="^Chromium$"] border none
+for_window [class="tasty.javafx.launcher.LauncherFxApp"] border none
+for_window [title="Confirmation"] floating enable 
+for_window [app_id="com.nextcloud.desktopclient.nextcloud"] floating enable 
+for_window [app_id="com.nextcloud.desktopclient.nextcloud"] border none 
 for_window [title="Oracle VM VirtualBox Manager"]  floating enable 
-for_window [class="^Pcmanfm"] floating enable 
+for_window [app_id="thunar"] floating enable 
+for_window [app_id="soffice"] floating enable 
 for_window [class="^lxf$"] floating enable 
-for_window [app_id="pavucontrol"] floating enable, resize set width 50 ppt height 60 ppt
-for_window [window_role="pop-up"] floating enable
-for_window [class="Yad"] floating enable
-for_window [class="feh"] floating enable
-for_window [app_id="gedit"] floating enable
-for_window [app_id="python3"] border none, floating enable
-
+for_window [app_id="system-config-printer"] floating enable 
 
-for_window [class="^Chromium$"] border none
 for_window [app_id="darktable"] border none
-for_window [app_id="org.qutebrowser.qutebrowser"] border none
-for_window [app_id="qutebrowser"] border none
+for_window [class="Darktable"] border none
+for_window [app_id="python3"] border none, floating enable
+for_window [class="^URxvt"] border none
 for_window [app_id="firefoxdeveloperedition"] border none
 for_window [class="firefoxdeveloperedition"] border none
 for_window [app_id="Vivaldi-snapshot"] border none
-for_window [class="Vivaldi-snapshot"] border none
+for_window [app_id="Vivaldi-stable"] border none
+for_window [class="Vivaldi"] border none
 for_window [class="^qutebrowser"] border none
+for_window [app_id="org.qutebrowser.qutebrowser"] border none
+for_window [app_id="^Alacritty"] border none
 for_window [class="Slack"] border none
-#for_window [app_id="Alacritty"] floating enable, resize set width 53 ppt height 100 ppt
-for_window [app_id="Alacritty"] border none
-for_window [app_id="mpv"] border none
-for_window [app_id="foot"] border none
+for_window [class="Pavucontrol"] floating enable
+for_window [window_role="pop-up"] floating enable
+for_window [class="Yad"] floating enable
+for_window [class="feh"] floating enable
+for_window [class="QtPass"] floating enable
+for_window [app_id="mpv"] floating enable
+for_window [class="hangouts.google.com"] floating disable
+for_window [class="hangouts.google.com"] border normal
+for_window [app_id="gedit"] floating enable
 
 assign [class="qutebrowser"] $ws2
 assign [app_id="org.qutebrowser.qutebrowser"] $ws2
+assign [class="Firefox Developer"] $ws4
 assign [class="Slack"] $ws6
+assign [class="Vivaldi"] $ws2
+assign [class="Darktable"] $ws3
 assign [app_id="darktable"] $ws3
+assign [title="Oracle VM VirtualBox Manager"] $ws4
 
 #workspace switching
 bindsym $mod+k workspace next
@@ -160,8 +164,8 @@ bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
 bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
 bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
 bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
-#bindsym XF86MonBrightnessUp exec --no-startup-id light -A 10
-#bindsym XF86MonBrightnessDown exec --no-startup-id light -U 10
+bindsym --locked XF86MonBrightnessUp exec --no-startup-id light -A 10
+bindsym --locked XF86MonBrightnessDown exec --no-startup-id light -U 10
 
 set $alsacard 1
 
@@ -200,48 +204,36 @@ input * {
     xkb_options ctrl:nocaps
 }
 input "1:1:AT_Translated_Set_2_keyboard" {
-    repeat_delay 200
-    repeat_rate 30
+    repeat_delay 250
+    repeat_rate 25
 }
-exec --no-startup-id gammastep &
-exec --no-startup-id gnome-keyright-daemon &
-exec --no-startup-id nextcloud &
-
-# old i3 X11 stuff
-#exec --no-startup-id xset r rate 250 25 &
-#exec --no-startup-id xset -b 
-#exec --no-startup-id xcape -e 'Control_L=Escape'
+exec vivaldi-stable --ozone-platform=wayland --enable-features=UseOzonePlatform &
+exec alacritty &
+exec nextcloud &
+exec mpd &
 
 # clipboard manager
 exec wl-paste -t text --watch clipman store --max-items=200 --histpath="~/.local/share/clipman-primary.json"
-bindsym $mod+z exec clipman pick --tool="wofi" --max-items=200 --histpath="~/.local/share/clipman-primary.json"
+bindsym $mod+c exec alacritty --class 'smsearch' --command bash -c 'fzclip | xargs -r swaymsg -t command exec'
 
-# homemade app launcher
-#bindsym $mod+Space exec foot --app-id=launcher bash -c "compgen -c | sort -u | fzf --bind 'tab:up' | xargs -r swaymsg -t command exec"
-#
-#trying bemenu:
-bindsym $mod+Space exec bemenu-run
+# app launcher
+bindsym $mod+Space exec alacritty --class 'launcher' --command bash -c 'compgen -c | sort -u | fzf | xargs -r swaymsg -t command exec'
 
 # pass chooser
-bindsym $mod+p exec foot --app-id=launcher bash -c 'pass clip --fzf | xargs -r swaymsg -t command exec'
+bindsym $mod+p exec alacritty --class 'launcher' --command bash -c 'pass clip --fzf | xargs -r swaymsg -t command exec'
 
 for_window [app_id="^launcher$"] floating enable, border none, resize set width 25 ppt height 20 ppt, move position 0 px 0 px
 
 #snippet manager 
-bindsym $mod+s exec foot --app-id=smsearch bash -c 'fzsnip | xargs -r swaymsg -t command exec'
-
-#clipboard manager 
-bindsym $mod+c exec foot --app-id=smsearch bash -c 'fzclip | xargs -r swaymsg -t command exec'
+bindsym $mod+s exec alacritty --class 'smsearch' --command bash -c 'fzsnip | xargs -r swaymsg -t command exec'
 
-bindsym $mod+b exec foot --app-id=smsearch bash -c 'url=$(cat .config/qute-wired/bookmarks/urls | fzf | cut -d \" \" -f 1) && qutebrowser "$url" | xargs -r swaymsg -t command exec'
+bindsym $mod+b exec alacritty --class 'smsearch' --command bash -c 'url=$(cat .config/qutebrowser/bookmarks/urls | fzf | cut -d \" \" -f 1) && qutebrowser "$url" | xargs -r swaymsg -t command exec'
 
 for_window [app_id="^smsearch$"] floating enable, border none, resize set width 80 ppt height 60 ppt, move position 0 px 0 px
 
 
 bindsym $mod+n exec alacritty --class 'smsearch' --command bash -c 'notes'
 
-bindsym $mod2+n exec alacritty --class 'smsearch' --command bash -c 'stocks'
-
 for_window [app_id="^smsearch$"] floating enable, border none, resize set width 80 ppt height 60 ppt, move position 0 px 0 px
 
 exec_always ~/.config/waybar/waybar.sh
diff --git a/.config/waybar/config b/.config/waybar/config
index e379c02..3dbeb15 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -16,6 +16,7 @@
         "format": "{:%a, %b %d | %H:%M}",
         "tooltip": true,
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        "on-click": "gsimplecal",
     },
     "battery": {
         "format": "| {capacity}% {icon} | ",
diff --git a/.config/waybar/modules/weather.sh b/.config/waybar/modules/weather.sh
index d64acd0..0333af3 100755
--- a/.config/waybar/modules/weather.sh
+++ b/.config/waybar/modules/weather.sh
@@ -3,4 +3,4 @@ w=$(curl -s wttr.in/ahn?format="%l:+%c+%t+%C+%w+%h+%m")
 w=${w:7}
 w="$(echo -e "${w}" | sed -e 's/^[[:space:]]*//')"
 m=$(python ~/bin/moonphase-waybar.py)
-echo "{\"text\":\""$w ""$m"\", \"tooltip\":\""tooltip"\", \"class\":\""lxf-weather"\"}"
+#echo "{\"text\":\""$w ""$m"\", \"tooltip\":\""tooltip"\", \"class\":\""lxf-weather"\"}"