diff --git a/config/dotwryn.env.zsh b/config/dotwryn.env.zsh index b08c3bd..a9b40a7 100644 --- a/config/dotwryn.env.zsh +++ b/config/dotwryn.env.zsh @@ -61,7 +61,7 @@ for e in \ "local.$(hostnamectl --static).secret" \ "local.$(hostnamectl --static)" \ "local" -do; export SCWRYPTS_ENV="$e"; [ -f "$HOME/.config/scwrypts/env/$e" ] && break; done +do export SCWRYPTS_ENV="$e"; [ -f "$HOME/.config/scwrypts/env/$e" ] && break; done # z diff --git a/config/i3.conf b/config/i3.conf index 4c3b945..19e565c 100644 --- a/config/i3.conf +++ b/config/i3.conf @@ -2,6 +2,7 @@ # # Please see https://i3wm.org/docs/userguide.html for a complete reference! +set $alt Mod1 set $mod Mod4 font pango:DejaVuSansMono Nerd Font 20 @@ -131,6 +132,7 @@ bindsym $mod+x [class=$TERMINAL_EMULATOR_CLASSES] scratchpad show ################################################################################ bindsym $mod+Shift+e exec $UTILS logout +bindsym Control+$alt+Delete exit bindsym $mod+Shift+r restart bindsym $mod+Shift+c reload diff --git a/config/scwrypts/dotfiles.zsh b/config/scwrypts/dotfiles.zsh index 2b4112d..f0698f4 100644 --- a/config/scwrypts/dotfiles.zsh +++ b/config/scwrypts/dotfiles.zsh @@ -36,7 +36,8 @@ $DOTWRYN/config/scwrypts/vundle.zsh scwrypts/vundle.zsh $DOTWRYN/config/tmux.conf tmux/tmux.conf $DOTWRYN/config/xcompose.conf X11/xcompose $DOTWRYN/config/xconfig.conf X11/xconfig -$DOTWRYN/config/xinitrc X11/xinitrc +$DOTWRYN/config/xinitrc.i3 X11/xinitrc +$DOTWRYN/config/xinitrc.i3 ../.xinitrc $DOTWRYN/bin/scwrypts ../.local/bin/scwrypts $DOTWRYN/bin/vim ../.local/bin/vim $DOTWRYN/bin/$(hostnamectl --static) ../.$(hostnamectl --static) diff --git a/config/xinitrc b/config/xinitrc.common similarity index 56% rename from config/xinitrc rename to config/xinitrc.common index 4bff8f2..e287743 100644 --- a/config/xinitrc +++ b/config/xinitrc.common @@ -1,12 +1,7 @@ #!/bin/zsh -source "$HOME/.config/wryn/env.zsh" - export PATH="$DOTWRYN/bin/$(hostnamectl --static):$PATH" +command -v kitty >/dev/null 2>&1 \ + && export TERMINAL=$(which kitty) + for SCRIPT in $(find /etc/x11/xinit/xinitrc.d); do source $SCRIPT; done -command -v dex && dex -a - -$DOTWRYN/bin/xorg-activate-default & - -cd -exec i3 diff --git a/config/xinitrc.i3 b/config/xinitrc.i3 new file mode 100644 index 0000000..4de7118 --- /dev/null +++ b/config/xinitrc.i3 @@ -0,0 +1,10 @@ +#!/bin/zsh +source "$HOME/.config/wryn/env.zsh" +source "$DOTWRYN/config/xinitrc.common" + +command -v dex && dex -a +$DOTWRYN/bin/xorg-activate-default & + +cd +export DESKTOP_SESSION=i3wm +exec i3 diff --git a/config/xinitrc.kde b/config/xinitrc.kde new file mode 100644 index 0000000..b175d90 --- /dev/null +++ b/config/xinitrc.kde @@ -0,0 +1,7 @@ +#!/bin/zsh +source "$HOME/.config/wryn/env.zsh" +source "$DOTWRYN/config/xinitrc.common" + +export DESKTOP_SESSION=plasma +unset DIRECTUS_CLOUD_SCRIPTS_ENV_SHORTCUT +exec startplasma-x11 diff --git a/zsh/alias b/zsh/alias index 6108acb..e0f446f 100644 --- a/zsh/alias +++ b/zsh/alias @@ -16,9 +16,18 @@ alias w='watch -tn1 ' ##################################################################### -command -v bat >/dev/null 2>&1 && alias cat='bat --style="plain"' +command -v bat >/dev/null 2>&1 \ + && alias cat='bat --style="plain"' + +command -v startplasma-x11 >/dev/null 2>&1 \ + && alias startk="startx '$DOTWRYN/config/xinitrc.kde'" + +command -v i3 >/dev/null 2>&1 \ + && alias starti="startx '$DOTWRYN/config/xinitrc.i3'" ##################################################################### alias erg='EDIT_RIPGREP_FILE_MATCHES' EDIT_RIPGREP_FILE_MATCHES() { $EDITOR $(rg --color=never -l $@); } + +#####################################################################