From d3b8525519556c16f4d78aeb4304678ffe45a3c0 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Fri, 22 Feb 2019 10:39:13 +0000 Subject: [PATCH 01/16] Set screen layout on magnesium --- sway/.config/sway/config.magnesium | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/sway/.config/sway/config.magnesium b/sway/.config/sway/config.magnesium index 6e16cab..7229fae 100644 --- a/sway/.config/sway/config.magnesium +++ b/sway/.config/sway/config.magnesium @@ -4,7 +4,7 @@ bar { id bar_left status_command conky-i3bar position top - output "HDMI2" + output "HDMI-A-2" font pango:Liberation Mono 10 colors { background $black_super @@ -19,7 +19,7 @@ bar { bar { id bar_right position top - output "HDMI3" + output "HDMI-A-3" font pango:Liberation Mono 10 colors { background $black_super @@ -32,8 +32,19 @@ bar { } -workspace 1 output HDMI2 -workspace 2 output HDMI3 +workspace 1 output HDMI-A-2 +workspace 2 output HDMI-A-3 + +output HDMI-A-2 { + position 0 0 + background ~/Pictures/background.jpg fit +} + +output HDMI-A-3 { + position 1920 0 + background ~/Pictures/background.jpg fit +} + font pango:Liberation Mono 8 -- 2.45.2 From 9f44010319f936d69357e53d27b64523afa0f936 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Fri, 22 Feb 2019 10:39:26 +0000 Subject: [PATCH 02/16] Force xwayland on qutebrowser --- qutebrowser/.config/qutebrowser/config.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qutebrowser/.config/qutebrowser/config.py b/qutebrowser/.config/qutebrowser/config.py index a3f6962..99723b6 100644 --- a/qutebrowser/.config/qutebrowser/config.py +++ b/qutebrowser/.config/qutebrowser/config.py @@ -25,3 +25,6 @@ config.set('content.javascript.enabled', True, '*.friedersdorff.com') c.content.headers.accept_language = 'en-US,en;q=0.5' c.content.headers.user_agent = 'Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/60.0' c.content.headers.custom = {'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'} + +#xwayland +c.qt.force_platform = 'xcb' -- 2.45.2 From 97dd31e74375dbc01f0ac6b92002c363bd62e410 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Fri, 22 Feb 2019 10:39:42 +0000 Subject: [PATCH 03/16] Rename mail configuration files --- ...utt.uk.ac.aber.maf54_offline => mutt.maf54@aber.ac.uk_offline} | 0 ...{mutt.uk.ac.aber.maf54_online => mutt.maf54@aber.ac.uk_online} | 0 .../{mutt.com.friedersdorff.com => mutt.max@friedersdorff.com} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename mail/.mutt/{mutt.uk.ac.aber.maf54_offline => mutt.maf54@aber.ac.uk_offline} (100%) rename mail/.mutt/{mutt.uk.ac.aber.maf54_online => mutt.maf54@aber.ac.uk_online} (100%) rename mail/.mutt/{mutt.com.friedersdorff.com => mutt.max@friedersdorff.com} (100%) diff --git a/mail/.mutt/mutt.uk.ac.aber.maf54_offline b/mail/.mutt/mutt.maf54@aber.ac.uk_offline similarity index 100% rename from mail/.mutt/mutt.uk.ac.aber.maf54_offline rename to mail/.mutt/mutt.maf54@aber.ac.uk_offline diff --git a/mail/.mutt/mutt.uk.ac.aber.maf54_online b/mail/.mutt/mutt.maf54@aber.ac.uk_online similarity index 100% rename from mail/.mutt/mutt.uk.ac.aber.maf54_online rename to mail/.mutt/mutt.maf54@aber.ac.uk_online diff --git a/mail/.mutt/mutt.com.friedersdorff.com b/mail/.mutt/mutt.max@friedersdorff.com similarity index 100% rename from mail/.mutt/mutt.com.friedersdorff.com rename to mail/.mutt/mutt.max@friedersdorff.com -- 2.45.2 From bb9165b5b96e750b31304b221637e0240846337f Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Fri, 22 Feb 2019 10:39:58 +0000 Subject: [PATCH 04/16] Git commit signing --- git/.gitconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git/.gitconfig b/git/.gitconfig index d5e5f81..c4866f3 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -7,6 +7,7 @@ [user] name = Maximilian Friedersdorff email = max@friedersdorff.com + signingkey = F5E7FCB3 [core] editor = vim excludesfile = /home/max/.gitignore @@ -16,8 +17,8 @@ [push] default = simple [alias] - lg = log --graph --pretty=format:'%Cred%h%Creset %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset' --date=short - hist = log --graph --full-history --all --pretty=format:'%Cred%h%Creset %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset' --date=short + lg = log --graph --pretty=format:'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset' --date=short + hist = log --graph --full-history --all --pretty=format:'%Cred%h%Creset %G? %ad %s %C(bold blue)<%an>%Creset %C(yellow)%d%Creset' --date=short struct = log --graph --full-history --all --pretty=format:'%ad %s %Creset %C(yellow)%d%Creset' --date=short --simplify-by-decoration co = checkout ci = commit -- 2.45.2 From 512b882cad8c0e5437399b76152b7ef236128d45 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Fri, 22 Feb 2019 13:37:02 +0000 Subject: [PATCH 05/16] Make pinentry windows floating --- sway/.config/sway/config.base | 1 + 1 file changed, 1 insertion(+) diff --git a/sway/.config/sway/config.base b/sway/.config/sway/config.base index b9c1741..813c36e 100644 --- a/sway/.config/sway/config.base +++ b/sway/.config/sway/config.base @@ -176,6 +176,7 @@ focus_follows_mouse no focus_on_window_activation urgent for_window [class="^rdesktop"] move workspace number 9; floating disable +for_window [class="Pinentry"] floating enable exec swayidle \ timeout 300 'swaylock -c 000000' \ -- 2.45.2 From a7db74d8a91e5d7401f372759100fc3b866bc243 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Fri, 22 Feb 2019 14:52:15 +0000 Subject: [PATCH 06/16] Correctly set the background Sway can't deal with jpgs for some reason --- sway/.config/sway/config.magnesium | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sway/.config/sway/config.magnesium b/sway/.config/sway/config.magnesium index 7229fae..e7a91bc 100644 --- a/sway/.config/sway/config.magnesium +++ b/sway/.config/sway/config.magnesium @@ -37,12 +37,12 @@ workspace 2 output HDMI-A-3 output HDMI-A-2 { position 0 0 - background ~/Pictures/background.jpg fit + background ~/Pictures/background.png fit } output HDMI-A-3 { position 1920 0 - background ~/Pictures/background.jpg fit + background ~/Pictures/background.png fit } -- 2.45.2 From 72d0f45d75a71e46fec8af11d73dd4d010583bac Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Mon, 25 Feb 2019 19:01:16 +0000 Subject: [PATCH 07/16] Fix missing conkyrc, conky-i3bar and others for sway --- sway/.config/sway/config.plutonium | 3 ++ sway/.conkyrc | 52 ++++++++++++++++++++++++++++++ sway/.local/bin/conky-i3bar | 9 ++++++ 3 files changed, 64 insertions(+) create mode 100644 sway/.conkyrc create mode 100755 sway/.local/bin/conky-i3bar diff --git a/sway/.config/sway/config.plutonium b/sway/.config/sway/config.plutonium index 91dd771..0c7a4b3 100644 --- a/sway/.config/sway/config.plutonium +++ b/sway/.config/sway/config.plutonium @@ -18,3 +18,6 @@ bar { font pango:Liberation Mono 8 set $mod Mod1 + +output DP-1 background ~/Pictures/background.png center +output DP-1 scale 2 diff --git a/sway/.conkyrc b/sway/.conkyrc new file mode 100644 index 0000000..cc7d85e --- /dev/null +++ b/sway/.conkyrc @@ -0,0 +1,52 @@ +-- vim: ts=4 sw=4 noet ai cindent syntax=lua + +conky.config = { + out_to_x = false, + own_window = false, + out_to_console = true, + short_units = true, + update_interval = 0.5, + background = false, + max_text_width = 0, + total_run_times = 0, + short_units = true, + if_up_strictness = 'address', + use_spacer = 'left', + + cpu_avg_samples = 2, +}; + +conky.text = [[ +[ + ${if_running mutt} + {"full_text": "${new_mails mail_aber/Inbox} new mails", "color": "\#ffa500"}, + ${endif} + {"full_text": "Home ${fs_free /home} Free", "color": "\#ffffff"}, + {"full_text": "Root ${fs_free /root} Free", "color": "\#ffffff"}, + {"full_text": "Disk r:${diskio_read} w:${diskio_write}", "color": "\#ffffff"}, + {"full_text": "CPU ${cpu cpu0}%", "color": "\#ffffff"}, + { + "full_text": "d:${downspeed eno1} u:${upspeed eno1} ${addr eno1}", + "color": + ${if_match "${addr eno1}"=="No Address"} + "\#ff0000" + ${else} + "\#00ff00" + ${endif} + }, + ${if_match "${addr tun0}"!="No Address"} + {"full_text": "VPN", "color": "\#00ff00"}, + ${endif} + { + "full_text": "RAM ${memperc}%", + "color": + ${if_match ${memperc}<90} + "\#ffffff" + ${else} + "\#ff0000" + ${endif} + }, + {"full_text": "${time}", "color": "\#ffffff"} +], +]]; + diff --git a/sway/.local/bin/conky-i3bar b/sway/.local/bin/conky-i3bar new file mode 100755 index 0000000..ad8d8fd --- /dev/null +++ b/sway/.local/bin/conky-i3bar @@ -0,0 +1,9 @@ +#!/bin/sh + +echo '{"version":1}' + +echo '[' + +echo '[],' + +exec conky -c ~/.conkyrc -- 2.45.2 From cd88cf69b9c7720071f83b722c8334be02b670b4 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Mon, 4 Mar 2019 10:57:13 +0000 Subject: [PATCH 08/16] Split background for monitors on magnesium --- sway/.config/sway/config.magnesium | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sway/.config/sway/config.magnesium b/sway/.config/sway/config.magnesium index e7a91bc..6f57de5 100644 --- a/sway/.config/sway/config.magnesium +++ b/sway/.config/sway/config.magnesium @@ -37,12 +37,12 @@ workspace 2 output HDMI-A-3 output HDMI-A-2 { position 0 0 - background ~/Pictures/background.png fit + background ~/Pictures/background1.png fit } output HDMI-A-3 { position 1920 0 - background ~/Pictures/background.png fit + background ~/Pictures/background2.png fit } -- 2.45.2 From 1d85d91df6acf0fc258e56e5574f86c850794b9c Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Mon, 4 Mar 2019 10:57:37 +0000 Subject: [PATCH 09/16] Enable 'true' transparency for urxvt --- X/.Xresources | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/X/.Xresources b/X/.Xresources index dd3ea58..1b58385 100644 --- a/X/.Xresources +++ b/X/.Xresources @@ -43,8 +43,11 @@ URxvt*font: xft:Liberation Mono:size=14 URxvt*letterSpace: -1 URxvt*scrollBar: false -URxvt*transparent: true -URxvt*shading: 25 +!URxvt*transparent: true +!URxvt*shading: 25 + +URxvt*depth: 32 +URxvt*background: rgba:0000/0000/0200/c800 URxvt.urgentOnBell: True -- 2.45.2 From bcb807fa6ef0b27f5d41a23aec9a6806d9216fb6 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Mon, 11 Mar 2019 10:49:32 +0000 Subject: [PATCH 10/16] Allow passing arguments to qutebrowser --- qutebrowser/.local/bin/qutebrowser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qutebrowser/.local/bin/qutebrowser b/qutebrowser/.local/bin/qutebrowser index 66796b8..66e5f7a 100755 --- a/qutebrowser/.local/bin/qutebrowser +++ b/qutebrowser/.local/bin/qutebrowser @@ -1,3 +1,3 @@ #!/bin/sh -/usr/bin/qutebrowser --qt-flag disable-reading-from-canvas +/usr/bin/qutebrowser --qt-flag disable-reading-from-canvas $@ -- 2.45.2 From c643d40e6181f4a327a32eb299027b4b1fd4a8db Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Wed, 13 Mar 2019 13:46:17 +0000 Subject: [PATCH 11/16] Stop using urlview, it is abandoned --- mail/.mutt/common.mutt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mail/.mutt/common.mutt b/mail/.mutt/common.mutt index 4b8b7ac..0653c05 100644 --- a/mail/.mutt/common.mutt +++ b/mail/.mutt/common.mutt @@ -9,10 +9,6 @@ source $alias_file set query_command = "abook --mutt-query '%s'" macro index,pager A "abook --add-email-quiet" "add the sender address to abook" -# View urls more easily with urlview -macro index \cb "|urlview\n" -macro pager \cb "|urlview\n" - macro pager \cb "\ :set my_tmp_pipe_decode=\$pipe_decode\n\ :set pipe_decode\n\ -- 2.45.2 From 35ed38f92ff745c578705ca61a0471cad55bdfd7 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Wed, 13 Mar 2019 13:46:54 +0000 Subject: [PATCH 12/16] Add usability fixes for mutt --- mail/.mutt/common.mutt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mail/.mutt/common.mutt b/mail/.mutt/common.mutt index 0653c05..5c9eaf6 100644 --- a/mail/.mutt/common.mutt +++ b/mail/.mutt/common.mutt @@ -55,3 +55,9 @@ bind index,pager \CP sidebar-prev bind index,pager \CN sidebar-next bind index,pager \CO sidebar-open unmailboxes * + +# Attach mail when forwarding +set mime_forward=ask-no + +# Dont flow to next message +set pager_stop=yes -- 2.45.2 From 870c7ebb08eee2b0f76b4217fb03e0ead4b3f56b Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Wed, 13 Mar 2019 13:47:09 +0000 Subject: [PATCH 13/16] Use qutebrowser to view html when opened explicitly --- mailcap/.mailcap | 1 + 1 file changed, 1 insertion(+) diff --git a/mailcap/.mailcap b/mailcap/.mailcap index 7014519..09e97ac 100644 --- a/mailcap/.mailcap +++ b/mailcap/.mailcap @@ -1,3 +1,4 @@ +text/html; qutebrowser %s; nametemplate=%s.html text/html; lynx -stdin -dump -force_html ; copiousoutput application/pdf; mupdf %s; application/vnd.openxmlformats-officedocument.wordprocessingml.document; libreoffice %s; -- 2.45.2 From 04b3718d5f350c56b671d3b34a3858f7b38d3173 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Wed, 13 Mar 2019 14:04:40 +0000 Subject: [PATCH 14/16] Only accept 1st (2nd?) party cookies --- qutebrowser/.config/qutebrowser/config.py | 1 + 1 file changed, 1 insertion(+) diff --git a/qutebrowser/.config/qutebrowser/config.py b/qutebrowser/.config/qutebrowser/config.py index 99723b6..55f465b 100644 --- a/qutebrowser/.config/qutebrowser/config.py +++ b/qutebrowser/.config/qutebrowser/config.py @@ -1,6 +1,7 @@ config.load_autoconfig() c.auto_save.session = True +c.content.cookies.accept = 'no-3rdparty' c.content.cookies.store = False c.content.javascript.enabled = False c.content.images = True -- 2.45.2 From 5fe2bad5ea5116e28213925cd45d2cee02959191 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Wed, 13 Mar 2019 14:05:23 +0000 Subject: [PATCH 15/16] Force wayland instead of xwayland --- qutebrowser/.config/qutebrowser/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qutebrowser/.config/qutebrowser/config.py b/qutebrowser/.config/qutebrowser/config.py index 55f465b..b51dfa8 100644 --- a/qutebrowser/.config/qutebrowser/config.py +++ b/qutebrowser/.config/qutebrowser/config.py @@ -27,5 +27,5 @@ c.content.headers.accept_language = 'en-US,en;q=0.5' c.content.headers.user_agent = 'Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/60.0' c.content.headers.custom = {'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'} -#xwayland -c.qt.force_platform = 'xcb' +# wayland +c.window.hide_decoration = True -- 2.45.2 From e399082dde892ab8cdc6ca073694b067ffda94e9 Mon Sep 17 00:00:00 2001 From: Maximilian Friedersdorff Date: Mon, 25 Mar 2019 15:05:08 +0000 Subject: [PATCH 16/16] Use wl-copy and wl-paste to manage wayland clipboard --- tmux/.tmux.conf | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index f0c331b..a16b2be 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -35,10 +35,15 @@ set -g mouse on # Dont rename windows (allows setting mail for instance) set -g allow-rename off -# move x clipboard into tmux buffer -bind C-p run "tmux set-buffer \"$(xclip -o)\"" -# move tmux copy buffer into x clipboard -bind C-y run "tmux save-buffer - | xclip -i" +## move x clipboard into tmux buffer +#bind C-p run "tmux set-buffer \"$(xclip -o)\"" +## move tmux copy buffer into x clipboard +#bind C-y run "tmux save-buffer - | xclip -i" + +#move wayland clipbord into tmux buffer +bind C-p run "tmux set-buffer \"$(wl-paste)\"" +# move tmux copy buffer into wayland clipboard +bind C-y run "tmux save-buffer - | wl-copy" -- 2.45.2