diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md index a1e724d..c829ace 100644 --- a/DOCUMENTATION.md +++ b/DOCUMENTATION.md @@ -6,7 +6,7 @@ Some additional documentation for PrawnOS that wouldn't fit in the README ### Gestures: #### Config file: /etc/libinput-gestures.conf * four finger swipe left: Switch to left workspace -* four finger swipe right: Switch to right worksace +* four finger swipe right: Switch to right workspace ### Keybindings @@ -14,9 +14,9 @@ Some additional documentation for PrawnOS that wouldn't fit in the README * control+alt+left: move window to left workspace * control+alt+right: move window to right workspace -* control+left: tile widow to the left -* control+right: tile window to the right -* control+up: maximize window +* alt+left: tile widow to the left +* alt+right: tile window to the right +* alt+up: maximize window * alt+tab: app switcher @@ -25,31 +25,20 @@ Some additional documentation for PrawnOS that wouldn't fit in the README * control+alt+l: Lock screen * Brightness scripts are also called here and can be remapped here or in ~/.Xmodmap -#### Configured using ~/.Xmodmap -* "search" key: Mode switch aka m_s (function key) +#### Configured using xkb +* "search" key: function (fn) key -* m_s + backspace: delete -* m_s + up: page up -* m_s + down: page down -* m_s + left: home -* m_s + right: end -* m_s + period: insert +* fn + backspace: delete +* fn + up: page up +* fn + down: page down +* fn + left: home +* fn + right: end -* "brightness up key": increase backlight -* "brightness down key": decrease backlight -* "volume mute": mute volume -* "volume down": decrease volume -* "volume up": increase volume - -* m_s + "brightness up key": F7 -* m_s + "brightness down key": F6 -* m_s + "volume mute key": F8 -* m_s + "volume down key": F9 -* m_s + "volume up key": F10 - -#### Configured using ~/.xinputrc -* alt+left left a word -* alt+right right a word +* fn + "brightness up key": increase backlight +* fn + "brightness down key": decrease backlight +* fn + "volume mute": mute volume +* fn + "volume down": decrease volume +* fn + "volume up": increase volume ## Initramfs and Encryption PrawnOS uses a custom initramfs, custom init script, and dmcrypt/LUKS to enable full root partition encryption diff --git a/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml index 24865d8..ad8eed5 100644 --- a/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml +++ b/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml @@ -18,8 +18,6 @@ - - @@ -69,9 +67,9 @@ - - - + + + diff --git a/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-power-manager.xml b/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-power-manager.xml index 13e96ac..4f50471 100644 --- a/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-power-manager.xml +++ b/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-power-manager.xml @@ -19,5 +19,6 @@ + diff --git a/resources/InstallResources/xfce-config/xmodmap/.Xmodmap b/resources/InstallResources/xfce-config/xmodmap/.Xmodmap deleted file mode 100644 index 8a87b50..0000000 --- a/resources/InstallResources/xfce-config/xmodmap/.Xmodmap +++ /dev/null @@ -1,30 +0,0 @@ -! Search mapped to mode switch (basically the fn key) -! Referred to as ms later on -keycode 133 = Mode_switch NoSymbol Mode_switch - -! Re-add some keyboard functionality - -! Map insert to ms+period -keycode 60 = period greater Insert Insert - -! Map page up to ms + up -keycode 111 = Up NoSymbol Prior -! Map page down to ms + down -keycode 116 = Down NoSymbol Next -! Map Home to ms+left -keycode 113 = Left NoSymbol Home -! Map End to ms+right -keycode 114 = Right NoSymbol End - -! Map delete to ms+Backspace -keycode 22 = BackSpace BackSpace Delete Delete - -! Now map the special functions -! Brightness keys -keycode 72 = XF86MonBrightnessDown XF86MonBrightnessDown F6 F6 F6 F6 XF86Switch_VT_6 -keycode 73 = XF86MonBrightnessUp XF86MonBrightnessUp F7 F7 F7 F7 XF86Switch_VT_7 - -!Volume keys -keycode 74 = XF86AudioMute XF86AudioMute F8 F8 F8 F8 XF86Switch_VT_8 -keycode 75 = XF86AudioLowerVolume XF86AudioLowerVolume F9 F9 F9 F9 XF86Switch_VT_9 -keycode 76 = XF86AudioRaiseVolume XF86AudioRaiseVolume F10 F10 F10 F10 XF86Switch_VT_10 diff --git a/resources/InstallResources/xfce-config/xmodmap/.xinitrc b/resources/InstallResources/xfce-config/xmodmap/.xinitrc deleted file mode 100644 index 0640e42..0000000 --- a/resources/InstallResources/xfce-config/xmodmap/.xinitrc +++ /dev/null @@ -1 +0,0 @@ -#[[ -f ~/.Xmodmap ]] && xmodmap ~/.Xmodmap diff --git a/resources/InstallResources/xkb/patchxkb.sh b/resources/InstallResources/xkb/patchxkb.sh deleted file mode 100755 index 354b033..0000000 --- a/resources/InstallResources/xkb/patchxkb.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -cd /InstallResources/xkb - -cp ./compat/* /usr/share/X11/xkb/compat/ -cp ./keycodes/* /usr/share/X11/xkb/keycodes/ -cp ./symbols/* /usr/share/X11/xkb/symbols/ - -patch /usr/share/X11/xkb/rules/base < ./rules/base.chromebook.patch -patch /usr/share/X11/xkb/rules/base.lst < ./rules/base.lst.chromebook.patch -patch /usr/share/X11/xkb/rules/base.xml < ./rules/base.xml.chromebook.patch -patch /usr/share/X11/xkb/rules/evdev < ./rules/evdev.chromebook.patch -patch /usr/share/X11/xkb/rules/evdev.lst < ./rules/evdev.lst.chromebook.patch -patch /usr/share/X11/xkb/rules/evdev.xml < ./rules/evdev.xml.chromebook.patch - -cp keyboard /etc/default/keyboard - diff --git a/scripts/InstallScripts/PanfrostCompile.sh b/scripts/InstallScripts/CompilePanfrost.sh similarity index 100% rename from scripts/InstallScripts/PanfrostCompile.sh rename to scripts/InstallScripts/CompilePanfrost.sh diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh index 9c765e7..25f1680 100755 --- a/scripts/InstallScripts/InstallPackages.sh +++ b/scripts/InstallScripts/InstallPackages.sh @@ -46,6 +46,20 @@ DEBIAN_FRONTEND=noninteractive apt -t buster install -y chromium || DEBIAN_FRONT [ "$DE" = "xfce" ] && apt install -y xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies numix-gtk-theme plank accountsservice papirus-icon-theme [ "$DE" = "lxqt" ] && apt install -y lxqt pavucontrol-qt +#install the keymap by patching xkb, then bindings work for any desktop environment +cp $DIR/xkb/compat/* /usr/share/X11/xkb/compat/ +cp $DIR/xkb/keycodes/* /usr/share/X11/xkb/keycodes/ +cp $DIR/xkb/symbols/* /usr/share/X11/xkb/symbols/ + +patch /usr/share/X11/xkb/rules/base < $DIR/xkb/rules/base.chromebook.patch +patch /usr/share/X11/xkb/rules/base.lst < $DIR/xkb/rules/base.lst.chromebook.patch +patch /usr/share/X11/xkb/rules/base.xml < $DIR/xkb/rules/base.xml.chromebook.patch +patch /usr/share/X11/xkb/rules/evdev < $DIR/xkb/rules/evdev.chromebook.patch +patch /usr/share/X11/xkb/rules/evdev.lst < $DIR/xkb/rules/evdev.lst.chromebook.patch +patch /usr/share/X11/xkb/rules/evdev.xml < $DIR/xkb/rules/evdev.xml.chromebook.patch + +cp $DIR/xkb/keyboard /etc/default/keyboard + if [ "$DE" = "xfce" ] then # remove light-locker, as it is broken on this machine. See issue https://github.com/SolidHal/PrawnOS/issues/56#issuecomment-504681175 @@ -105,17 +119,11 @@ then cp -rf $DIR/fonts/* /usr/share/fonts/opentype/ fc-cache - #Install xmodmap map, autostart - cp -rf $DIR/xfce-config/xmodmap/.Xmodmap /etc/skel/ - cp -rf $DIR/xfce-config/xmodmap/.xinitrc /etc/skel/ - #Install inputrc cp -rf $DIR/xfce-config/inputrc/.inputrc /etc/skel/ - #Install brightness controls + #Install brightness control scripts cp $DIR/xfce-config/brightness/backlight_* /usr/sbin/ - mkdir -p /etc/udev/rules.d/ - cp $DIR/xfce-config/brightness/backlight.rules /etc/udev/rules.d/ fi diff --git a/scripts/InstallScripts/XKBPatch.sh b/scripts/InstallScripts/XKBPatch.sh deleted file mode 100755 index 34d7a67..0000000 --- a/scripts/InstallScripts/XKBPatch.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -echo " - -This Patch allows you to select all Chromebook Layouts. -For default behaviour, select chromebook_m in /etc/default/keyboard or -Chromebook (most models) | Search overlay in your DE Keyboard Selector. - -Other Options: -chromebook_ralt Chromebook (most models) | Right alt overlay -chromebook_m Chromebook (most models) | Search overlay | F keys mapped to media keys -chromebook_m_ralt Chromebook (most models) | Right alt overlay | F keys mapped to media keys -chromebook_falco Chromebook Falco/Pixel/Pixel2 | Search overlay -chromebook_falco_ralt Chromebook Falco/Pixel/Pixel2 | Right alt overlay -chromebook_m_falco Chromebook Falco/Pixel/Pixel2 | Search overlay | F keys mapped to media keys -chromebook_m_falco_ralt Chromebook Falco/Pixel/Pixel2 | Right alt overlay | F keys mapped to media keys -chromebook_no_m Chromebook (most models) | No overlay | F keys mapped to media keys - -After this patch, chromebook_m will be the default in /etc/default/keyboard with us layout - -" - -sudo /InstallResources/xkb/patchxkb.sh -