From 99a5d8ef2373a7883b3eac00ba1040c37e596516 Mon Sep 17 00:00:00 2001 From: SolidHal Date: Tue, 2 Oct 2018 19:47:47 +0000 Subject: [PATCH] Update docs, refine keybindings Added basic keybinding docs Added forword-word and backword-word bindings --- AUTHORS | 6 +- DOCUMENTATION.md | 52 +++++++ README.md | 4 + buildPrawnOS.sh | 12 -- .../xfce-config/inputrc/.inputrc | 43 ++++++ .../xfce4-keyboard-shortcuts.xml | 132 +++++++++--------- scripts/InstallScripts/InstallPackages.sh | 3 + 7 files changed, 172 insertions(+), 80 deletions(-) create mode 100644 DOCUMENTATION.md delete mode 100755 buildPrawnOS.sh create mode 100644 resources/InstallResources/xfce-config/inputrc/.inputrc diff --git a/AUTHORS b/AUTHORS index 2dbaf67..6c54952 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,4 @@ -SolidHal (find me on github, or send me a message in a bottle, emails kinda lame) -Dima Krasner (dima@dimakrasner.com) \ No newline at end of file +SolidHal (hal@halemmerich.com) +With spcial thanks to: +Dima Krasner (dima@dimakrasner.com) +- The core of filesystem and kernel building for the c201 is based on his work with devsus \ No newline at end of file diff --git a/DOCUMENTATION.md b/DOCUMENTATION.md new file mode 100644 index 0000000..e3fbee5 --- /dev/null +++ b/DOCUMENTATION.md @@ -0,0 +1,52 @@ +# PrawnOS Documentation + +Some additional documentation for PrawnOS that wouldn't fit in the README + +## Useful XFCE4 keybindings and libinput-gestures: +### Gestures: +#### Config file: /etc/libinput-gestures.conf +* four finger swipe left: Switch to left workspace +* four finger swipe right: Switch to right worksace + +### Keybindings + +#### Configure under Settings->Window Manager->Keyboard +* 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+tab: app switcher + +#### Configure under Settings->Keyboard->Application Shortcuts +* alt+space : App launcher (spotlight-esque) +* 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) + +* 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 + +* "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 diff --git a/README.md b/README.md index d5ea747..2593673 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,10 @@ When that finishes, you should have access to the internet. Congratulations! Your computer is now a Prawn! https://sprorgnsm.bandcamp.com/track/the-prawn-song +### Documentation +Some useful things can be found in ``DOCUMENTATION.md` + + ### Make options, developer tools (ALl of these should be ran as root or with sudo to avoid issues) The makefile automates many processes that make debuggung the kernel or the filesystem easier. diff --git a/buildPrawnOS.sh b/buildPrawnOS.sh deleted file mode 100755 index 0e0eb2a..0000000 --- a/buildPrawnOS.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -xe - -#Build everything - -#Get sudo -sudo echo "Thanks." -#Build kernel WITHOUT SUDO, building the kernel with sudo is bad practice -#Once, sometime in the kernel version 2 days building the kernel with sudo broke the -#The system it was built on -./scripts/buildKernel.sh -#build os WITH sudo, debootstrap requires sudo -sudo ./scripts/buildDebianFs.sh diff --git a/resources/InstallResources/xfce-config/inputrc/.inputrc b/resources/InstallResources/xfce-config/inputrc/.inputrc new file mode 100644 index 0000000..859f582 --- /dev/null +++ b/resources/InstallResources/xfce-config/inputrc/.inputrc @@ -0,0 +1,43 @@ +# Make Tab autocomplete regardless of filename case +set completion-ignore-case on + +# List all matches in case multiple possible completions are possible +set show-all-if-ambiguous on + +# Immediately add a trailing slash when autocompleting symlinks to directories +set mark-symlinked-directories on + +# Show all autocomplete results at once +set page-completions off + +# If there are more than 200 possible completions for a word, ask to show them all +set completion-query-items 100 + +# Show extra file information when completing, like `ls -F` does +set visible-stats on + +# Be more intelligent when autocompleting by also looking at the text after +# the cursor. For example, when the current line is "cd ~/src/mozil", and +# the cursor is on the "z", pressing Tab will not autocomplete it to "cd +# ~/src/mozillail", but to "cd ~/src/mozilla". (This is supported by the +# Readline used by Bash 4.) +set skip-completed-text on + +# This line sets readline to display possible completions using different colors to indicate their file types. +# The colors are determined by the environmental variable LS_COLORS, which can be nicely configured. +set colored-stats On + + + +# This line sets the completions to be listed immediately instead of ringing +# the bell, when the completing word has more than one possible completion. +set show-all-if-ambiguous On + +# This line sets the completions to be listed immediately instead of ringing the bell, +# when the completing word has more than one possible completion but no partial completion can be made. +set show-all-if-unmodified On + + +## enable Alt-arrows for word jumping +"\e[1;3D": backward-word ### Alt left +"\e[1;3C": forward-word ### Alt right \ No newline at end of file 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 21ea021..8a46510 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 @@ -19,24 +19,24 @@ - - + + - + - + - - - - - - - - + + + + + + + + - - + + @@ -95,58 +95,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh index bf87030..085c2c6 100755 --- a/scripts/InstallScripts/InstallPackages.sh +++ b/scripts/InstallScripts/InstallPackages.sh @@ -56,6 +56,9 @@ then 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/xmodmap/.xinputrc /etc/skel/ + #Install brightness controls cp $DIR/xfce-config/brightness/backlight_* /usr/sbin/ mkdir -p /etc/udev/rules.d/