From 90c3f0edce0284398eebf82a3f19a8f2c10766b3 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 7 Aug 2019 11:03:52 +0100
Subject: [PATCH 01/16] Add empty setup-debian file to satisfy salt

---
 states/setup-debian.sls | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 states/setup-debian.sls

diff --git a/states/setup-debian.sls b/states/setup-debian.sls
new file mode 100644
index 0000000..e69de29
-- 
2.45.2


From 3e09439332622ebb3ddbea9a9480a6396b9d17c4 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 7 Aug 2019 11:05:21 +0100
Subject: [PATCH 02/16] Also install things on ubuntu (same as debian)

---
 states/conky/ubuntu.sls       |  3 +++
 states/firefox/ubuntu.sls     |  3 +++
 states/git/ubuntu.sls         |  3 +++
 states/mail/ubuntu.sls        |  3 +++
 states/ntp/ubuntu.sls         | 10 ++++++++++
 states/pass/ubuntu.sls        |  5 +++++
 states/qutebrowser/ubuntu.sls |  6 ++++++
 states/sway/ubuntu.sls        |  6 ++++++
 states/termite/ubuntu.sls     |  3 +++
 states/tmux/ubuntu.sls        |  3 +++
 states/vim/ubuntu.sls         |  5 +++++
 states/zsh/ubuntu.sls         |  5 +++++
 12 files changed, 55 insertions(+)
 create mode 100644 states/conky/ubuntu.sls
 create mode 100644 states/firefox/ubuntu.sls
 create mode 100644 states/git/ubuntu.sls
 create mode 100644 states/mail/ubuntu.sls
 create mode 100644 states/ntp/ubuntu.sls
 create mode 100644 states/pass/ubuntu.sls
 create mode 100644 states/qutebrowser/ubuntu.sls
 create mode 100644 states/sway/ubuntu.sls
 create mode 100644 states/termite/ubuntu.sls
 create mode 100644 states/tmux/ubuntu.sls
 create mode 100644 states/vim/ubuntu.sls
 create mode 100644 states/zsh/ubuntu.sls

diff --git a/states/conky/ubuntu.sls b/states/conky/ubuntu.sls
new file mode 100644
index 0000000..7c2f408
--- /dev/null
+++ b/states/conky/ubuntu.sls
@@ -0,0 +1,3 @@
+install conky:
+  pkg.installed:
+    - name: conky
diff --git a/states/firefox/ubuntu.sls b/states/firefox/ubuntu.sls
new file mode 100644
index 0000000..8074266
--- /dev/null
+++ b/states/firefox/ubuntu.sls
@@ -0,0 +1,3 @@
+install firefox:
+  pkg.installed:
+    - name: firefox
diff --git a/states/git/ubuntu.sls b/states/git/ubuntu.sls
new file mode 100644
index 0000000..1e11106
--- /dev/null
+++ b/states/git/ubuntu.sls
@@ -0,0 +1,3 @@
+install git:
+  pkg.installed:
+    - name: git
diff --git a/states/mail/ubuntu.sls b/states/mail/ubuntu.sls
new file mode 100644
index 0000000..a6bfc5c
--- /dev/null
+++ b/states/mail/ubuntu.sls
@@ -0,0 +1,3 @@
+install mutt:
+  pkg.installed:
+    - name: mutt
diff --git a/states/ntp/ubuntu.sls b/states/ntp/ubuntu.sls
new file mode 100644
index 0000000..a3c8902
--- /dev/null
+++ b/states/ntp/ubuntu.sls
@@ -0,0 +1,10 @@
+install ntp:
+  pkg.installed:
+    - name: ntp
+
+run ntp service:
+  service.running:
+    - name: ntpd
+    - enable: True
+    - require:
+      - pkg: install ntp
diff --git a/states/pass/ubuntu.sls b/states/pass/ubuntu.sls
new file mode 100644
index 0000000..26dce04
--- /dev/null
+++ b/states/pass/ubuntu.sls
@@ -0,0 +1,5 @@
+install pass:
+  pkg.installed:
+    - pkgs:
+      - pass
+      - pass-otp
diff --git a/states/qutebrowser/ubuntu.sls b/states/qutebrowser/ubuntu.sls
new file mode 100644
index 0000000..f7b280d
--- /dev/null
+++ b/states/qutebrowser/ubuntu.sls
@@ -0,0 +1,6 @@
+install qutebrowser:
+  pkg.installed:
+    - pkgs: 
+      - qutebrowser
+      - qt5-wayland
+      - python-tldextract
diff --git a/states/sway/ubuntu.sls b/states/sway/ubuntu.sls
new file mode 100644
index 0000000..e8d2445
--- /dev/null
+++ b/states/sway/ubuntu.sls
@@ -0,0 +1,6 @@
+install sway:
+  pkg.installed:
+    - pkgs: 
+      - sway 
+      - swaylock
+      - swayidle
diff --git a/states/termite/ubuntu.sls b/states/termite/ubuntu.sls
new file mode 100644
index 0000000..8a3cfd1
--- /dev/null
+++ b/states/termite/ubuntu.sls
@@ -0,0 +1,3 @@
+install termite:
+  pkg.installed:
+    - name: termite
diff --git a/states/tmux/ubuntu.sls b/states/tmux/ubuntu.sls
new file mode 100644
index 0000000..610a9e3
--- /dev/null
+++ b/states/tmux/ubuntu.sls
@@ -0,0 +1,3 @@
+install tmux:
+  pkg.installed:
+    - name: tmux
diff --git a/states/vim/ubuntu.sls b/states/vim/ubuntu.sls
new file mode 100644
index 0000000..c780618
--- /dev/null
+++ b/states/vim/ubuntu.sls
@@ -0,0 +1,5 @@
+install vim:
+  pkg.installed:
+    - pkgs:
+      - vim
+      - vim-molokai
diff --git a/states/zsh/ubuntu.sls b/states/zsh/ubuntu.sls
new file mode 100644
index 0000000..5aa4147
--- /dev/null
+++ b/states/zsh/ubuntu.sls
@@ -0,0 +1,5 @@
+install zsh:
+  pkg.installed:
+    - pkgs:
+      - zsh
+      - zsh-completions
-- 
2.45.2


