From a184cb13bf6ed311b6d86227dbc79245436ff06c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Sun, 7 Dec 2014 01:12:03 +0100 Subject: [PATCH] Tidy up i3 directory. --- i3/i3/.gitignore | 1 - i3/i3/config.d/netbook.config | 2 +- i3/i3/config.d/notebook.config | 2 +- i3/i3/config.d/virtualarch.config | 2 +- i3/i3/i3status.d/netbook.conf | 85 ------------------------ i3/i3/i3status.d/virtualarch.conf | 91 -------------------------- i3/i3/logs/.gitignore | 2 - i3/i3/{ => scripts}/i3bar_wrapper.bash | 0 8 files changed, 3 insertions(+), 182 deletions(-) delete mode 100644 i3/i3/i3status.d/netbook.conf delete mode 100644 i3/i3/i3status.d/virtualarch.conf delete mode 100644 i3/i3/logs/.gitignore rename i3/i3/{ => scripts}/i3bar_wrapper.bash (100%) diff --git a/i3/i3/.gitignore b/i3/i3/.gitignore index 3364861..e69de29 100644 --- a/i3/i3/.gitignore +++ b/i3/i3/.gitignore @@ -1 +0,0 @@ -testing/ diff --git a/i3/i3/config.d/netbook.config b/i3/i3/config.d/netbook.config index 5b58a19..0cf2d1a 100644 --- a/i3/i3/config.d/netbook.config +++ b/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 } diff --git a/i3/i3/config.d/notebook.config b/i3/i3/config.d/notebook.config index 5c0728e..5a76f56 100644 --- a/i3/i3/config.d/notebook.config +++ b/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 } diff --git a/i3/i3/config.d/virtualarch.config b/i3/i3/config.d/virtualarch.config index c3ff52a..1039f6e 100644 --- a/i3/i3/config.d/virtualarch.config +++ b/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 } diff --git a/i3/i3/i3status.d/netbook.conf b/i3/i3/i3status.d/netbook.conf deleted file mode 100644 index cda31b7..0000000 --- a/i3/i3/i3status.d/netbook.conf +++ /dev/null @@ -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" -} diff --git a/i3/i3/i3status.d/virtualarch.conf b/i3/i3/i3status.d/virtualarch.conf deleted file mode 100644 index d675592..0000000 --- a/i3/i3/i3status.d/virtualarch.conf +++ /dev/null @@ -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" -} diff --git a/i3/i3/logs/.gitignore b/i3/i3/logs/.gitignore deleted file mode 100644 index a598766..0000000 --- a/i3/i3/logs/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.log* -conky.pid diff --git a/i3/i3/i3bar_wrapper.bash b/i3/i3/scripts/i3bar_wrapper.bash similarity index 100% rename from i3/i3/i3bar_wrapper.bash rename to i3/i3/scripts/i3bar_wrapper.bash