From ce2a2cf9f5b7eb035e326930dcdab5e3018b1d0c Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fl.fischer@fau.de>
Date: Mon, 6 Nov 2017 17:42:47 +0100
Subject: use xdg_spec for i3 setup

---
 .gitignore                |   1 -
 config/i3/config          | 224 ++++++++++++++++++++++++++++++++++++++++++++++
 config/i3/conky-i3bar     |  13 +++
 config/i3/conkyrc.json    | 107 ++++++++++++++++++++++
 config/i3/conkyrc_unicode | 106 ++++++++++++++++++++++
 i3/config                 | 224 ----------------------------------------------
 i3/conky-i3bar            |  13 ---
 i3/conkyrc.json           | 107 ----------------------
 i3/conkyrc_unicode        | 106 ----------------------
 setup.py                  |   2 +-
 xinitrc                   |   3 +-
 11 files changed, 453 insertions(+), 453 deletions(-)
 create mode 100644 config/i3/config
 create mode 100755 config/i3/conky-i3bar
 create mode 100644 config/i3/conkyrc.json
 create mode 100644 config/i3/conkyrc_unicode
 delete mode 100644 i3/config
 delete mode 100755 i3/conky-i3bar
 delete mode 100644 i3/conkyrc.json
 delete mode 100644 i3/conkyrc_unicode

diff --git a/.gitignore b/.gitignore
index 0fe71a5..7b80bde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 *~
 *.pyc
-i3/log
 vim/.netrwhist
 
 # exclude private files
