hardware configuration stuff

4 files changed, 24 insertions, 18 deletions

diff --git a/aliases b/aliases
index fbe9ade..9dc499b 100644
--- a/aliases
+++ b/aliases
@@ -35,7 +35,7 @@ alias v="vim --cmd 'let g:startify_disable_at_vimenter = 1' -c 'call feedkeys(\"
 alias f="vim --cmd 'let g:startify_disable_at_vimenter = 1' -c 'call feedkeys(\"f\")'"
 alias g="vim --cmd 'let g:startify_disable_at_vimenter = 1' -c 'call feedkeys(\"&\")'"
 alias T="vim --cmd 'let g:startify_disable_at_vimenter = 1' -c 'call feedkeys(\"T\")'"
-alias wifi="sudo systemctl restart netctl-auto@wlan0"
+alias wifi="sudo systemctl restart netctl-auto@wlp3s0"
 alias prove="forkprove"
 function web {
     local port=$1
diff --git a/bin/status b/bin/status
index d3f2504..2088987 100755
--- a/bin/status
+++ b/bin/status
@@ -75,9 +75,9 @@ while (<$i3status>) {
             name      => 'battery_discharge',
             full_text => sprintf("%0.2fW", $discharge_rate{$battery}),
             color     => (
-                $discharge_rate{$battery} < 8  ? '#FFFFFF'
+                $discharge_rate{$battery} < 6  ? '#FFFFFF'
               : $discharge_rate{$battery} < 12 ? '#00FF00'
-              : $discharge_rate{$battery} < 20 ? '#FFFF00'
+              : $discharge_rate{$battery} < 18 ? '#FFFF00'
               :                                  '#FF0000'
             ),
         };
diff --git a/conkyrc b/conkyrc
index 6bbf455..91fd7e9 100644
--- a/conkyrc
+++ b/conkyrc
@@ -44,13 +44,13 @@ ${color white}File systems:
  /home ${color green}${fs_used /home}/${fs_size /home} ${fs_bar /home}
    Read:${color magenta}${diskio_read sda}${color green}       Write:${color blue}${diskio_write sda}
 ${color green}${hr}
-${color white}Networking: ${color green}${gw_iface} (${texeci 3600 get_ip})${if_up eth0}
- eth0:  ${color green}${addr eth0}${color white}
-   Down:${color magenta}${downspeed eth0}/s${color green}         Up:${color blue}${upspeed eth0}/s
-${color white}${endif}${if_up wlan0}
- wlan0: ${color green}${addr wlan0} - ${wireless_essid wlan0}
-   ${color white}Wireless: ${color green}${wireless_bitrate wlan0} - ${wireless_link_bar wlan0}
-   Down:${color magenta}${downspeed wlan0}/s${color green}         Up:${color blue}${upspeed wlan0}/s
+${color white}Networking: ${color green}${gw_iface} (${texeci 3600 get_ip})${if_up enp0s25}
+ enp0s25:  ${color green}${addr enp0s25}${color white}
+   Down:${color magenta}${downspeed enp0s25}/s${color green}         Up:${color blue}${upspeed enp0s25}/s
+${color white}${endif}${if_up wlp3s0}
+ wlp3s0:  ${color green}${addr wlp3s0} - ${wireless_essid wlp3s0}
+   ${color white}Wireless: ${color green}${wireless_bitrate wlp3s0} - ${wireless_link_bar wlp3s0}
+   Down:${color magenta}${downspeed wlp3s0}/s${color green}         Up:${color blue}${upspeed wlp3s0}/s
 ${color white}${endif}${endif}
 ${color white}Processes:${color green} ${processes}  ${color white}Running:${color green} ${running_processes}           ${color white}Mem usage
 ${color green} Name               PID   CPU%   MEM%     Name               PID   CPU%   MEM%
diff --git a/i3status.conf b/i3status.conf
index 1b7914f..4c2bcdd 100644
--- a/i3status.conf
+++ b/i3status.conf
@@ -4,9 +4,10 @@ general {
 }
 
 order += "cpu_usage"
-order += "wireless wlan0"
-order += "ethernet eth0"
+order += "wireless wlp3s0"
+order += "ethernet enp0s25"
 order += "battery 0"
+order += "battery 1"
 order += "time"
 order += "load"
 
@@ -14,14 +15,14 @@ cpu_usage {
     format = "CPU: %usage"
 }
 
-wireless wlan0 {
-    format_up = "wlan0: (%essid: %quality)"
-    format_down = "wlan0"
+wireless wlp3s0 {
+    format_up = "wlp3s0: (%essid: %quality)"
+    format_down = "wlp3s0"
 }
 
-ethernet eth0 {
-    format_up = "eth0: (%speed)"
-    format_down = "eth0"
+ethernet enp0s25 {
+    format_up = "enp0s25: (%speed)"
+    format_down = "enp0s25"
 }
 
 battery 0 {
@@ -29,6 +30,11 @@ battery 0 {
     format = "%status %percentage (%remaining %consumption)"
 }
 
+battery 1 {
+    last_full_capacity = true
+    format = "%status %percentage (%remaining %consumption)"
+}
+
 time {
     format = "%a %b %d %H:%M:%S"
 }