From 5154aa0cad16cab5fcc5eae0ff0382f48e5ed3f1 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 7 Aug 2019 11:14:50 +0100
Subject: [PATCH 03/16] Do not install zsh-completion on ubuntu

---
 states/zsh/ubuntu.sls | 1 -
 1 file changed, 1 deletion(-)

diff --git a/states/zsh/ubuntu.sls b/states/zsh/ubuntu.sls
index 5aa4147..a016719 100644
--- a/states/zsh/ubuntu.sls
+++ b/states/zsh/ubuntu.sls
@@ -2,4 +2,3 @@ install zsh:
   pkg.installed:
     - pkgs:
       - zsh
-      - zsh-completions
-- 
2.45.2


From 3459467c9d1a39767951e02e98f055fa354cbad7 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 7 Aug 2019 11:19:42 +0100
Subject: [PATCH 04/16] Symlink git prompt on ubuntu

---
 states/zsh/ubuntu.sls | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/states/zsh/ubuntu.sls b/states/zsh/ubuntu.sls
index a016719..37ac5fc 100644
--- a/states/zsh/ubuntu.sls
+++ b/states/zsh/ubuntu.sls
@@ -2,3 +2,11 @@ install zsh:
   pkg.installed:
     - pkgs:
       - zsh
+
+ensure git-prompt exists:
+  file.symlink:
+    - name: {{ grains['homedir'] }}/.git-prompt.sh
+    - target: /usr/lib/git-core/git-sh-prompt
+    - user: {{ grains['user'] }}
+    - group: {{ grains['user'] }}
+    - mode: 444
-- 
2.45.2


From d7e81d10c68014fc60c32fc4876c27a317cc6f0e Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 7 Aug 2019 11:27:49 +0100
Subject: [PATCH 05/16] Update salt-master on ubuntu

---
 states/setup-ubuntu.sls | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 states/setup-ubuntu.sls

diff --git a/states/setup-ubuntu.sls b/states/setup-ubuntu.sls
new file mode 100644
index 0000000..daaf222
--- /dev/null
+++ b/states/setup-ubuntu.sls
@@ -0,0 +1,21 @@
+salt repo:
+  pkgrepo.managed:
+    - humanname: saltstack
+    - name: deb http://repo.saltstack.com/py3/ubuntu/18.04/amd64/latest bionic main
+    - dist: bionic
+    - file: /etc/apt/sources.list.d/saltstack.list
+    - gpgkey: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/latest/SALTSTACK-GPG-KEY.pub
+
+install salt:
+  pkg.latest:
+    - name: salt-master
+    - require:
+      - pkgrepo: salt repo
+
+disable salt:
+  service.dead:
+    - name: salt-master
+    - enable: False
+    - require:
+      - pkg: install salt
+
-- 
2.45.2


From ed3f42404911179903eacac27ccece74cef37707 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 7 Aug 2019 11:29:54 +0100
Subject: [PATCH 06/16] Fix key url

---
 states/setup-ubuntu.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/states/setup-ubuntu.sls b/states/setup-ubuntu.sls
index daaf222..9ddcaf4 100644
--- a/states/setup-ubuntu.sls
+++ b/states/setup-ubuntu.sls
@@ -4,7 +4,7 @@ salt repo:
     - name: deb http://repo.saltstack.com/py3/ubuntu/18.04/amd64/latest bionic main
     - dist: bionic
     - file: /etc/apt/sources.list.d/saltstack.list
-    - gpgkey: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/latest/SALTSTACK-GPG-KEY.pub
+    - key_url: https://repo.saltstack.com/py3/ubuntu/18.04/amd64/latest/SALTSTACK-GPG-KEY.pub
 
 install salt:
   pkg.latest:
-- 
2.45.2


From 77221dd2c4abbc9a9071fbf62527666f0de0bc56 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 13 Aug 2019 09:59:09 +0100
Subject: [PATCH 07/16] Enable javascript and cookie store by default on barium

This is a work machine used only for work.  Fingerprinting
be dammed
---
 states/qutebrowser/files/config.py | 12 ++++++++----
 states/qutebrowser/init.sls        |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/states/qutebrowser/files/config.py b/states/qutebrowser/files/config.py
index 515a723..6cf70b1 100644
--- a/states/qutebrowser/files/config.py
+++ b/states/qutebrowser/files/config.py
@@ -2,8 +2,6 @@ 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
 c.editor.command = ['urxvt', '-e', 'vim', '{file}']
 c.tabs.position = 'left'
@@ -12,16 +10,22 @@ c.url.searchengines = {'DEFAULT': 'https://duckduckgo.com/?q={}'}
 c.messages.timeout = 5000
 c.tabs.background = True
 
+{% if grains['host'] != 'barium' %}
+c.content.javascript.enabled = False
 config.bind(',ej', 'spawn --userscript noscript_enable')
 config.bind(',dj', 'spawn --userscript noscript_disable')
 
+c.content.cookies.store = False
+
+# Allow JS and cookies on own domain
+config.set('content.javascript.enabled', True, '*.friedersdorff.com')
+{% endif %}
+
 config.bind(',zl', 'spawn --userscript qute-pass --dmenu-invocation bemenu')
 config.bind(',zul', 'spawn --userscript qute-pass --dmenu-invocation bemenu --username-only')
 config.bind(',zpl', 'spawn --userscript qute-pass --dmenu-invocation bemenu --password-only')
 config.bind(',zol', 'spawn --userscript qute-pass --dmenu-invocation bemenu --otp-only')
 
-# Allow JS and cookies on own domain
-config.set('content.javascript.enabled', True, '*.friedersdorff.com')
 
 # Fingerprinting protection
 c.content.headers.accept_language = 'en-US,en;q=0.5'
diff --git a/states/qutebrowser/init.sls b/states/qutebrowser/init.sls
index a511ddd..c8a40ae 100644
--- a/states/qutebrowser/init.sls
+++ b/states/qutebrowser/init.sls
@@ -66,6 +66,7 @@ qutebrowser config:
     - source: salt://qutebrowser/files/config.py
     - user: {{ grains['user'] }}
     - group: {{ grains['user'] }}
+    - template: jinja
     - mode: 640
     - require:
       - file: qute config dir
-- 
2.45.2


From 12bcbfb80994d816cdda1fc7014f24b38c024f02 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 13 Aug 2019 09:59:53 +0100
Subject: [PATCH 08/16] Require the user to exist for zsh

---
 states/zsh/init.sls | 1 +
 1 file changed, 1 insertion(+)

diff --git a/states/zsh/init.sls b/states/zsh/init.sls
index 956d13d..ec3907e 100644
--- a/states/zsh/init.sls
+++ b/states/zsh/init.sls
@@ -1,4 +1,5 @@
 include:
+  - user.{{ grains['user'] }}
   - aliases
   - dircolors
   - zsh.{{ grains['os'] | lower }}
-- 
2.45.2


From c8d6974e32074717bc7a06cb23688ff8f2bb7934 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Mon, 19 Aug 2019 09:47:36 +0100
Subject: [PATCH 09/16] Correct barium displays

---
 states/sway/files/barium | 13 +++++++++----
 states/sway/files/lock   |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/states/sway/files/barium b/states/sway/files/barium