diff --git a/config/i3/config b/config/i3/config
new file mode 100644
index 0000000..7e96db1
--- /dev/null
+++ b/config/i3/config
@@ -0,0 +1,224 @@
+# i3 config file (v4)
+#
+# Please see http://i3wm.org/docs/userguide.html for a complete reference!
+#
+# This config file uses keycodes (bindsym) and was written for the QWERTY
+# layout.
+#
+# To get a config file with the same key positions, but for your current
+# layout, use the i3-config-wizard
+#
+
+# Font for window titles. Will also be used by the bar unless a different font
+# is used in the bar {} block below.
+# This font is widely installed, provides lots of unicode glyphs, right-to-left
+# text rendering and scalability on retina/hidpi displays (thanks to pango).
+font pango:DejaVu Sans Mono 10 
+# Before i3 v4.8, we used to recommend this one as the default:
+# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+# The font above is very space-efficient, that is, it looks good, sharp and
+# clear in small sizes. However, its unicode glyph coverage is limited, the old
+# X core fonts rendering does not support right-to-left and this being a bitmap
+# font, it doesn’t scale on retina/hidpi displays.
+
+set $mod Mod4 
+
+# use these keys for focus, movement, and resize directions when reaching for
+# the arrows is not convenient
+set $up l
+set $down k
+set $left j
+set $right semicolon
+
+# use Mouse+$mod to drag floating windows to their wanted position
+floating_modifier $mod
+
+# start a terminal
+bindsym $mod+Return exec i3-sensible-terminal
+
+# kill focused window
+bindsym $mod+Shift+q kill
+
+# start dmenu (a program launcher)
+# bindsym $mod+d exec dmenu_run
+# There also is the (new) i3-dmenu-desktop which only displays applications
+# shipping a .desktop file. It is a wrapper around dmenu, so you need that
+# installed.
+# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
+
+# programm starter
+bindsym $mod+d exec $DOTFILES_LOCATION/scripts/program_starter.sh
+# ssh starter
+bindsym $mod+Shift+d exec $DOTFILES_LOCATION/scripts/ssh_starter.sh
+
+# change focus
+bindsym $mod+$left focus left
+bindsym $mod+$down focus down
+bindsym $mod+$up focus up
+bindsym $mod+$right focus right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# move focused window
+bindsym $mod+Shift+$left move left
+bindsym $mod+Shift+$down move down
+bindsym $mod+Shift+$up move up
+bindsym $mod+Shift+$right move right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+
+# split in horizontal orientation
+bindsym $mod+h split h
+
+# split in vertical orientation
+bindsym $mod+v split v
+
+# enter fullscreen mode for the focused container
+bindsym $mod+f fullscreen
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+bindsym $mod+a focus parent
+
+# focus the child container
+#bindsym $mod+d focus child
+
+# move the currently focused window to the scratchpad
+bindsym $mod+Shift+minus move scratchpad
+
+# Show the next scratchpad window or hide the focused scratchpad window.
+# If there are multiple scratchpad windows, this command cycles through them.
+bindsym $mod+minus scratchpad show
+
+# switch to workspace
+bindsym $mod+1 workspace 1
+bindsym $mod+2 workspace 2: www
+bindsym $mod+3 workspace 3: work
+bindsym $mod+4 workspace 4
+bindsym $mod+5 workspace 5
+bindsym $mod+6 workspace 6
+bindsym $mod+7 workspace 7
+bindsym $mod+8 workspace 8: mail
+bindsym $mod+9 workspace 9: spotify
+bindsym $mod+0 workspace 10
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace 1
+bindsym $mod+Shift+2 move container to workspace 2: www
+bindsym $mod+Shift+3 move container to workspace 3: work
+bindsym $mod+Shift+4 move container to workspace 4
+bindsym $mod+Shift+5 move container to workspace 5
+bindsym $mod+Shift+6 move container to workspace 6
+bindsym $mod+Shift+7 move container to workspace 7
+bindsym $mod+Shift+8 move container to workspace 8: mail
+bindsym $mod+Shift+9 move container to workspace 9: spotify
+bindsym $mod+Shift+0 move container to workspace 10
+
+# reload the configuration file
+bindsym $mod+Shift+c reload
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+r restart
+# exit i3 (logs you out of your X session)
+bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
+
+# resize window (you can also use the mouse for that)
+mode "resize" {
+        # These bindings trigger as soon as you enter the resize mode
+
+        # Pressing left will shrink the window’s width.
+        # Pressing right will grow the window’s width.
+        # Pressing up will shrink the window’s height.
+        # Pressing down will grow the window’s height.
+        bindsym $left       resize shrink width 10 px or 10 ppt
+        bindsym $down       resize grow height 10 px or 10 ppt
+        bindsym $up         resize shrink height 10 px or 10 ppt
+        bindsym $right      resize grow width 10 px or 10 ppt
+
+        # same bindings, but for the arrow keys
+        bindsym Left        resize shrink width 10 px or 10 ppt
+        bindsym Down        resize grow height 10 px or 10 ppt
+        bindsym Up          resize shrink height 10 px or 10 ppt
+        bindsym Right       resize grow width 10 px or 10 ppt
+
+        # back to normal: Enter or Escape
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+}
+
+bindsym $mod+r mode "resize"
+
+# Start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+bar {
+	#status_command i3status
+	status_command $HOME/.config/i3/conky-i3bar
+}
+
+# Audio shortcuts
+# # Volume
+bindsym XF86AudioLowerVolume exec $DOTFILES_LOCATION/scripts/audio_control.sh -5
+bindsym XF86AudioRaiseVolume exec $DOTFILES_LOCATION/scripts/audio_control.sh +5
+bindsym XF86AudioMute exec $DOTFILES_LOCATION/scripts/audio_control.sh toggle
+# # Music
+bindsym XF86AudioPrev exec $DOTFILES_LOCATION/scripts/media_control.sh prev
+bindsym XF86AudioPlay exec $DOTFILES_LOCATION/scripts/media_control.sh toggle
+bindsym XF86AudioNext exec $DOTFILES_LOCATION/scripts/media_control.sh next
+
+## brightnescontroll
+bindsym XF86MonBrightnessUp exec xbacklight +10
+bindsym XF86MonBrightnessDown exec xbacklight -10
+                                                              
+# Toogle Touchpad with Batterybutton
+bindsym XF86Battery exec $DOTFILES_LOCATION/scripts/toggle_syn_touchpad.sh
+
+# Suspend
+bindsym $mod+F7 exec systemctl suspend
+
+#hide broders
+new_window pixel 3
+hide_edge_borders smart
+
+# Set Displayorientation
+exec --no-startup-id xrandr --output HDMI1 --right-of eDP1
+
+# set i3lock as xscreensaver
+exec --no-startup-id xss-lock -- i3lock -i $DOTFILES_LOCATION/wallpapers/blue_screen.png #-lock
+
+# Autostart Programms
+exec --no-startup-id feh --bg-fill $DOTFILES_LOCATION/wallpapers/nsa_wallpaper.png
+exec --no-startup-id syndaemon -i 1 -d
+#exec --no-startup-id nm-applet
+exec --no-startup-id owncloud
+exec --no-startup-id mpd
+
+# Autorestore Layout
+#exec --no-startup-id "i3-msg 'workspace 1; append_layout /home/fischerling/.i3/workspace-1.json'"
+
+#######################################################################
+# automatically start i3-config-wizard to offer the user to create a
+# keysym-based config which used his favorite modifier (alt or windows)
+#
+# i3-config-wizard will not launch if there already is a config file
+# in ~/.i3/config.
+#
+# Please remove the following exec line:
+#######################################################################
+exec i3-config-wizard
diff --git a/config/i3/conky-i3bar b/config/i3/conky-i3bar
new file mode 100755
index 0000000..56159c3
--- /dev/null
+++ b/config/i3/conky-i3bar
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# Send the header so that i3bar knows we want to use JSON:
+echo '{"version":1}'
+
+# Begin the endless array.
+echo '['
+
+# We send an empty first array of blocks to make the loop simpler:
+echo '[],'
+
+# Now send blocks with information forever:
+exec conky -c $HOME/.config/i3/conkyrc.json
diff --git a/config/i3/conkyrc.json b/config/i3/conkyrc.json
new file mode 100644
index 0000000..1c45da2
--- /dev/null
+++ b/config/i3/conkyrc.json
@@ -0,0 +1,107 @@
+conky.config = {
+    background = false,
+    out_to_x = false,
+    out_to_console = true,
+    update_interval = 1,
+    mpd_port = 6601,
+
+    -- Network interface must have an ip address to be considered up
+    if_up_strictness = "address"
+}
+
+conky.text = [[
+[
+    #{"name": "uptime", "color":"\#ffffff", "full_text":"${uptime_short}"},
+    
+    ################## cpu #################
+
+    #{"name": "cpuTemperature", "full_text": "${exec sensors | grep -A 1 'temp1' | cut -c13-16 | sed '/^$/d'}C"},
+
+    {"name": "cpuStart", "color" : "\#ffffff", "full_text": "CPU: [", "separator": false},
+
+    {"name": "cpu1", "color": ${if_match ${cpu cpu1}<89}"\#ffffff"${else}"\#ff0000"${endif},
+    "full_text": "${cpu cpu1}%,", "separator": false},  
+
+    {"name": "cpu2", "color": ${if_match ${cpu cpu2}<89}"\#ffffff"${else}"\#ff0000"${endif},
+
+    "full_text": "${cpu cpu2}%,", "separator": false},  
+
+    {"name": "cpu3", "color": ${if_match ${cpu cpu3}<89}"\#ffffff"${else}"\#ff0000"${endif},
+    "full_text": "${cpu cpu3}%,", "separator": false},  
+
+    {"name": "cpu4", "color": ${if_match ${cpu cpu4}<89}"\#ffffff"${else}"\#ff0000"${endif},
+    "full_text": "${cpu cpu4}%", "separator": false},  
+
+    {"name": "cpuEnd", "color": "\#ffffff", "full_text": "]"},
+
+
+    ################ memory #########################
+
+    {"name": "memory", "color": ${if_match ${memperc}<80}"\#ffffff"${else}"\#ff0000"${endif},
+        "full_text": "RAM: ${memperc}%"},  
+
+    #{"name": "disk", "color": "\#ffffff", "full_text": " ${fs_used_perc /}%"},  
+
+
+    ############### music/ spotify/ mpd ###################
+
+    ${if_match "${nodename_short}"!="fishbowl"}
+	    {"name":"music", "color": "\#ffffff", "full_text": "${exec $DOTFILES_LOCATION/scripts/media_status.sh}"},
+    ${endif}
+
+
+    ########### networking ########################
+
+    ${if_up wlp2s0} 
+	    {"name":"wifi", "color": ${if_match ${wireless_link_qual_perc wlp2s0}>60}"\#339966"${else}"\#FF9200"${endif},
+        "full_text": "${addr wlp2s0} ${wireless_link_qual_perc wlp2s0}%"}, 
+        {"name":"download", "color":"\#ffffff", "full_text": "⤋: ${downspeed wlp2s0}"}, 
+
+    ${else} ${if_up enp0s20u1}
+	            {"name":"ethernet", "color": "\#339966", "full_text": "IP: ${addr enp0s20u1} "}, 
+                {"name":"download", "color":"\#ffffff", "full_text": "⤋: ${downspeed enp0s20u1}"}, 
+
+            ${else} ${if_up eth0}
+	                    {"name":"ethernet", "color": "\#339966", "full_text": "IP: ${addr eth0} "}, 
+                        {"name":"download", "color":"\#ffffff", "full_text": "⤋: ${downspeed eth0}"}, 
+
+	                ${else}
+	                    {"name":"nonet", "full_text": "no connection" }, 
+                    ${endif}  
+            ${endif}  
+    ${endif}  
+
+
+    ################ Volume ########################
+
+    {"name": "volume status", "color": "\#ffffff", "full_text":
+    "${exec $DOTFILES_LOCATION/scripts/audio_status.sh}"},
+
+
+    ################# Battery ####################
+
+    {"name": "battery","color":
+        ${if_match ${battery_percent BAT0}<50}
+            ${if_match ${battery_percent BAT0}<25}"\#ff0000"
+            ${else}"\#ff9200"
+            ${endif}
+        ${else}"\#ffffff"
+        ${endif}, "full_text": "${battery BAT0}"},  
+    
+    {"name": "battery","color":
+        ${if_match ${battery_percent BAT1}<50}
+            ${if_match ${battery_percent BAT1}<25}"\#ff0000"
+            ${else}"\#ff9200"
+            ${endif}
+        ${else}"\#ffffff"
+        ${endif}, "full_text": "${battery BAT1}"},  
+
+
+    ############### Time ##################
+    ${if_match "${nodename_short}"!="fishbowl"}
+        {"name": "marks", "color": "\#FFFFFF",
+        "full_text": "${exec fish -c 'mark get -r=3'}", "separator": false},
+    ${endif}
+    {"name": "time", "color": "\#CFCFCF", "full_text": "${time %d/%m/%y} ${time %H:%M}"}
+],
+]]
diff --git a/config/i3/conkyrc_unicode b/config/i3/conkyrc_unicode
new file mode 100644
index 0000000..c2bc7d7
--- /dev/null
+++ b/config/i3/conkyrc_unicode
@@ -0,0 +1,106 @@
+background no
+out_to_x no
+out_to_console yes
+update_interval 1
+mpd_port 6601
+
+# Network interface must have an ip address to be considered up
+if_up_strictness address
+
+TEXT
+[
+    #{"name": "uptime", "color":"\#ffffff", "full_text":"${uptime_short} "},
+    
+    ################## cpu #################
+
+    #{"name": "cpuTemperature", "full_text": "${exec sensors | grep -A 1 'temp1' | cut -c13-16 | sed '/^$/d'}C"},
+
+    {"name": "cpuStart", "color" : "\#ffffff", "full_text": "[", "separator": false},
+
+    {"name": "cpu1", "color": ${if_match ${cpu cpu1}<89}"\#ffffff"${else}"\#ff0000"${endif},
+    "full_text": "${cpu cpu1}%,", "separator": false},  
+
+    {"name": "cpu2", "color": ${if_match ${cpu cpu2}<89}"\#ffffff"${else}"\#ff0000"${endif},
+
+    "full_text": "${cpu cpu2}%,", "separator": false},  
+
+    {"name": "cpu3", "color": ${if_match ${cpu cpu3}<89}"\#ffffff"${else}"\#ff0000"${endif},
+    "full_text": "${cpu cpu3}%,", "separator": false},  
+
+    {"name": "cpu4", "color": ${if_match ${cpu cpu4}<89}"\#ffffff"${else}"\#ff0000"${endif},
+    "full_text": "${cpu cpu4}%", "separator": false},  
+
+    {"name": "cpuEnd", "color": "\#ffffff", "full_text": "]"},
+
+
+    ################ memory#########################
+
+    {"name": "memory", "color": ${if_match ${memperc}<80}"\#ffffff"${else}"\#ff0000"${endif},
+        "full_text": "RAM: ${memperc}% "},  
+
+    #{"name": "disk", "color": "\#ffffff", "full_text": " ${fs_used_perc /}% "},  
+
+
+    ############### music / mpd ###################
+
+    ${if_mpd_playing}
+       # {"name": "test status", "full_text":"${mpd_status}", "separator":false},
+
+        {"name": "statusSymbol", "color": "\#ffffff", "separator": false,
+        "full_text": ${if_match ${mpd_status}=="Playing"}"▶"${else}"▐▐"${endif}},
+        
+        {"name": "music", "color": "\#ffffff", "full_text":"${mpd_title} ${mpd_bar}"},
+    ${else}
+        {"name": "nomusic", "color": "\#ffffff", "full_text": "no music"},
+    ${endif}
+
+
+    ########### networking ########################
+
+    ${if_up wlp2s0} 
+	    {"name":"wifi", "color": ${if_match ${wireless_link_qual_perc wlan0}>60}"\#339966"${else}"\#FF9200"${endif},
+        "full_text": "${addr wlan0}  ${wireless_link_qual_perc wlp2s0}%"}, 
+            {"name":"download", "color":"\#ffffff", "full_text": "⤋: ${downspeed wlp2s0}"}, 
+
+    ${else} ${if_up enp0s20u1}
+	    {"name":"eth0", "color": "\#339966", "full_text": "IP: ${addr enp0s20u1} "}, 
+            {"name":"download", "color":"\#ffffff", "full_text": "⤋: ${downspeed enp0s20u1}"}, 
+
+	${else}
+	    {"name":"nonet", "full_text": "no connection" }, 
+	    ${endif}
+    ${endif}  
+
+
+    ################ Volume ########################
+
+    {"name": "symbol", "color": "\#ffffff", "full_text":
+    ${if_match ${exec amixer sget Master | grep Left: |
+        sed -e 's/[ \t]*Front Left: Playback [0-9]* \[\([0-9]*\)%\].*/\1/'}==0}""${else}""${endif},
+        "separator": false},
+    
+    {"name": "left", "color": "\#ffffff", "full_text": 
+        "Volume: [${exec amixer sget Master | grep Left: | sed -e 's/[ \t]*Front Left: Playback [0-9]* \[\([0-9]*%\)\].*/\1/'},", "separator": false},
+    
+        {"name": "right", "color": "\#ffffff", "full_text":
+        "${exec amixer sget Master | grep Right: | sed -e 's/[ \t]*Front Right: Playback [0-9]* \[\([0-9]*%\)\].*/ \1/'}] "},  
+
+
+    ################# Battery ####################
+
+    ${if_empty ${battery BAT1} } ${else}
+        {"name": "battery","color":
+            ${if_match ${battery_percent}<50}
+                ${if_match ${battery_percent}<25}"\#ff0000"
+                ${else}"\#ff9200"
+                ${endif}
+            ${else}"\#ffffff"
+            ${endif}, "full_text": "${battery BAT0}% "},  
+    ${endif} 
+
+
+    ############### Time ##################
+
+    {"name": "time", "color": "\#CFCFCF", "full_text": " ${time %d/%m/%y} ${time %H:%M}"}
+],
+
diff --git a/i3/config b/i3/config
deleted file mode 100644
index 8de125b..0000000
--- a/i3/config
+++ /dev/null
@@ -1,224 +0,0 @@
-# i3 config file (v4)
-#
-# Please see http://i3wm.org/docs/userguide.html for a complete reference!
-#
-# This config file uses keycodes (bindsym) and was written for the QWERTY
-# layout.
-#
-# To get a config file with the same key positions, but for your current
-# layout, use the i3-config-wizard
-#
-
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-# This font is widely installed, provides lots of unicode glyphs, right-to-left
-# text rendering and scalability on retina/hidpi displays (thanks to pango).
-font pango:DejaVu Sans Mono 10 
-# Before i3 v4.8, we used to recommend this one as the default:
-# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-# The font above is very space-efficient, that is, it looks good, sharp and
-# clear in small sizes. However, its unicode glyph coverage is limited, the old
-# X core fonts rendering does not support right-to-left and this being a bitmap
-# font, it doesn’t scale on retina/hidpi displays.
-
-set $mod Mod4 
-
-# use these keys for focus, movement, and resize directions when reaching for
-# the arrows is not convenient
-set $up l
-set $down k
-set $left j
-set $right semicolon
-
-# use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-
-# start a terminal
-bindsym $mod+Return exec i3-sensible-terminal
-
-# kill focused window
-bindsym $mod+Shift+q kill
-
-# start dmenu (a program launcher)
-# bindsym $mod+d exec dmenu_run
-# There also is the (new) i3-dmenu-desktop which only displays applications
-# shipping a .desktop file. It is a wrapper around dmenu, so you need that
-# installed.
-# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
-
-# programm starter
-bindsym $mod+d exec $DOTFILES_LOCATION/scripts/program_starter.sh
-# ssh starter
-bindsym $mod+Shift+d exec $DOTFILES_LOCATION/scripts/ssh_starter.sh
-
-# change focus
-bindsym $mod+$left focus left
-bindsym $mod+$down focus down
-bindsym $mod+$up focus up
-bindsym $mod+$right focus right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# move focused window
-bindsym $mod+Shift+$left move left
-bindsym $mod+Shift+$down move down
-bindsym $mod+Shift+$up move up
-bindsym $mod+Shift+$right move right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-# split in horizontal orientation
-bindsym $mod+h split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
-# move the currently focused window to the scratchpad
-bindsym $mod+Shift+minus move scratchpad
-
-# Show the next scratchpad window or hide the focused scratchpad window.
-# If there are multiple scratchpad windows, this command cycles through them.
-bindsym $mod+minus scratchpad show
-
-# switch to workspace
-bindsym $mod+1 workspace 1
-bindsym $mod+2 workspace 2: www
-bindsym $mod+3 workspace 3: work
-bindsym $mod+4 workspace 4
-bindsym $mod+5 workspace 5
-bindsym $mod+6 workspace 6
-bindsym $mod+7 workspace 7
-bindsym $mod+8 workspace 8: mail
-bindsym $mod+9 workspace 9: spotify
-bindsym $mod+0 workspace 10
-
-# move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace 1
-bindsym $mod+Shift+2 move container to workspace 2: www
-bindsym $mod+Shift+3 move container to workspace 3: work
-bindsym $mod+Shift+4 move container to workspace 4
-bindsym $mod+Shift+5 move container to workspace 5
-bindsym $mod+Shift+6 move container to workspace 6
-bindsym $mod+Shift+7 move container to workspace 7
-bindsym $mod+Shift+8 move container to workspace 8: mail
-bindsym $mod+Shift+9 move container to workspace 9: spotify
-bindsym $mod+Shift+0 move container to workspace 10
-
-# reload the configuration file
-bindsym $mod+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-# exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
-        # These bindings trigger as soon as you enter the resize mode
-
-        # Pressing left will shrink the window’s width.
-        # Pressing right will grow the window’s width.
-        # Pressing up will shrink the window’s height.
-        # Pressing down will grow the window’s height.
-        bindsym $left       resize shrink width 10 px or 10 ppt
-        bindsym $down       resize grow height 10 px or 10 ppt
-        bindsym $up         resize shrink height 10 px or 10 ppt
-        bindsym $right      resize grow width 10 px or 10 ppt
-
-        # same bindings, but for the arrow keys
-        bindsym Left        resize shrink width 10 px or 10 ppt
-        bindsym Down        resize grow height 10 px or 10 ppt
-        bindsym Up          resize shrink height 10 px or 10 ppt
-        bindsym Right       resize grow width 10 px or 10 ppt
-
-        # back to normal: Enter or Escape
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-}
-
-bindsym $mod+r mode "resize"
-
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-bar {
-	#status_command i3status
-	status_command $HOME/.i3/conky-i3bar
-}
-
-# Audio shortcuts
-# # Volume
-bindsym XF86AudioLowerVolume exec $DOTFILES_LOCATION/scripts/audio_control.sh -5
-bindsym XF86AudioRaiseVolume exec $DOTFILES_LOCATION/scripts/audio_control.sh +5
-bindsym XF86AudioMute exec $DOTFILES_LOCATION/scripts/audio_control.sh toggle
-# # Music
-bindsym XF86AudioPrev exec $DOTFILES_LOCATION/scripts/media_control.sh prev
-bindsym XF86AudioPlay exec $DOTFILES_LOCATION/scripts/media_control.sh toggle
-bindsym XF86AudioNext exec $DOTFILES_LOCATION/scripts/media_control.sh next
-
-## brightnescontroll
-bindsym XF86MonBrightnessUp exec xbacklight +10
-bindsym XF86MonBrightnessDown exec xbacklight -10
-                                                              
-# Toogle Touchpad with Batterybutton
-bindsym XF86Battery exec $DOTFILES_LOCATION/scripts/toggle_syn_touchpad.sh
-
-# Suspend
-bindsym $mod+F7 exec systemctl suspend
-
-#hide broders
-new_window pixel 3
-hide_edge_borders smart
-
-# Set Displayorientation
-exec --no-startup-id xrandr --output HDMI1 --right-of eDP1
-
-# set i3lock as xscreensaver
-exec --no-startup-id xss-lock -- i3lock -i $DOTFILES_LOCATION/wallpapers/blue_screen.png #-lock
-
-# Autostart Programms
-exec --no-startup-id feh --bg-fill $DOTFILES_LOCATION/wallpapers/nsa_wallpaper.png
-exec --no-startup-id syndaemon -i 1 -d
-#exec --no-startup-id nm-applet
-exec --no-startup-id owncloud
-exec --no-startup-id mpd
-
-# Autorestore Layout
-#exec --no-startup-id "i3-msg 'workspace 1; append_layout /home/fischerling/.i3/workspace-1.json'"
-
-#######################################################################
-# automatically start i3-config-wizard to offer the user to create a
-# keysym-based config which used his favorite modifier (alt or windows)
-#
-# i3-config-wizard will not launch if there already is a config file
-# in ~/.i3/config.
-#
-# Please remove the following exec line:
-#######################################################################
-exec i3-config-wizard
diff --git a/i3/conky-i3bar b/i3/conky-i3bar
deleted file mode 100755
index b380be4..0000000
--- a/i3/conky-i3bar
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# Send the header so that i3bar knows we want to use JSON:
-echo '{"version":1}'
-
-# Begin the endless array.
-echo '['
-
-# We send an empty first array of blocks to make the loop simpler:
-echo '[],'
-
-# Now send blocks with information forever:
-exec conky -c $HOME/.i3/conkyrc.json
diff --git a/i3/conkyrc.json b/i3/conkyrc.json
deleted file mode 100644
index 1c45da2..0000000
--- a/i3/conkyrc.json
+++ /dev/null
@@ -1,107 +0,0 @@
-conky.config = {
-    background = false,
-    out_to_x = false,
-    out_to_console = true,
-    update_interval = 1,
-    mpd_port = 6601,
-
-    -- Network interface must have an ip address to be considered up
-    if_up_strictness = "address"
-}
-
-conky.text = [[
-[
-    #{"name": "uptime", "color":"\#ffffff", "full_text":"${uptime_short}"},
-    
-    ################## cpu #################
-
-    #{"name": "cpuTemperature", "full_text": "${exec sensors | grep -A 1 'temp1' | cut -c13-16 | sed '/^$/d'}C"},
-
-    {"name": "cpuStart", "color" : "\#ffffff", "full_text": "CPU: [", "separator": false},
-
-    {"name": "cpu1", "color": ${if_match ${cpu cpu1}<89}"\#ffffff"${else}"\#ff0000"${endif},
-    "full_text": "${cpu cpu1}%,", "separator": false},  
-
-    {"name": "cpu2", "color": ${if_match ${cpu cpu2}<89}"\#ffffff"${else}"\#ff0000"${endif},
-
-    "full_text": "${cpu cpu2}%,", "separator": false},  
-
-    {"name": "cpu3", "color": ${if_match ${cpu cpu3}<89}"\#ffffff"${else}"\#ff0000"${endif},
-    "full_text": "${cpu cpu3}%,", "separator": false},  
-
-    {"name": "cpu4", "color": ${if_match ${cpu cpu4}<89}"\#ffffff"${else}"\#ff0000"${endif},
-    "full_text": "${cpu cpu4}%", "separator": false},  
-
-    {"name": "cpuEnd", "color": "\#ffffff", "full_text": "]"},
-
-
-    ################ memory #########################
-
-    {"name": "memory", "color": ${if_match ${memperc}<80}"\#ffffff"${else}"\#ff0000"${endif},
-        "full_text": "RAM: ${memperc}%"},  
-
-    #{"name": "disk", "color": "\#ffffff", "full_text": " ${fs_used_perc /}%"},  
-
-
-    ############### music/ spotify/ mpd ###################
-
-    ${if_match "${nodename_short}"!="fishbowl"}
-	    {"name":"music", "color": "\#ffffff", "full_text": "${exec $DOTFILES_LOCATION/scripts/media_status.sh}"},
-    ${endif}
-
-
-    ########### networking ########################
-
-    ${if_up wlp2s0} 
-	    {"name":"wifi", "color": ${if_match ${wireless_link_qual_perc wlp2s0}>60}"\#339966"${else}"\#FF9200"${endif},
-        "full_text": "${addr wlp2s0} ${wireless_link_qual_perc wlp2s0}%"}, 
-        {"name":"download", "color":"\#ffffff", "full_text": "⤋: ${downspeed wlp2s0}"}, 
-
-    ${else} ${if_up enp0s20u1}
-	            {"name":"ethernet", "color": "\#339966", "full_text": "IP: ${addr enp0s20u1} "}, 
-                {"name":"download", "color":"\#ffffff", "full_text": "⤋: ${downspeed enp0s20u1}"}, 
-
-            ${else} ${if_up eth0}
-	                    {"name":"ethernet", "color": "\#339966", "full_text": "IP: ${addr eth0} "}, 
-                        {"name":"download", "color":"\#ffffff", "full_text": "⤋: ${downspeed eth0}"}, 
-
-	                ${else}
-	                    {"name":"nonet", "full_text": "no connection" }, 
-                    ${endif}  
-            ${endif}  
-    ${endif}  
-
-
-    ################ Volume ########################
-
-    {"name": "volume status", "color": "\#ffffff", "full_text":
-    "${exec $DOTFILES_LOCATION/scripts/audio_status.sh}"},
-
-
-    ################# Battery ####################
-
-    {"name": "battery","color":
-        ${if_match ${battery_percent BAT0}<50}
-            ${if_match ${battery_percent BAT0}<25}"\#ff0000"
-            ${else}"\#ff9200"
-            ${endif}
-        ${else}"\#ffffff"
-        ${endif}, "full_text": "${battery BAT0}"},  
-    
-    {"name": "battery","color":
-        ${if_match ${battery_percent BAT1}<50}
-            ${if_match ${battery_percent BAT1}<25}"\#ff0000"
-            ${else}"\#ff9200"
-            ${endif}
-        ${else}"\#ffffff"
-        ${endif}, "full_text": "${battery BAT1}"},  
-
-
-    ############### Time ##################
-    ${if_match "${nodename_short}"!="fishbowl"}
-        {"name": "marks", "color": "\#FFFFFF",
-        "full_text": "${exec fish -c 'mark get -r=3'}", "separator": false},
-    ${endif}
-    {"name": "time", "color": "\#CFCFCF", "full_text": "${time %d/%m/%y} ${time %H:%M}"}
-],
-]]
diff --git a/i3/conkyrc_unicode b/i3/conkyrc_unicode
deleted file mode 100644
index c2bc7d7..0000000
--- a/i3/conkyrc_unicode
+++ /dev/null
@@ -1,106 +0,0 @@
-background no
-out_to_x no
-out_to_console yes
-update_interval 1
-mpd_port 6601
-
-# Network interface must have an ip address to be considered up
-if_up_strictness address
-
-TEXT
-[
-    #{"name": "uptime", "color":"\#ffffff", "full_text":"${uptime_short} "},
-    
-    ################## cpu #################
-
-    #{"name": "cpuTemperature", "full_text": "${exec sensors | grep -A 1 'temp1' | cut -c13-16 | sed '/^$/d'}C"},
-
-    {"name": "cpuStart", "color" : "\#ffffff", "full_text": "[", "separator": false},
-
-    {"name": "cpu1", "color": ${if_match ${cpu cpu1}<89}"\#ffffff"${else}"\#ff0000"${endif},
-    "full_text": "${cpu cpu1}%,", "separator": false},  
-
-    {"name": "cpu2", "color": ${if_match ${cpu cpu2}<89}"\#ffffff"${else}"\#ff0000"${endif},
-
-    "full_text": "${cpu cpu2}%,", "separator": false},  
-
-    {"name": "cpu3", "color": ${if_match ${cpu cpu3}<89}"\#ffffff"${else}"\#ff0000"${endif},
-    "full_text": "${cpu cpu3}%,", "separator": false},  
-
-    {"name": "cpu4", "color": ${if_match ${cpu cpu4}<89}"\#ffffff"${else}"\#ff0000"${endif},
-    "full_text": "${cpu cpu4}%", "separator": false},  
-
-    {"name": "cpuEnd", "color": "\#ffffff", "full_text": "]"},
-
-
-    ################ memory#########################
-
-    {"name": "memory", "color": ${if_match ${memperc}<80}"\#ffffff"${else}"\#ff0000"${endif},
-        "full_text": "RAM: ${memperc}% "},  
-
-    #{"name": "disk", "color": "\#ffffff", "full_text": " ${fs_used_perc /}% "},  
-
-
-    ############### music / mpd ###################
-
-    ${if_mpd_playing}
-       # {"name": "test status", "full_text":"${mpd_status}", "separator":false},
-
-        {"name": "statusSymbol", "color": "\#ffffff", "separator": false,
-        "full_text": ${if_match ${mpd_status}=="Playing"}"▶"${else}"▐▐"${endif}},
-        
-        {"name": "music", "color": "\#ffffff", "full_text":"${mpd_title} ${mpd_bar}"},
-    ${else}
-        {"name": "nomusic", "color": "\#ffffff", "full_text": "no music"},
-    ${endif}
-
-
-    ########### networking ########################
-
-    ${if_up wlp2s0} 
-	    {"name":"wifi", "color": ${if_match ${wireless_link_qual_perc wlan0}>60}"\#339966"${else}"\#FF9200"${endif},
-        "full_text": "${addr wlan0}  ${wireless_link_qual_perc wlp2s0}%"}, 
-            {"name":"download", "color":"\#ffffff", "full_text": "⤋: ${downspeed wlp2s0}"}, 
-
-    ${else} ${if_up enp0s20u1}
-	    {"name":"eth0", "color": "\#339966", "full_text": "IP: ${addr enp0s20u1} "}, 
-            {"name":"download", "color":"\#ffffff", "full_text": "⤋: ${downspeed enp0s20u1}"}, 
-
-	${else}
-	    {"name":"nonet", "full_text": "no connection" }, 
-	    ${endif}
-    ${endif}  
-
-
-    ################ Volume ########################
-
-    {"name": "symbol", "color": "\#ffffff", "full_text":
-    ${if_match ${exec amixer sget Master | grep Left: |
-        sed -e 's/[ \t]*Front Left: Playback [0-9]* \[\([0-9]*\)%\].*/\1/'}==0}""${else}""${endif},
-        "separator": false},
-    
-    {"name": "left", "color": "\#ffffff", "full_text": 
-        "Volume: [${exec amixer sget Master | grep Left: | sed -e 's/[ \t]*Front Left: Playback [0-9]* \[\([0-9]*%\)\].*/\1/'},", "separator": false},
-    
-        {"name": "right", "color": "\#ffffff", "full_text":
-        "${exec amixer sget Master | grep Right: | sed -e 's/[ \t]*Front Right: Playback [0-9]* \[\([0-9]*%\)\].*/ \1/'}] "},  
-
-
-    ################# Battery ####################
-
-    ${if_empty ${battery BAT1} } ${else}
-        {"name": "battery","color":
-            ${if_match ${battery_percent}<50}
-                ${if_match ${battery_percent}<25}"\#ff0000"
-                ${else}"\#ff9200"
-                ${endif}
-            ${else}"\#ffffff"
-            ${endif}, "full_text": "${battery BAT0}% "},  
-    ${endif} 
-
-
-    ############### Time ##################
-
-    {"name": "time", "color": "\#CFCFCF", "full_text": " ${time %d/%m/%y} ${time %H:%M}"}
-],
-
diff --git a/setup.py b/setup.py
index 33159f9..31760ee 100755
--- a/setup.py
+++ b/setup.py
@@ -112,7 +112,7 @@ targets = {
         "zshrc":
             [("zshrc", home_dir + "/zshrc")],
         "i3-config":
-            [("i3", home_dir + "/.i3"),
+            [("config/i3", home_dir + "/.config/i3"),
             dotfile_loc_helper],
         "dir_colors":
             [("dir_colors", home_dir + "/.dir_colors")],
diff --git a/xinitrc b/xinitrc
index f8034a3..50109ae 100755
--- a/xinitrc
+++ b/xinitrc
@@ -3,4 +3,5 @@
 [ -f /etc/xprofile ] && . /etc/xprofile
 [ -f ~/.xprofile ] && . ~/.xprofile
 
-exec i3 -V > ~/.i3/log
+[ ! -d ~/.local/share/i3 ] && mkdir -p ~/.local/share/i3
+exec i3 -V > ~/.local/share/i3/log
-- 
cgit v1.2.3