salt/home
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

.xinitrc: Add environement setup script, disregard it

Browse Source
This commit is contained in:
Salt 2018-10-20 17:13:39 -05:00
parent d6f6479f88
commit dbcb72ee1f
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.config/kglobalshortcutsrc
View File

@ -75,10 +75,10 @@ Invert Screen Colors=none,none,Invert Screen Colors
Kill Window=Ctrl+Alt+Esc,Ctrl+Alt+Esc,Kill Window Kill Window=Ctrl+Alt+Esc,Ctrl+Alt+Esc,Kill Window
MoveMouseToCenter=Meta+F6,Meta+F6,Move Mouse to Center MoveMouseToCenter=Meta+F6,Meta+F6,Move Mouse to Center
MoveMouseToFocus=Meta+F5,Meta+F5,Move Mouse to Focus MoveMouseToFocus=Meta+F5,Meta+F5,Move Mouse to Focus
MoveZoomDown=Meta+Down,Meta+Down,Move Zoomed Area Downwards MoveZoomDown=Meta+Down,none,Move Zoomed Area Downwards
MoveZoomLeft=Meta+Left,Meta+Left,Move Zoomed Area to Left MoveZoomLeft=Meta+Left,none,Move Zoomed Area to Left
MoveZoomRight=Meta+Right,Meta+Right,Move Zoomed Area to Right MoveZoomRight=Meta+Right,none,Move Zoomed Area to Right
MoveZoomUp=Meta+Up,Meta+Up,Move Zoomed Area Upwards MoveZoomUp=Meta+Up,none,Move Zoomed Area Upwards
Quarter: + Gap Size=Meta+PgUp,none,Quarter: + Gap Size Quarter: + Gap Size=Meta+PgUp,none,Quarter: + Gap Size
Quarter: + Window Size=Meta+Y,none,Quarter: + Window Size Quarter: + Window Size=Meta+Y,none,Quarter: + Window Size
Quarter: - Gap Size=,none,Quarter: - Gap Size Quarter: - Gap Size=,none,Quarter: - Gap Size
@ -177,10 +177,10 @@ Window Fullscreen=none,none,Make Window Fullscreen
Window Grow Horizontal=none,none,Pack Grow Window Horizontally Window Grow Horizontal=none,none,Pack Grow Window Horizontally
Window Grow Vertical=none,none,Pack Grow Window Vertically Window Grow Vertical=none,none,Pack Grow Window Vertically
Window Lower=none,none,Lower Window Window Lower=none,none,Lower Window
Window Maximize=none,none,Maximize Window Window Maximize=none,Meta+PgUp,Maximize Window
Window Maximize Horizontal=none,none,Maximize Window Horizontally Window Maximize Horizontal=none,none,Maximize Window Horizontally
Window Maximize Vertical=none,none,Maximize Window Vertically Window Maximize Vertical=none,none,Maximize Window Vertically
Window Minimize=none,none,Minimize Window Window Minimize=none,Meta+PgDown,Minimize Window
Window Move=none,none,Move Window Window Move=none,none,Move Window
Window No Border=none,none,Hide Window Border Window No Border=none,none,Hide Window Border
Window On All Desktops=none,none,Keep Window on All Desktops Window On All Desktops=none,none,Keep Window on All Desktops
@ -193,12 +193,12 @@ Window Pack Down=none,none,Pack Window Down
Window Pack Left=none,none,Pack Window to the Left Window Pack Left=none,none,Pack Window to the Left
Window Pack Right=none,none,Pack Window to the Right Window Pack Right=none,none,Pack Window to the Right
Window Pack Up=none,none,Pack Window Up Window Pack Up=none,none,Pack Window Up
Window Quick Tile Bottom=none,none,Quick Tile Window to the Bottom Window Quick Tile Bottom=none,Meta+Down,Quick Tile Window to the Bottom
Window Quick Tile Bottom Left=none,none,Quick Tile Window to the Bottom Left Window Quick Tile Bottom Left=none,none,Quick Tile Window to the Bottom Left
Window Quick Tile Bottom Right=none,none,Quick Tile Window to the Bottom Right Window Quick Tile Bottom Right=none,none,Quick Tile Window to the Bottom Right
Window Quick Tile Left=none,none,Quick Tile Window to the Left Window Quick Tile Left=none,Meta+Left,Quick Tile Window to the Left
Window Quick Tile Right=none,none,Quick Tile Window to the Right Window Quick Tile Right=none,Meta+Right,Quick Tile Window to the Right
Window Quick Tile Top=none,none,Quick Tile Window to the Top Window Quick Tile Top=none,Meta+Up,Quick Tile Window to the Top
Window Quick Tile Top Left=none,none,Quick Tile Window to the Top Left Window Quick Tile Top Left=none,none,Quick Tile Window to the Top Left
Window Quick Tile Top Right=none,none,Quick Tile Window to the Top Right Window Quick Tile Top Right=none,none,Quick Tile Window to the Top Right
Window Raise=none,none,Raise Window Window Raise=none,none,Raise Window
@ -239,7 +239,7 @@ Window to Screen 5=none,none,Window to Screen 5
Window to Screen 6=none,none,Window to Screen 6 Window to Screen 6=none,none,Window to Screen 6
Window to Screen 7=none,none,Window to Screen 7 Window to Screen 7=none,none,Window to Screen 7
WindowGeometry=Ctrl+Shift+F11,Ctrl+Shift+F11,Toggle window geometry display (effect only) WindowGeometry=Ctrl+Shift+F11,Ctrl+Shift+F11,Toggle window geometry display (effect only)
_k_friendly_name=System Settings _k_friendly_name=KWin
view_actual_size=,Meta+0,Actual Size view_actual_size=,Meta+0,Actual Size
view_zoom_in=Meta+=,Meta+=,Zoom In view_zoom_in=Meta+=,Meta+=,Zoom In
view_zoom_out=Meta+-,Meta+-,Zoom Out view_zoom_out=Meta+-,Meta+-,Zoom Out

