From da72ab472ad166e77d16911ace0c4287d3d3548b Mon Sep 17 00:00:00 2001 From: Charles Date: Fri, 16 Aug 2019 11:30:18 +0200 Subject: branch s19, remove tab to space for the norminette --- .vimrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.vimrc b/.vimrc index ffb7194..91a1c5d 100644 --- a/.vimrc +++ b/.vimrc @@ -34,9 +34,9 @@ nnoremap zl < nnoremap zj - nnoremap zk + " tab to space -set expandtab -set tabstop=4 -set shiftwidth=4 +" set expandtab +" set tabstop=4 +" set shiftwidth=4 set smarttab set autoindent set smartindent -- cgit From c9600030d38442c92ead185fcd8307955c156ec3 Mon Sep 17 00:00:00 2001 From: Cabergs Charles Date: Thu, 10 Oct 2019 10:17:20 +0200 Subject: Changed tab stuff --- .vimrc | 11 ++++++----- .zshrc | 27 ++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.vimrc b/.vimrc index 9d7a85e..4dbafaa 100644 --- a/.vimrc +++ b/.vimrc @@ -36,9 +36,9 @@ nnoremap zk + " set expandtab " set tabstop=4 " set shiftwidth=4 -set smarttab -set autoindent -set smartindent +" set smarttab +" set autoindent +" set smartindent " search set ignorecase set smartcase @@ -51,12 +51,13 @@ set scrolloff=2 " 2 line above scroll set showcmd set cursorline " highlight current line set noshowmode " unnecessary with status bar" +set noshowmatch set autoread " reload files when changes happen outside vim " where to place the .swp files -set backupdir=~/.vim-tmp,~/.tmp,~/tmp,~/var/tmp -set directory=~/.vim-tmp,~/.tmp,~/tmp,~/var/tmp +" set backupdir=~/.vim-tmp,~/.tmp,~/tmp,~/var/tmp +" set directory=~/.vim-tmp,~/.tmp,~/tmp,~/var/tmp " directory to ignore when searching in file tree (works with ctrlp) set wildignore=*/tmp/*,*.o,*.so,*.swp,*.zip,*/node_modules/*,*/vendor/*,.bundle/*,bin/*,.git/* " ctrlp ignore all stuff in the .gitignore diff --git a/.zshrc b/.zshrc index 54925c4..a4ffa7f 100644 --- a/.zshrc +++ b/.zshrc @@ -1,13 +1,22 @@ export ZSH="$HOME/.oh-my-zsh" -ZSH_THEME="pure" +ZSH_THEME="" +# ZSH_THEME="robbyrussell" HYPHEN_INSENSITIVE="true" DISABLE_MAGIC_FUNCTIONS=true HIST_STAMPS="dd/mm/yyyy" -plugins=(colorize command-not-found git zsh-syntax-highlighting) +#school stuff +ZSH_DISABLE_COMPFIX=true + +export FPATH="$FPATH:$HOME/.zsh/pure" + +plugins=(colorize git zsh-syntax-highlighting) source $ZSH/oh-my-zsh.sh +autoload -U promptinit; promptinit +prompt pure + bindkey -v export KEYTIMEOUT=1 @@ -47,6 +56,8 @@ alias node="nodejs" alias python="python3.7" alias info="info --vi-keys" alias moula="gcc -Wall -Wextra -Werror" +alias norm="norminette" +alias normch="norm *.c *.h" alias list-c-includes-paths="echo | gcc -E -Wp,-v -" alias yoump3='youtube-dl --extract-audio --audio-format mp3' alias adg="sudo apt update && sudo apt upgrade" @@ -60,6 +71,16 @@ function chpwd() { fi } +# behavior on enter +# function precmd() { +# echo $0; +# if ["${0}" -eq ""]; then +# ls +# else +# $1 +# fi; +# } + export DOTFILES=$HOME/dotfiles alias zshrc="vim $DOTFILES/.zshrc && source $DOTFILES/.zshrc" alias vimrc="vim $DOTFILES/.vimrc" @@ -74,7 +95,7 @@ bindkey -M menuselect 'j' vi-down-line-or-history bindkey -v '^?' backward-delete-char # add command-not-found package suggestion -source /etc/zsh_command_not_found +#source /etc/zsh_command_not_found # add /sbin to $PATH export PATH="/sbin:/usr/local/sbin:/usr/sbin:$PATH" -- cgit