index 71ac738..18085df 100644
--- a/states/sway/files/barium
+++ b/states/sway/files/barium
@@ -4,7 +4,7 @@ bar {
   id bar_left
   status_command ~/.local/bin/conky-i3bar
   position top
-  output "eDP-1"
+  output "HDMI-A-1"
   font pango:Liberation Mono 12
   colors {
     background $black_super
@@ -19,7 +19,7 @@ bar {
 bar {
   id bar_right
   position top
-  output "HDMI-A-1"
+  output "DP-1"
   font pango:Liberation Mono 12
   colors {
     background $black_super
@@ -32,16 +32,21 @@ bar {
 }
 
 
-output eDP-1 {
+output HDMI-A-1 {
   position 0 0
   background ~/Pictures/background_1080_1.png fit
 }
 
-output HDMI-A-1 {
+output DP-1 {
   position 1920 0
   background ~/Pictures/background_1080_1.png fit
 }
 
+output eDP-1 disable
+
+workspace 1 output HDMI-A-1
+workspace 2 output HDMI-A-1
+
 
 font pango:Liberation Mono 10
 
diff --git a/states/sway/files/lock b/states/sway/files/lock
index f78f685..1c065a7 100644
--- a/states/sway/files/lock
+++ b/states/sway/files/lock
@@ -10,7 +10,7 @@ SLEEP_CMD=":"
 LOCK_CMD+=" -i HDMI-A-2:~/Pictures/lockscreen_1080_1.png"
 LOCK_CMD+=" -i HDMI-A-3:~/Pictures/lockscreen_1080_2.png"
 {% elif grains['host'] == 'barium' %}
-LOCK_CMD+=" -i eDP-1:~/Pictures/lockscreen_1080_1.png"
+LOCK_CMD+=" -i DP-1:~/Pictures/lockscreen_1080_1.png"
 LOCK_CMD+=" -i HDMI-A-1:~/Pictures/lockscreen_1080_1.png"
 SLEEP_CMD="systemctl suspend"
 {% endif %}
-- 
2.45.2


From 5ef4b34fad5fedb1ef2561ee1f0ba45fdfed0ddb Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 20 Aug 2019 09:30:50 +0100
Subject: [PATCH 10/16] Limit autocorrect to 1 error

---
 states/zsh/files/zshrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/states/zsh/files/zshrc b/states/zsh/files/zshrc
index 86ecdf4..04852ce 100644
--- a/states/zsh/files/zshrc
+++ b/states/zsh/files/zshrc
@@ -8,7 +8,7 @@ zstyle ':completion:*' ignore-parents parent pwd
 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
 zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
 zstyle ':completion:*' list-suffixes true
-zstyle ':completion:*' max-errors 2
+zstyle ':completion:*' max-errors 1
 zstyle ':completion:*' menu select=1
 zstyle ':completion:*' preserve-prefix '//[^/]##/'
 zstyle ':completion:*' prompt 'Corrections with %e differences:'
-- 
2.45.2


From ff5b42a5ef362a00890fe4b4e955123dbe428459 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 20 Aug 2019 14:34:12 +0100
Subject: [PATCH 11/16] Reconfigure screens on barium

---
 states/sway/files/barium | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/states/sway/files/barium b/states/sway/files/barium
index 18085df..384fd1a 100644
--- a/states/sway/files/barium
+++ b/states/sway/files/barium
@@ -2,7 +2,6 @@
 # finds out, if available)
 bar {
   id bar_left
-  status_command ~/.local/bin/conky-i3bar
   position top
   output "HDMI-A-1"
   font pango:Liberation Mono 12
@@ -16,6 +15,22 @@ bar {
   }
 }
 
+bar {
+  id bar_center
+  status_command ~/.local/bin/conky-i3bar
+  position top
+  output "eDP-1"
+  font pango:Liberation Mono 12
+  colors {
+    background $black_super
+    focused_background $black
+    focused_workspace $black_super $yellow_super $black
+    active_workspace $black_super $blue_super $black
+    inactive_workspace $black_super $black_super $white_super
+    urgent_workspace $black $red_super $white
+  }
+}
+
 bar {
   id bar_right
   position top
@@ -37,15 +52,19 @@ output HDMI-A-1 {
   background ~/Pictures/background_1080_1.png fit
 }
 
+output eDP-1 {
+  position 1920 500
+  background ~/Pictures/background_1080_1.png fit
+  scale 1.15
+}
 output DP-1 {
-  position 1920 0
+  position 3840 0
   background ~/Pictures/background_1080_1.png fit
 }
 
-output eDP-1 disable
-
 workspace 1 output HDMI-A-1
-workspace 2 output HDMI-A-1
+workspace 2 output eDP-1
+workspace 3 output DP-1
 
 
 font pango:Liberation Mono 10
-- 
2.45.2


From 89eb2d203ab2a211dcffe64509dc434e13a94545 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 20 Aug 2019 16:10:42 +0100
Subject: [PATCH 12/16] Fix position of 3rd screen

---
 states/sway/files/barium | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/states/sway/files/barium b/states/sway/files/barium
index 384fd1a..414b452 100644
--- a/states/sway/files/barium
+++ b/states/sway/files/barium
@@ -53,12 +53,12 @@ output HDMI-A-1 {
 }
 
 output eDP-1 {
-  position 1920 500
+  position 1920 530
   background ~/Pictures/background_1080_1.png fit
   scale 1.15
 }
 output DP-1 {
-  position 3840 0
+  position 3590 0
   background ~/Pictures/background_1080_1.png fit
 }
 
-- 
2.45.2


From 932416b555a0710d87a8616a54a57cdf7c413265 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 21 Aug 2019 09:08:47 +0100
Subject: [PATCH 13/16] Display lock screen bg on all screens

---
 states/sway/files/lock | 1 +
 1 file changed, 1 insertion(+)

diff --git a/states/sway/files/lock b/states/sway/files/lock
index 1c065a7..00ed2a8 100644
--- a/states/sway/files/lock
+++ b/states/sway/files/lock
@@ -11,6 +11,7 @@ LOCK_CMD+=" -i HDMI-A-2:~/Pictures/lockscreen_1080_1.png"
 LOCK_CMD+=" -i HDMI-A-3:~/Pictures/lockscreen_1080_2.png"
 {% elif grains['host'] == 'barium' %}
 LOCK_CMD+=" -i DP-1:~/Pictures/lockscreen_1080_1.png"
+LOCK_CMD+=" -i eDP-1:~/Pictures/lockscreen_1080_1.png"
 LOCK_CMD+=" -i HDMI-A-1:~/Pictures/lockscreen_1080_1.png"
 SLEEP_CMD="systemctl suspend"
 {% endif %}
-- 
2.45.2


From b1e32b9a71eb10379ac2e20c227659fb8218c343 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 21 Aug 2019 09:13:28 +0100
Subject: [PATCH 14/16] Start dunst with sway on barium

---
 states/sway/files/barium | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/states/sway/files/barium b/states/sway/files/barium
index 414b452..e1c8786 100644
--- a/states/sway/files/barium
+++ b/states/sway/files/barium
@@ -74,3 +74,5 @@ input type:keyboard {
   xkb_variant colemak
   xkb_options ctrl:nocaps
 }
+
+exec dunst&
-- 
2.45.2


From e468321a31ae1f5cabe8404f56bccede1c132a7e Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 28 Aug 2019 12:27:07 +0100
Subject: [PATCH 15/16] Add Black code formatter to vim

---
 states/vim/files/vimrc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/states/vim/files/vimrc b/states/vim/files/vimrc
index b8cf54d..5980b64 100644
--- a/states/vim/files/vimrc
+++ b/states/vim/files/vimrc
@@ -38,6 +38,7 @@ Plugin 'gu-fan/riv.vim'
 Plugin 'nvie/vim-rst-tables'
 Plugin 'lepture/vim-jinja'
 Plugin 'aklt/plantuml-syntax'
+Plugin 'psf/black'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -126,3 +127,6 @@ set list listchars=trail:•,extends:>,precedes:<,nbsp:␣,eol:↲,tab:→\,
 
 " Force python3 for rst tables plugin
 let g:rst_prefer_python_version = 2
+
+" Set linelength for python
+let g:black_linelength = 80
-- 
2.45.2


From ebac12bc2e2989f5afa909ba38ae95a694bb6b9e Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Wed, 28 Aug 2019 12:27:32 +0100
Subject: [PATCH 16/16] Remove anti-fingerprinting from qutebrowser on barium

---
 states/qutebrowser/files/config.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/states/qutebrowser/files/config.py b/states/qutebrowser/files/config.py
index 6cf70b1..0a96ca3 100644
--- a/states/qutebrowser/files/config.py
+++ b/states/qutebrowser/files/config.py
@@ -19,6 +19,11 @@ c.content.cookies.store = False
 
 # Allow JS and cookies on own domain
 config.set('content.javascript.enabled', True, '*.friedersdorff.com')
+
+# Fingerprinting protection
+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'}
 {% endif %}
 
 config.bind(',zl', 'spawn --userscript qute-pass --dmenu-invocation bemenu')
@@ -27,10 +32,6 @@ config.bind(',zpl', 'spawn --userscript qute-pass --dmenu-invocation bemenu --pa
 config.bind(',zol', 'spawn --userscript qute-pass --dmenu-invocation bemenu --otp-only')
 
 
-# Fingerprinting protection
-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'}
 
 # wayland
 c.window.hide_decoration = True
-- 
2.45.2