24
.xinitrc
View File

@ -6,11 +6,27 @@
# Distributed under terms of the MIT license. # Distributed under terms of the MIT license.
# #
step_get_target() { die() {
echo "Failed to start session" >&2
exit 1
}
step_setup_target() {
# Set up our session target # Set up our session target
which i3 > /dev/null 2>&1 && export STARTUP="i3" which i3 > /dev/null 2>&1 && export STARTUP="i3"
which bspwm > /dev/null 2>&1 && export STARTUP="bspwm" which bspwm > /dev/null 2>&1 && export STARTUP="bspwm"
[ -x "$HOME/.concession/conspiracy" ] && export STARTUP="$HOME/.concession/conspiracy" [ -x "$HOME/.concession/conspiracy" ] && export STARTUP="$HOME/.concession/conspiracy"
[ -z ${STARTUP+x} ] && die
}
step_setup_env() {
# Ideally, you'd hook into a bunch of different DE startup stuff here
# But I only use Plasma, so there's only that here
if which kdeinit5 > /dev/null 2>&1; then
kdeinit5 &
kded5 &
export STARTUP="ksmserver \"$STARTUP\" --no-lockscreen"
fi
} }
step_start_xsession() { step_start_xsession() {
@ -25,13 +41,13 @@ step_start_manual() {
main() { main() {
# Set up the environment # Set up the environment
step_get_target step_setup_target
#step_setup_env
# Execute our target # Execute our target
step_start_xsession # Through Xsession scripts, or... step_start_xsession # Through Xsession scripts, or...
step_start_manual # ...manually, if need be step_start_manual # ...manually, if need be
# Or maybe just die, I guess # Or maybe just die, I guess
echo "Failed to start session" >&2 die
exit 1
} }
main $@ main $@