Tidy up i3 directory.

i3/i3/.gitignore

@@ -1 +0,0 @@
-testing/

i3/i3/config.d/netbook.config

@@ -47,5 +47,5 @@ bar {
     }
 
     i3bar_command i3bar
-    status_command bash ~/.i3/i3bar_wrapper.bash ~/.i3/conky/netbook.conkyrc
+    status_command bash ~/.i3/scripts/i3bar_wrapper.bash ~/.i3/conky/netbook.conkyrc
 }

i3/i3/config.d/notebook.config

@@ -46,5 +46,5 @@ bar {
     }
 
     i3bar_command i3bar
-    status_command bash ~/.i3/i3bar_wrapper.bash ~/.i3/conky/virtualarch.conkyrc
+    status_command bash ~/.i3/scripts/i3bar_wrapper.bash ~/.i3/conky/virtualarch.conkyrc
 }

i3/i3/config.d/virtualarch.config

@@ -44,5 +44,5 @@ bar {
     }
 
     i3bar_command i3bar
-    status_command bash ~/.i3/i3bar_wrapper.bash ~/.i3/conky/virtualarch.conkyrc
+    status_command bash ~/.i3/scripts/i3bar_wrapper.bash ~/.i3/conky/virtualarch.conkyrc
 }

i3/i3/i3status.d/netbook.conf

@@ -1,85 +0,0 @@
-# i3status configuration file.
-# see "man i3status" for documentation.
-
-# It is important that this file is edited as UTF-8.
-# The following line should contain a sharp s:
-# ß
-# If the above line is not correctly displayed, fix your editor first!
-
-general {
-        colors = true
-        interval = 1
-}
-
-#order += "ipv6"
-#order += "disk /"
-#order += "disk /var"
-#order += "disk /home"
-#order += "cpu_temperature 0"
-#order += "run_watch DHCP"
-#order += "run_watch VPN"
-order += "wireless wlp2s0"
-order += "ethernet enp1s0"
-#order += "ethernet eth0"
-order += "battery 0"
-#order += "load"
-order += "volume master"
-order += "tztime local"
-
-wireless wlp2s0 {
-        format_up = "W: %quality %ip"
-#        format_up = "W: %essid: %quality %ip"
-        format_down = "W: down"
-}
-
-ethernet enp1s0 {
-        # if you use %speed, i3status requires root privileges
-        format_up = "E: %ip (%speed)"
-        format_down = "E: down"
-}
-
-battery 0 {
-        format = "%status %remaining (%percentage)"
-        integer_battery_capacity = true
-        low_threshold = 10
-        threshold_type = percentage
-}
-
-run_watch DHCP {
-        pidfile = "/var/run/dhclient*.pid"
-}
-
-run_watch VPN {
-        pidfile = "/var/run/vpnc/pid"
-}
-
-tztime local {
-        format = "%a %Y-%m-%d %H:%M:%S"
-}
-
-load {
-        format = "L: %1min"
-        max_threshold = 5
-}
-
-disk "/" {
-        format = "/: %avail/%total free (%percentage_avail)"
-}
-
-disk "/var" {
-        format = "/var: %avail/%total free (%percentage_avail)"
-}
-
-disk "/home" {
-       format = "/home: %avail/%total free (%percentage_avail)"
-}
-
-cpu_temperature 0 {
-        format = "T: %degrees °C"
-}
-
-volume master {
-        format = "VOL: %volume"
-        device = "default"
-        mixer = "Master"
-}

i3/i3/i3status.d/virtualarch.conf

@@ -1,91 +0,0 @@
-# i3status configuration file.
-# see "man i3status" for documentation.
-
-# It is important that this file is edited as UTF-8.
-# The following line should contain a sharp s:
-# ß
-# If the above line is not correctly displayed, fix your editor first!
-
-general {
-        colors = true
-        interval = 1
-}
-
-#order += "ipv6"
-order += "disk /"
-#order += "disk /var"
-#order += "disk /home"
-#order += "cpu_temperature 0"
-#order += "run_watch DHCP"
-#order += "run_watch VPN"
-#order += "wireless wlp2s0"
-#order += "ethernet enp1s0"
-order += "ethernet eth0"
-order += "battery 0"
-#order += "load"
-order += "volume master"
-order += "tztime local"
-
-wireless wlp2s0 {
-        format_up = "W: %quality %ip"
-#        format_up = "W: %essid: %quality %ip"
-        format_down = "W: down"
-}
-
-ethernet enp1s0 {
-        # if you use %speed, i3status requires root privileges
-        format_up = "E: %ip (%speed)"
-        format_down = "E: down"
-}
-
-ethernet eth0 {
-        # if you use %speed, i3status requires root privileges
-        format_up = "E: %ip (%speed)"
-        format_down = "E: down"
-}
-
-battery 0 {
-        format = "%status %remaining (%percentage)"
-        integer_battery_capacity = true
-        low_threshold = 10
-        threshold_type = percentage
-}
-
-run_watch DHCP {
-        pidfile = "/var/run/dhclient*.pid"
-}
-
-run_watch VPN {
-        pidfile = "/var/run/vpnc/pid"
-}
-
-tztime local {
-        format = "%a %Y-%m-%d %H:%M:%S"
-}
-
-load {
-        format = "L: %1min"
-        max_threshold = 5
-}
-
-disk "/" {
-        format = "/: %avail/%total free (%percentage_avail)"
-}
-
-disk "/var" {
-        format = "/var: %avail/%total free (%percentage_avail)"
-}
-
-disk "/home" {
-       format = "/home: %avail/%total free (%percentage_avail)"
-}
-
-cpu_temperature 0 {
-        format = "T: %degrees °C"
-}
-
-volume master {
-        format = "VOL: %volume"
-        device = "default"
-        mixer = "Master"
-}

i3/i3/logs/.gitignore

@@ -1,2 +0,0 @@
-*.log*
-conky.pid