binaryDiv/dotfiles
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Compare commits

base: binaryDiv:2ef36eb976b764d9669e8243011c5bbe0929c650
Branches Tags
binaryDiv:main
..
compare: binaryDiv:695985746e964ee0d3160b15ef625f3d01e768c4
Branches Tags
binaryDiv:main

No commits in common. "2ef36eb976b764d9669e8243011c5bbe0929c650" and "695985746e964ee0d3160b15ef625f3d01e768c4" have entirely different histories.
2ef36eb976 ... 695985746e

3 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.bashrc
View file

@ -11,10 +11,9 @@ set -o noclobber
shopt -s checkwinsize shopt -s checkwinsize
shopt -s histappend shopt -s histappend
HISTCONTROL=ignoreboth HISTCONTROL=ignoreboth
HISTSIZE=10000 HISTSIZE=20000
HISTFILESIZE=100000 HISTFILESIZE=20000
PROMPT_DIRTRIM=3 PROMPT_DIRTRIM=3
PROMPT_COMMAND+=('history -a')
# Save and display timestamps for history # Save and display timestamps for history
HISTTIMEFORMAT="[%F %T] " HISTTIMEFORMAT="[%F %T] "

8
.config/git/config.inc/common.gitconfig
View file

@ -67,20 +67,12 @@
# Push with ci.skip option (probably only works with GitLab) # Push with ci.skip option (probably only works with GitLab)
push-skip-ci = push -o ci.skip push-skip-ci = push -o ci.skip
# Push with --force-with-lease, like force push but less risky. Should be used after a rebase.
push-softly = push --force-with-lease
# "back to the future": switch to default branch and pull # "back to the future": switch to default branch and pull
# TODO: Add `git stash push/pop`, but only if there actually is something to stash... not quite sure how
bttf = "!f() { DEFAULT=$(git default-branch); git switch ${1-$DEFAULT} && git pull --rebase --prune; }; f" bttf = "!f() { DEFAULT=$(git default-branch); git switch ${1-$DEFAULT} && git pull --rebase --prune; }; f"
stash-bttf = !git stash && git bttf && git stash pop
# Reset HEAD to last commit, but keep files as they are # Reset HEAD to last commit, but keep files as they are
uncommit = reset HEAD~1 --mixed uncommit = reset HEAD~1 --mixed
# Shortcut for rebase --continue
rebase-c = rebase --continue
# Stash changes, pull and pop stash again # Stash changes, pull and pop stash again
stash-pull = !git stash && git pull && git stash pop stash-pull = !git stash && git pull && git stash pop

13
.vimrc
View file

@ -15,6 +15,7 @@ set smartcase
" Indentation options (yeah let's switch to spaces instead of tabs I guess...) " Indentation options (yeah let's switch to spaces instead of tabs I guess...)
set autoindent set autoindent
set expandtab set expandtab
set smarttab
set shiftwidth=4 set shiftwidth=4
set tabstop=4 set tabstop=4
set softtabstop=4 set softtabstop=4
@ -26,8 +27,14 @@ filetype plugin on
autocmd BufNewFile,BufRead *.gitconfig set syntax=gitconfig autocmd BufNewFile,BufRead *.gitconfig set syntax=gitconfig
autocmd BufNewFile,BufRead *.rasi set syntax=scss autocmd BufNewFile,BufRead *.rasi set syntax=scss
" Indentation for YAML (use 2 spaces) " Indentation for Python (use 4 spaces)
autocmd FileType yml,yaml setlocal sts=2 sw=2 "autocmd FileType python setlocal expandtab shiftwidth=4 softtabstop=4
autocmd FileType yml,yaml setlocal ts=2 sts=2 sw=2 expandtab
" Indentation (don't remove tabs from empty lines)
"inoremap <CR> <CR>x<BS>
"nnoremap o ox<BS>
"nnoremap O Ox<BS>
" Mouse settings " Mouse settings
set mouse=a set mouse=a
@ -135,7 +142,7 @@ inoremap <A-l> <C-o>l
" Unindent with Shift-Tab " Unindent with Shift-Tab
inoremap <S-Tab> <C-o><< inoremap <S-Tab> <C-o><<
" Copy to and paste from X clipboard (Ctrl-C in visual mode and Ctrl-V in insert mode) " Copy and to X clipboard (Ctrl-C in visual mode and Ctrl-V in insert mode)
vmap <C-C> "+y vmap <C-C> "+y
imap <C-V> <C-\><C-O>"+P imap <C-V> <C-\><C-O>"+P