misc changes

vicentebolea · Jun 16, 2023 · 09eb1f9 · 09eb1f9
1 parent 2fd5ba0
commit 09eb1f9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/.config/terminator/config b/.config/terminator/config
@@ -36,6 +36,7 @@
     palette = "#073642:#dc322f:#859900:#b58900:#268bd2:#d33682:#2aa198:#eee8d5:#002b36:#cb4b16:#586e75:#657b83:#839496:#6c71c4:#93a1a1:#fdf6e3"
     use_system_font = False
   [[solarized]]
+    allow_bold = False
     icon_bell = False
     background_color = "#002b36"
     cursor_color = "#8f5902"

diff --git a/.gitconfig b/.gitconfig
@@ -195,14 +195,17 @@
 ############
   sign = commit -S --amend --no-edit
   rmmerges = "!git branch --merged | grep -Ev '^( |\\*) (master|main|release|dev|develop)$' | xargs git branch -d"
+  mr = !sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -
 [mergetool]
   prompt = false
 [rerere]
   enabled = true
-[filter "lfs"]
-  required = true
-  clean = git-lfs clean -- %f
-  smudge = git-lfs smudge -- %f
-  process = git-lfs filter-process
 [pager]
   branch = false
+[gpg]
+	format = ssh
+[filter "lfs"]
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
+	required = true
diff --git a/.inputrc b/.inputrc
@@ -1,4 +1,9 @@
+set bell-style visible
+set colored-stats On
+set completion-ignore-case On
 set editing-mode vi
+set horizontal-scroll-mode Off
+set menu-complete-display-prefix On
 
 # Edit options before rerunning previous command, eg: ls a b c -> ls -al a b c
 set keymap vi-insert

diff --git a/.vimrc b/.vimrc
@@ -137,9 +137,12 @@ endif
 autocmd FileType html setlocal sw=2 ts=2 noexpandtab autoindent
 autocmd FileType Makefile setlocal sw=2 ts=2 noexpandtab
 autocmd FileType java setlocal sw=4 ts=4 expandtab
-autocmd FileType Python setlocal sw=2 ts=2 expandtab
+autocmd FileType sh,bash,csh setlocal makeprg=shellcheck\ %
 
-autocmd FileType html,markdown,rst,txt,tex setlocal textwidth=80 colorcolumn=81 spell
+" PEP8 compliant
+autocmd! FileType python setlocal sw=4 ts=4 sts=4 expandtab textwidth=79 autoindent makeprg=flake8\ %
+
+autocmd FileType html,markdown,rst,txt,tex setlocal textwidth=79 colorcolumn=81 spell
 autocmd BufEnter,BufNew *.log setlocal nowrap
 
 augroup tabsPolicy
@@ -216,6 +219,7 @@ ab WQ wq
 ab Q q
 ab WQA wqa
 ab Wqa wqa
+ab E e
 "}}}
 "vim-airline {{{
 let g:airline_left_sep=''