diff --git a/bash_aliases b/bash_aliases index 3e15273..42744b0 100644 --- a/bash_aliases +++ b/bash_aliases @@ -47,3 +47,7 @@ function h () { fi } + +# options +export LESS=-RFX +export PAGER="less" diff --git a/emacs b/emacs index 729d34c..9a15ff4 100644 --- a/emacs +++ b/emacs @@ -12,12 +12,13 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. + '(custom-enabled-themes (quote (smart-mode-line-respectful))) '(custom-safe-themes (quote - ("3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "c74e83f8aa4c78a121b52146eadb792c9facc5b1f02c917e3dbb454fca931223" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" default))) + ("8aebf25556399b58091e533e455dd50a6a9cba958cc4ebb0aab175863c25b9a4" "3c83b3676d796422704082049fc38b6966bcad960f896669dfc21a7a37a748fa" "c74e83f8aa4c78a121b52146eadb792c9facc5b1f02c917e3dbb454fca931223" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" default))) '(package-selected-packages (quote - (color-theme-solarized neotree smart-mode-line powerline magit use-package helm evil-visual-mark-mode)))) + (color-theme-solarized neotree smart-mode-line powerline use-package helm evil-visual-mark-mode)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -30,7 +31,6 @@ (evil-mode 1) ;; More configuration goes here ) -(use-package magit) (use-package smart-mode-line :ensure t @@ -53,6 +53,9 @@ (setq powerline-arrow-shape 'curve) (setq powerline-default-separator-dir '(right . left)) +;; Projectile +(add-hook 'python-mode-hook 'projectile-mode) + ;; rebind neotree in evil-mode (evil-define-key 'normal neotree-mode-map (kbd "TAB") 'neotree-enter) (evil-define-key 'normal neotree-mode-map (kbd "SPC") 'neotree-enter) diff --git a/gitconfig b/gitconfig index 695704d..6a26494 100644 --- a/gitconfig +++ b/gitconfig @@ -16,6 +16,7 @@ [format] pretty = format:%C(auto)%h %C(green)%G? %C(red)%<(15,trunc)%aN %C(cyan)%<(15,trunc)%ar %C(white)%<(60,trunc)%s %C(auto)%d [alias] + ab = "diff --name-only origin/master" alias = "!git config -l | grep alias | cut -c 7-" # show all these aliases bc = !git branch --merged master | grep -v master | xargs git branch -d # delete all merged branches d = diff --color-words # prettier diffs diff --git a/vimrc b/vimrc index 615c9f5..7ae2c9c 100644 --- a/vimrc +++ b/vimrc @@ -128,6 +128,11 @@ nmap h :bprevious " Close the current buffer and move to the previous one nmap bq :bp bd # +" FUCK EX MODE +map q: +nnoremap Q + + " Toggle line numbers with F1 - no more stupid help! nmap :set invnumber autocmd StdinReadPre * let s:std_in=1