summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeah (ctucx) <leah@ctu.cx>2021-03-13 20:20:29 +0100
committerLeah (ctucx) <leah@ctu.cx>2021-03-13 20:20:29 +0100
commit48d9730a0b7752d390324eda47468ab51e751ca3 (patch)
treefaed530706c287895cdbde0295c5fddc21dbab22
parent26b0904947bbd21e3c9330874031e4f55ee7c0d2 (diff)
parent17d227340f079a6f0da648cb24fbc67aae8332be (diff)
downloaddotfiles-48d9730a0b7752d390324eda47468ab51e751ca3.tar.gz
dotfiles-48d9730a0b7752d390324eda47468ab51e751ca3.tar.bz2
dotfiles-48d9730a0b7752d390324eda47468ab51e751ca3.zip
Merge branch 'master' of wanderduene.ctu.cx:dotfiles
-rw-r--r--private_dot_config/sway/config.tmpl14
-rw-r--r--proj/executable_update.sh3
2 files changed, 16 insertions, 1 deletions
diff --git a/private_dot_config/sway/config.tmpl b/private_dot_config/sway/config.tmpl
index 65479ef..79bbdc0 100644
--- a/private_dot_config/sway/config.tmpl
+++ b/private_dot_config/sway/config.tmpl
@@ -15,6 +15,11 @@ set $menu wofi --show drun
### Output configuration
output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
+{{ if (eq .chezmoi.hostname "coladose") }}
+#rotate screen on micropc
+output DSI-1 resolution 720x1280 transform 90
+{{ end }}
+
### Idle configuration
# exec swayidle -w \
# timeout 300 'swaylock -f -c 000000' \
@@ -25,6 +30,13 @@ output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
### Input configuration
#
+{{ if (eq .chezmoi.hostname "coladose") }}
+# settings for gpd micropc
+input "24704:32865:AMR-4630-XXX-0-_0-1023_USB_KEYBOARD_Mouse" scroll_button 274
+input "24704:32865:AMR-4630-XXX-0-_0-1023_USB_KEYBOARD_Mouse" scroll_method on_button_down
+input "24704:32865:AMR-4630-XXX-0-_0-1023_USB_KEYBOARD_Mouse" natural_scroll enabled
+{{ end }}
+
input "*" {
xkb_layout us,de
xkb_variant mac,qwerty
@@ -39,9 +51,11 @@ input "2:7:SynPS/2_Synaptics_TouchPad" {
}
{{ if (eq .chezmoi.hostname "coladose") }}
+# Disable touchpad on Thonkpad T470
input "2:7:SynPS/2_Synaptics_TouchPad" events disabled
{{ end }}
+
### Auto-Start
#
exec swaymsg 'workspace 1; exec firefox;'
diff --git a/proj/executable_update.sh b/proj/executable_update.sh
index b065b07..9da3594 100644
--- a/proj/executable_update.sh
+++ b/proj/executable_update.sh
@@ -20,7 +20,7 @@ update () {
fi
else
echo "Clone $1 into directory ~/proj/$1"
- git clone ctucx-cgit:$1 $HOME/proj/$1
+ git clone --recurse-submodules ctucx-cgit:$1 $HOME/proj/$1
fi
}
@@ -36,6 +36,7 @@ update "nimexif"
update "nimjpg"
update "oeffi-web"
update "oeffisearch"
+update "fritzbox-exporter"
update "serial2tcp"
update "smartie-pwa"
update "smartied"