Draft system for waylandwayland

12 files changed, 52 insertions, 99 deletions

diff --git a/guicommon/#pre_stow.sh# b/guicommon/#pre_stow.sh#
new file mode 100644
index 0000000..c972151
--- /dev/null
+++ b/guicommon/#pre_stow.sh#
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+mkdir -p ~/Scripts
diff --git a/guicommon/Scripts/gpost b/guicommon/Scripts/gpost
new file mode 100755
index 0000000..1ce9084
--- /dev/null
+++ b/guicommon/Scripts/gpost
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+play ~/Winsounds/login.wav -q &
+
+nm-applet &
+
+~/Scripts/setwall -A
+
diff --git a/guicommon/Scripts/gpre b/guicommon/Scripts/gpre
new file mode 100755
index 0000000..5c87286
--- /dev/null
+++ b/guicommon/Scripts/gpre
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -e
+
+export _JAVA_AWT_WM_NONREPARENTING=1
+export TERM=termite
+export TERMINAL=termite
+
+# export SSH_AUTH_SOCK=${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh
+
+export XKB_DEFAULT_LAYOUT=us
+export XKB_DEFAULT_VARIANT=altgr-intl
+
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index fe11bd3..1b4befc 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -13,7 +13,9 @@
 gaps inner 10
 smart_gaps on
 
-set $mod Mod4
+set $mod Mod1
+
+exec --no-startup-id "~/Scripts/gpost > /tmp/gpost"
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
diff --git a/scripts/Scripts/passmenu b/scripts/Scripts/passmenu
index 71c9456..71c9456 100644..100755
--- a/scripts/Scripts/passmenu
+++ b/scripts/Scripts/passmenu
diff --git a/scripts/Scripts/setwall b/scripts/Scripts/setwall
index f385623..2a99564 100755
--- a/scripts/Scripts/setwall
+++ b/scripts/Scripts/setwall
@@ -32,10 +32,16 @@ function setwalls() {
 }
 
 function applywall() {
+    set -x
     echo applying wallpaper $1
     rm $WALLLINK
     ln -s $(pwd)/$1 $WALLLINK
-    feh --bg-fill $1
+    if [ -z "${WAYLAND_DISPLAY}" ]; then
+        feh --bg-fill $1
+    else
+        killall swaybg
+        swaybg -m fill -i $1 &
+    fi
 }
 
 function help() {
diff --git a/scripts/Scripts/xrotate b/scripts/Scripts/xrotate
deleted file mode 100755
index fabe98b..0000000
--- a/scripts/Scripts/xrotate
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-function help() {
-    echo "Rotate the screen and mouse input"
-    echo
-    echo "Syntax: ${BINNAME} [<options>] <orientation>"
-    echo "Orientation: normal,inverted,left,right"
-    echo "Options:"
-    echo "  -d, --disp <DISPLAY>    set for xrandr DISPLAY"
-    echo "  -h, --help              this help message"
-}
-
-# Fix hardcode
-DISP=LVDS1
-
-BINNAME="xrotate"
-
-# Parse some args
-while [[ $# -gt 0 ]]; do
-    case $1 in
-        -d|--disp)
-            shift
-            DISP=$1
-            shift
-            ;;
-        -h|--help)
-            help
-            exit 0
-            ;;
-        *)
-            if [[ $1 == '-'* ]]; then
-                echo unknown option $1
-                help
-                exit 1
-            fi
-            break
-            ;;
-    esac
-done
-
-O=$1
-
-MOUSE=$(xinput list | grep "slave  pointer" | awk '{print $6}' | awk -F '=' '{print $2}')
-
-case $O in
-    normal)
-        echo "Normal"
-        MATRIX="1 0 0 0 1 0 0 0 1"
-        ;;
-    inverted)
-        echo "Inverted"
-        MATRIX="-1 0 0 0 -1 0 0 0 1"
-        ;;
-    left)
-        echo "Left"
-        MATRIX="0 -1 0 1 0 0 0 0 1"
-        ;;
-    right)
-        echo "Right"
-        MATRIX="0 1 0 -1 0 0 0 0 1"
-        ;;
-    *)
-        echo "Not an supported orientation"
-        help
-        exit 1;
-        ;;
-esac
-
-
-set -x
-
-xrandr --output $DISP --rotate $O
-for M in $MOUSE; do
-    xinput set-prop $M "Coordinate Transformation Matrix" $MATRIX
-done
diff --git a/vim/.vimrc b/vim/.vimrc
index 02ee5af..c137987 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -38,13 +38,15 @@ set shellslash
 
     " Git
     Plugin 'tpope/vim-fugitive'
-    
+
     " File support
     " Plugin 'cespare/vim-toml'
     "Plugin 'lervag/vimtex'
-    
+    Plugin 'aklt/plantuml-syntax'
+    Plugin 'LnL7/vim-nix'
+
     " Plugin 'vimwiki/vimwiki'
-    
+
 
     " Snippits
     Plugin 'SirVer/ultisnips'
@@ -80,7 +82,7 @@ set shellslash
         au User lsp_setup call lsp#register_server({
         			\ 'name': 'python',
         			\ 'cmd': {server_info->['pyls']},
-        			\ 'whitelist': ['python'],
+        			\ 'whitelist': ['python', 'py'],
         			\ })
     endif
     if executable('clangd')
diff --git a/wayland/winitrc b/wayland/winitrc
new file mode 100755
index 0000000..ab27654
--- /dev/null
+++ b/wayland/winitrc
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+$HOME/Scripts/gpre
+
+exec sway
diff --git a/xinit/.Xmodmap b/xinit/.Xmodmap
index 735734a..89d617a 100644
--- a/xinit/.Xmodmap
+++ b/xinit/.Xmodmap
@@ -2,8 +2,3 @@ clear lock
 clear control
 keycode 66 = Control_R
 add control = Control_R Control_L
-
-remove mod1 = Alt_L
-remove mod4 = Super_L
-add mod1 = Super_L
-add mod4 = Alt_L
diff --git a/xinit/Scripts/xlaunchrc b/xinit/Scripts/xlaunchrc
index 51225d0..318ea16 100755
--- a/xinit/Scripts/xlaunchrc
+++ b/xinit/Scripts/xlaunchrc
@@ -2,24 +2,14 @@
 
 set -e
 
-setxkbmap -layout us -variant altgr-intl
-
-export _JAVA_AWT_WM_NONREPARENTING=1
-export TERM=termite
-export TERMINAL=termite
+source $HOME/Scripts/gpre
 
-export SSH_AUTH_SOCK=${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh
+setxkbmap -layout us -variant altgr-intl
 
 xmodmap .Xmodmap
 #xcape -e "Control_R=Escape"
 
-nm-applet &
-
-# set wallpaper
-~/Scripts/setwall -A
-
 dunst &
-play ~/Winsounds/login.wav -q &
 
 # Set dbus display variable
 dbus-update-activation-environment --systemd DISPLAY
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 82b25b9..277141a 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -67,6 +67,9 @@ bindkey "^P" up-line-or-search
 bindkey "^[[A" history-search-backward
 bindkey "^[[B" history-search-forward
 
+bindkey "^[[1;5C" forward-word
+bindkey "^[[1;5D" backward-word
+
 #
 # Env
 #