frebib/dotfiles
1
0
Fork 0
mirror of https://github.com/frebib/dotfiles.git synced 2024-06-14 12:57:23 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: frebib:e7b3c5e3e075972d5bf6e38c08dad79fb7dbb48d
Branches Tags
frebib:master
frebib:frebib-PC
frebib:systemd-session
frebib:surface
frebib:surface-docked
...
compare: frebib:20f48e25b4d5c41aad4355c40f93aac9e90c9088
Branches Tags
frebib:master
frebib:frebib-PC
frebib:systemd-session
frebib:surface
frebib:surface-docked

4 Commits
e7b3c5e3e0 ... 20f48e25b4

Author SHA1 Message Date
Joe Groocock
20f48e25b4
vim: attempt to improve yaml auto-indent 
Hopefully this should prevent auto-indent when hitting <CR> after
inserting a :. Whether it works or not, we'll have to see.

Signed-off-by: Joe Groocock <me@frebib.net>
 2020-08-10 22:02:24 +01:00
Joe Groocock
35d08af7ce
vim: remove GVim settings 
I never use gvim. I'm not sure why I added these here in the first
place. The defaults should do the same thing anyway

Signed-off-by: Joe Groocock <me@frebib.net>
 2020-08-10 22:01:42 +01:00
Joe Groocock
ec76965c70
vim: group splitting options together 
Signed-off-by: Joe Groocock <me@frebib.net>
 2020-08-10 22:01:22 +01:00
Joe Groocock
8a5408c002
zsh: rearrange files into sane XDG dirs 
Move non-config into XDG_DATA_HOME including Antigen and ZSH history
files.

Signed-off-by: Joe Groocock <me@frebib.net>
 2020-08-10 21:58:23 +01:00
3 changed files with 11 additions and 16 deletions
Show Stats Expand all files Collapse all files

12
.config/vim/vimrc
View File

@ -49,23 +49,18 @@ endfunction
set autowrite set autowrite
autocmd CursorHold,CursorHoldI,InsertLeave,FocusGained,FocusLost * call SaveIfExist() autocmd CursorHold,CursorHoldI,InsertLeave,FocusGained,FocusLost * call SaveIfExist()
" Auto-resize split on window resize
autocmd VimResized * wincmd =
" Search options " Search options
set hlsearch set hlsearch
set ignorecase set ignorecase
set smartcase set smartcase
set magic set magic
" Auto-resize split on window resize
autocmd VimResized * wincmd =
" More natural splits " More natural splits
set splitbelow " Horizontal split below current. set splitbelow " Horizontal split below current.
set splitright " Vertical split to right of current. set splitright " Vertical split to right of current.
" GVim settings
set guifont=Sauce\ Code\ Pro\ 9
set guioptions=
" Whitespace highlight settings " Whitespace highlight settings
set list set list
set listchars=eol:$,space:·,tab:>-,trail:◦,extends:▶,precedes:◀ set listchars=eol:$,space:·,tab:>-,trail:◦,extends:▶,precedes:◀
@ -308,6 +303,7 @@ cmap w!! w !sudo tee > /dev/null %
" Unmap ex-mode " Unmap ex-mode
map Q <nop> map Q <nop>
autocmd FileType markdown setlocal ts=2 sts=2 sw=2 et autocmd FileType markdown setlocal ts=2 sts=2 sw=2 et
autocmd FileType yaml setlocal ts=2 sts=2 sw=2 et autocmd FileType yaml setlocal ts=2 sts=2 sw=2 et indentkeys-=<:>
autocmd FileType gitcommit setlocal cc=72 et sw=4 autocmd FileType gitcommit setlocal cc=72 et sw=4

14
.config/zsh/.zshrc
View File

@ -1,13 +1,12 @@
# Config and cache directory paths # Config and cache directory paths
CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}" ZSH_DIR="$XDG_CONFIG_HOME/zsh"
ZSH_DIR="$CONFIG_DIR/zsh" LOG_DIR="$XDG_DATA_HOME/logs"
LOG_DIR="$ZSH_DIR/log" HISTFILE="$XDG_DATA_HOME/zsh/history"
mkdir -p "$LOG_DIR"
HISTFILE="$ZSH_DIR/histfile"
HISTSIZE=999999 HISTSIZE=999999
SAVEHIST=999999 SAVEHIST=999999
mkdir -p "$LOG_DIR" "$(dirname "$HISTFILE")"
exists() { which $@ 0<&- 1>/dev/null 2>/dev/null; } exists() { which $@ 0<&- 1>/dev/null 2>/dev/null; }
# Only set tty if running interactively # Only set tty if running interactively
@ -62,8 +61,7 @@ x-bash-backward-kill-word(){ WORDCHARS='' zle kill-word; }
zle -N x-bash-backward-kill-word zle -N x-bash-backward-kill-word
# Load antigen & plugins # Load antigen & plugins
ADOTDIR="$ZSH_DIR/antigen" # Antigen directory ANTIGEN_LOG="$LOG_DIR/antigen-$(date -u --iso-8601=seconds | cut -d+ -f1).log"
ANTIGEN_LOG="$LOG_DIR/antigen-$(date +"%Y_%m_%d_%I_%M_%p").log"
antigen_src="$ADOTDIR/antigen.zsh" antigen_src="$ADOTDIR/antigen.zsh"
if [ ! -f "$antigen_src" ]; then if [ ! -f "$antigen_src" ]; then
git clone https://github.com/zsh-users/antigen.git "$ADOTDIR" git clone https://github.com/zsh-users/antigen.git "$ADOTDIR"

1
.profile
View File

@ -21,6 +21,7 @@ export VISUAL="vim"
# Override paths for non-compliant programs # Override paths for non-compliant programs
# https://wiki.archlinux.org/index.php/XDG_Base_Directory_support # https://wiki.archlinux.org/index.php/XDG_Base_Directory_support
export ADOTDIR="$XDG_DATA_HOME/zsh/antigen"
export CARGO_HOME="$XDG_DATA_HOME/cargo" export CARGO_HOME="$XDG_DATA_HOME/cargo"
export GNUPGHOME="$XDG_CONFIG_HOME/gnupg" export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"
export GOPATH="$XDG_DATA_HOME/go" export GOPATH="$XDG_DATA_HOME/go"