diff --git a/dot_config/i3/config b/dot_config/i3/config index f82f72c..e35b87c 100644 --- a/dot_config/i3/config +++ b/dot_config/i3/config @@ -75,10 +75,10 @@ bindsym $mod+space exec $HOME/.local/scripts/rofiwrap.sh # bindsym $mod+d exec --no-startup-id i3-dmenu-desktop # change focus -# bindsym $mod+j focus left -# bindsym $mod+k focus down -# bindsym $mod+l focus up -# bindsym $mod+semicolon focus right +bindsym $mod+h focus left +bindsym $mod+j focus down +bindsym $mod+k focus up +bindsym $mod+l focus right # alternatively, you can use the cursor keys: bindsym $mod+Left focus left @@ -99,10 +99,10 @@ bindsym $mod+Shift+Up move up bindsym $mod+Shift+Right move right # split in horizontal orientation -bindsym $mod+h split h +# bindsym $mod+h split h # split in vertical orientation -bindsym $mod+v split v +# bindsym $mod+v split v # enter fullscreen mode for the focused container bindsym $mod+f fullscreen toggle diff --git a/dot_config/nvim/init.vim b/dot_config/nvim/init.vim index ffca9ba..22b2a3a 100644 --- a/dot_config/nvim/init.vim +++ b/dot_config/nvim/init.vim @@ -65,6 +65,7 @@ set tabstop=4 set shiftwidth=4 set expandtab set formatoptions+=t +set colorcolumn=80 syntax on filetype on diff --git a/dot_local/scripts/zsh/aliases.zsh b/dot_local/scripts/zsh/aliases.zsh index 693e05a..0312fc6 100644 --- a/dot_local/scripts/zsh/aliases.zsh +++ b/dot_local/scripts/zsh/aliases.zsh @@ -1,4 +1,5 @@ alias subl="nvim" +alias ls="exa" alias rm="garbage put" alias cm="chezmoi" alias kill-gpg-agent="gpgconf --kill gpg-agent" diff --git a/dot_zshrc b/dot_zshrc index 5e647d2..278ff39 100644 --- a/dot_zshrc +++ b/dot_zshrc @@ -2,7 +2,7 @@ source $HOME/.local/scripts/zsh/zsh-prelude.zsh source $HOME/.local/scripts/zsh/check-update.zsh export LANG=en_US.UTF-8 -export ZSH="/home/michael/.oh-my-zsh" +export ZSH="$HOME/.oh-my-zsh" ZSH_THEME="ys" plugins=(git) @@ -41,5 +41,6 @@ if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then fi source $HOME/.local/scripts/zsh/aliases.zsh +source $HOME/.zsh/extras/*.zsh # vim: set filetype=zsh: