From: Christian Heller <c.heller@plomlompom.de>
Date: Thu, 8 Oct 2020 00:05:57 +0000 (+0200)
Subject: Add x220 to desktop setup.
X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/%7B%7B%20web_path%20%7D%7D/%7B%7Bprefix%7D%7D/error?a=commitdiff_plain;h=5ae82c06a14cb1342d5dc7617907223a1bb1fb75;p=config

Add x220 to desktop setup.
---

diff --git a/buster/etc_files/x220/etc/wicd/manager-settings.conf b/buster/etc_files/x220/etc/wicd/manager-settings.conf
new file mode 100644
index 0000000..985df76
--- /dev/null
+++ b/buster/etc_files/x220/etc/wicd/manager-settings.conf
@@ -0,0 +1,24 @@
+[Settings]
+backend = external
+wireless_interface = wlp3s0
+wired_interface = enp0s25
+wpa_driver = wext
+always_show_wired_interface = False
+use_global_dns = False
+global_dns_1 = None
+global_dns_2 = None
+global_dns_3 = None
+global_dns_dom = None
+global_search_dom = None
+auto_reconnect = True
+debug_mode = 0
+wired_connect_mode = 1
+signal_display_type = 0
+should_verify_ap = 1
+dhcp_client = 0
+link_detect_tool = 0
+flush_tool = 0
+sudo_app = 0
+prefer_wired = False
+show_never_connect = True
+
diff --git a/buster/home_files/x220/.config/i3status/config b/buster/home_files/x220/.config/i3status/config
new file mode 100644
index 0000000..f660b67
--- /dev/null
+++ b/buster/home_files/x220/.config/i3status/config
@@ -0,0 +1,82 @@
+# plomlompom's i3 status bar configuration
+
+# Activate colors; set update interval of one second.
+general {
+  colors = true
+  interval = 1
+}
+
+# Selection / order of status elements.
+order += "disk /"
+order += "disk /home/"
+order += "wireless wlp3s0"
+order += "ethernet enp0s25"
+order += "battery 0"
+order += "cpu_usage"
+order += "load"
+order += "cpu_temperature 0"
+order += "time"
+order += "volume master"
+
+# How much space is left in / ?
+disk "/" {
+  format = "/: %avail available of %total"
+  separator_block_width = 25
+}
+
+# How much space is left in /home ?
+disk "/home/" {
+  format = "/home: %avail available of %total"
+  separator_block_width = 25
+}
+
+# WLAN status: show IP and connection quality or "down".
+wireless wls1 {
+  format_up = "w: (%quality at %essid) %ip"
+  format_down = "w: down"
+  separator_block_width = 10
+}
+
+# Ethernet status: show IP or "down".
+ethernet enp0s25 {
+  format_up = "e: %ip"
+  format_down = "e: down"
+  separator_block_width = 25
+}
+
+# Battery status: show FULL/CHARGING/BATTERY, storage, time left.
+battery 0 {
+  format = "b: %status %percentage %remaining"
+  separator_block_width = 25
+}
+
+# Show CPU usage.
+cpu_usage {
+  format = "cpu: %usage"
+  separator_block_width = 10
+}
+
+# Show system load during last 1/5/15 minutes.
+load {
+  format = "%1min %5min %15min"
+  separator_block_width = 25
+}
+
+# Show CPU temperature in degrees of celsius.
+cpu_temperature 0 {
+  format = "%degrees °C"
+  separator_block_width = 25
+}
+
+# Show date/time/timezone as "year-month-day hour:minute:second
+# timezone_numeric/timezone_alphabetic".
+time {
+  format = "%Y-%m-%d %H:%M:%S %z/%Z"
+  separator_block_width = 25
+}
+
+volume master {
+  format = "♪: %volume"
+  format_muted = "♪: muted (%volume)"
+  separator_block_width = 25
+}
diff --git a/buster/setup_scripts/setup_desktop.sh b/buster/setup_scripts/setup_desktop.sh
index 16074f5..97488e1 100755
--- a/buster/setup_scripts/setup_desktop.sh
+++ b/buster/setup_scripts/setup_desktop.sh
@@ -5,7 +5,7 @@ if [ "$#" -ne 1 ]; then
     echo 'Need exactly one argument (system name).'
     false
 fi
-if [ ! "$1" = "eeepc" ] && [ ! "$1" = "x200s" ] && [ ! "$1" = "w530" ]; then
+if [ ! "$1" = "eeepc" ] && [ ! "$1" = "x200s" ] && [ ! "$1" = "x220" ] && [ ! "$1" = "w530" ]; then
     echo "Need legal system name."
     false
 fi
@@ -15,14 +15,11 @@ system_name="$1"
 config_tree_prefix="${HOME}/config/buster"
 setup_scripts_dir="${config_tree_prefix}/setup_scripts"
 cd "${setup_scripts_dir}"
-./setup.sh "${system_name}" "" user desktop "${system_name}"
-if [ "$1" = "x200s" ] || [ "$1" = "w530" ]; then
-  ./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" thinkpad
+if [ "$1" = "x200s" ] || [ "$1" = "x220" ] || [ "$1" = "w530" ]; then
+  ./setup.sh "${system_name}" "" user desktop thinkpad "${system_name}"
+else
+  ./setup.sh "${system_name}" "" user desktop "${system_name}"
 fi
-# TODO: these /should/ redundant, try out without them:
-#./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" user desktop "${system_name}"
-#./install_for_target.sh user desktop "${system_name}"
-
 # For hibernation on lid switch to work, we need a newer kernel on the EeePC,
 # see <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919227>.
 if [ "${system_name}" = "eeepc" ]; then
diff --git a/buster/setup_scripts/setup_home.sh b/buster/setup_scripts/setup_home.sh
index 61c235e..24f4c67 100755
--- a/buster/setup_scripts/setup_home.sh
+++ b/buster/setup_scripts/setup_home.sh
@@ -5,7 +5,7 @@ if [ "$#" -ne 1 ]; then
     echo 'Need exactly one argument (system name).'
     false
 fi
-if [ ! "$1" = "eeepc" ] && [ ! "$1" = "x200s" ]; then
+if [ ! "$1" = "eeepc" ] && [ ! "$1" = "x200s" ]&& [ ! "$1" = "x220" ]; then
     echo "Need legal system name."
     false
 fi