From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Tue, 28 May 2019 15:44:30 +0000 (+0100)
Subject: Merge branch 'master' of git.friedersdorff.com:max/dotfiles
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;hp=3262e9ccf8b8ad200b0da49de48d12bf827330c4;p=max%2Fdotfiles.git

Merge branch 'master' of git.friedersdorff.com:max/dotfiles
---

diff --git a/bash/.profile b/bash/.profile
index f4e15bd..43fbef4 100644
--- a/bash/.profile
+++ b/bash/.profile
@@ -32,18 +32,6 @@ if [ -f ~/.config/termite/config.base ]; then
 fi
 
 
-if [ $HOSTNAME = "magnesium" ]; then
-  export XKB_DEFAULT_LAYOUT=us
-  export XKB_DEFAULT_VARIANT=colemak
-  export XKB_DEFAULT_OPTIONS=ctrl:nocaps
-fi
-
-if [ $HOSTNAME = "platinum" ]; then
-  export XKB_DEFAULT_LAYOUT=gb
-  export XKB_DEFAULT_VARIANT=colemak
-  export XKB_DEFAULT_OPTIONS=ctrl:nocaps
-fi
-
 # make less more friendly for non-text input files, see lesspipe(1)
 if [ -x /usr/bin/lesspipe ]; then 
   export LESSOPEN="|lesspipe %s"
diff --git a/spotify/.local/bin/spotify b/spotify/.local/bin/spotify
index 843a6b2..7212bfb 100755
--- a/spotify/.local/bin/spotify
+++ b/spotify/.local/bin/spotify
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-sudo -u spotify /usr/bin/spotify
+xpra start ssh/cerium --start-child spotify
diff --git a/sway/.config/sway/config.magnesium b/sway/.config/sway/config.magnesium
index 3abeacb..830e9a7 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 "HDMI-A-2"
+  output "HDMI-A-3"
   font pango:Liberation Mono 10
   colors {
     background $black_super
@@ -19,7 +19,7 @@ bar {
 bar {
   id bar_right
   position top
-  output "HDMI-A-3"
+  output "HDMI-A-2"
   font pango:Liberation Mono 10
   colors {
     background $black_super
@@ -32,16 +32,16 @@ bar {
 }
 
 
-workspace 1 output HDMI-A-2
-workspace 2 output HDMI-A-3
+workspace 1 output HDMI-A-3
+workspace 2 output HDMI-A-2
 
 output HDMI-A-2 {
-  position 0 0
+  position 0 1080
   background ~/Pictures/background_1080_1.png fit
 }
 
 output HDMI-A-3 {
-  position 1920 0
+  position 0 0
   background ~/Pictures/background_1080_2.png fit
 }
 
@@ -49,5 +49,8 @@ output HDMI-A-3 {
 
 font pango:Liberation Mono 8
 
-exec xhost +si:localuser:spotify
-exec no_glock +si:localuser:spotify
+input 1241:36:HOLDCHIP_USB_Keyboard {
+  xkb_layout us
+  xkb_variant colemak
+  xkb_options ctrl:nocaps
+}
diff --git a/sway/.config/sway/config.platinum b/sway/.config/sway/config.platinum
index da2f967..73b8eaa 100644
--- a/sway/.config/sway/config.platinum
+++ b/sway/.config/sway/config.platinum
@@ -28,3 +28,9 @@ output HDMI-A-2 {
 	position 3200 0
 	background ~/Pictures/background_1440.png fill
 }
+
+input * {
+  xkb_layout gb
+  xkb_variant colemak
+  xkb_options ctrl:nocaps
+}
diff --git a/sway/.conkyrc b/sway/.conkyrc
index d6c35dd..fb2d8bb 100644
--- a/sway/.conkyrc
+++ b/sway/.conkyrc
@@ -27,9 +27,9 @@ conky.text = [[
   {"full_text": "CPU ${cpu cpu0}%", "color": "\#ffffff"},
   ${if_match "${nodename_short}"=="magnesium"}
     {
-      "full_text": "d:${downspeed eno1} u:${upspeed eno1} ${addr eno1}", 
+      "full_text": "d:${downspeed eno1} u:${upspeed eno1} ${addr br0}", 
       "color":
-        ${if_match "${addr eno1}"=="No Address"}
+        ${if_match "${addr br0}"=="No Address"}
           "\#ff0000"
         ${else}
       	  "\#00ff00"