From 7a3b464306f229361100419fd0e3b106897286b3 Mon Sep 17 00:00:00 2001
From: derped <derped@ophanim.de>
Date: Thu, 28 Oct 2021 15:03:55 +0200
Subject: [PATCH] Update i3 config.

---
 config/etc/i3/config    |  9 +--------
 config/etc/i3/py3status | 12 ++++++++++++
 services/desktop/i3.nix |  3 ++-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/config/etc/i3/config b/config/etc/i3/config
index 7097796..ea3a108 100644
--- a/config/etc/i3/config
+++ b/config/etc/i3/config
@@ -12,16 +12,9 @@ new_window pixel
 hide_edge_borders both
 
 exec setxkbmap de
-exec xinput --map-to-output "ipts 045E:001F Pen Pen (0)" eDP1
-exec xinput --map-to-output "ipts 045E:001F Pen Eraser (0)" eDP1
-exec xinput --map-to-output "ipts 045E:001F Touchscreen" eDP1
-
-bindsym $mod+Shift+s exec xinput --map-to-output "ipts 045E:001F Pen Pen (0)" eDP1; exec xinput --map-to-output "ipts 045E:001F Pen Eraser (0)" eDP1; exec xinput --map-to-output "ipts 045E:001F Touchscreen" eDP1
-bindsym $mod+Shift+a exec xinput --enable "ipts 045E:001F Touchscreen"
-bindsym $mod+Shift+d exec xinput --disable "ipts 045E:001F Touchscreen"
 
 #exec compton -f
-exec feh --bg-scale Pictures/wallpaper.jpg
+exec feh --bg-scale $(xdg-user-dir PICTURES)/wallpaper.jpg
 #exec pulseaudio -D
 #exec fcitx
 #exec env=LC_CTYPE=zh_CN.UTF-8 emacs --daemon
diff --git a/config/etc/i3/py3status b/config/etc/i3/py3status
index 26bd898..f8ee423 100644
--- a/config/etc/i3/py3status
+++ b/config/etc/i3/py3status
@@ -18,6 +18,7 @@ order += "backlight"
 order += "volume_status"
 order += "cpu_temperature 0"
 order += "load"
+order += "battery 0"
 order += "group tz"
 
 group network {
@@ -65,6 +66,17 @@ group tz {
 	}
 }
 
+battery 0 {
+    format = "%status %percentage %remaining %emptytime"
+    format_down = "No battery"
+    status_chr = "⚡ CHR"
+    status_bat = "🔋 BAT"
+    status_unk = "? UNK"
+    status_full = "☻ FULL"
+    path = "/sys/class/power_supply/BAT%d/uevent"
+    low_threshold = 10
+}
+
 volume_status {
     button_up = 4
     button_down = 5
diff --git a/services/desktop/i3.nix b/services/desktop/i3.nix
index 02916ca..a4856e8 100644
--- a/services/desktop/i3.nix
+++ b/services/desktop/i3.nix
@@ -7,10 +7,11 @@
 {
         enable = true;
         configFile = ../../config/etc/i3/config;
-        extraPackages = with pkgs; [ 
+        extraPackages = with pkgs; [
           dmenu
           file
           i3lock
           i3status
+          xdg-user-dirs
         ];
 }