g1smo
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Dotfiles update

x1carbon
Jure Podgoršek 2016-12-17 01:41:34 +01:00
parent 43a5a62a4b
commit e0f66759d2
4 changed files with 46 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gvimrc
View File

@ -1 +0,0 @@
colorscheme molokai

10
.spacemacs
View File

@ -65,7 +65,6 @@ values."
color-theme-sanityinc-tomorrow color-theme-sanityinc-tomorrow
underwater-theme underwater-theme
ample-theme ample-theme
color-theme-sanityinc-solarized
yascroll yascroll
) )
;; A list of packages that cannot be updated. ;; A list of packages that cannot be updated.
@ -154,7 +153,7 @@ values."
dotspacemacs-default-font '( dotspacemacs-default-font '(
;;"Source Code Pro" ;;"Source Code Pro"
"Fira Code Retina" "Fira Code Retina"
:size 16 :size 22
:weight normal :weight normal
:width normal :width normal
:powerline-scale 1.0) :powerline-scale 1.0)
@ -339,7 +338,7 @@ you should place your code here."
(setq neo-theme (if (display-graphic-p) 'icons 'arrow)) (setq neo-theme (if (display-graphic-p) 'icons 'arrow))
;; Also in dired ;; Also in dired
(use-package all-the-icons) (use-package all-the-icons-dired)
;;; scroll one line at a time (less "jumpy" than defaults) ;;; scroll one line at a time (less "jumpy" than defaults)
;;(setq mouse-wheel-scroll-amount '(2 ((shift) . 1))) ;; two lines at a time ;;(setq mouse-wheel-scroll-amount '(2 ((shift) . 1))) ;; two lines at a time
@ -404,7 +403,7 @@ you should place your code here."
("#dc322f" "#cb4b16" "#b58900" "#546E00" "#B4C342" "#00629D" "#2aa198" "#d33682" "#6c71c4"))) ("#dc322f" "#cb4b16" "#b58900" "#546E00" "#B4C342" "#00629D" "#2aa198" "#d33682" "#6c71c4")))
'(package-selected-packages '(package-selected-packages
(quote (quote
(yascroll indicators all-the-icons-dired bind-map helm helm-core color-theme-sanityinc-solarized blackboard-theme ample-theme underwater-theme sanityinc-tomorrow-day-theme-theme color-theme-sanityinc-tomorrow all-the-icons font-lock+ phpunit phpcbf php-extras php-auto-yasnippets drupal-mode php-mode xterm-color smeargle shell-pop orgit org-projectile org-present org org-pomodoro alert log4e gntp org-download mwim multi-term mmm-mode markdown-toc markdown-mode magit-gitflow htmlize helm-gitignore helm-company helm-c-yasnippet gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter gh-md flyspell-correct-helm flyspell-correct flycheck-pos-tip pos-tip flycheck evil-magit magit magit-popup git-commit with-editor eshell-z eshell-prompt-extras esh-help diff-hl company-web web-completion-data company-tern dash-functional tern company-statistics company auto-yasnippet auto-dictionary ac-ispell auto-complete web-mode tagedit slim-mode scss-mode sass-mode pug-mode less-css-mode helm-css-scss haml-mode emmet-mode sublimity editorconfig web-beautify livid-mode skewer-mode simple-httpd json-mode json-snatcher json-reformat js2-refactor yasnippet multiple-cursors js2-mode js-doc coffee-mode ws-butler window-numbering which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib evil-visual-mark-mode spacemacs-theme quelpa org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint info+ indent-guide ido-vertical-mode hydra hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation hide-comnt help-fns+ helm-themes helm-swoop helm-projectile helm-mode-manager helm-make helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-args evil-anzu eval-sexp-fu elisp-slime-nav dumb-jump diminish define-word column-enforce-mode clean-aindent-mode bind-key auto-highlight-symbol auto-compile aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line))) (parent-mode projectile pkg-info epl flx smartparens iedit anzu evil goto-chg undo-tree highlight f s packed avy async popup package-build company-quickhelp yascroll indicators all-the-icons-dired bind-map helm helm-core color-theme-sanityinc-solarized blackboard-theme ample-theme underwater-theme sanityinc-tomorrow-day-theme-theme color-theme-sanityinc-tomorrow all-the-icons font-lock+ phpunit phpcbf php-extras php-auto-yasnippets drupal-mode php-mode xterm-color smeargle shell-pop orgit org-projectile org-present org org-pomodoro alert log4e gntp org-download mwim multi-term mmm-mode markdown-toc markdown-mode magit-gitflow htmlize helm-gitignore helm-company helm-c-yasnippet gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter gh-md flyspell-correct-helm flyspell-correct flycheck-pos-tip pos-tip flycheck evil-magit magit magit-popup git-commit with-editor eshell-z eshell-prompt-extras esh-help diff-hl company-web web-completion-data company-tern dash-functional tern company-statistics company auto-yasnippet auto-dictionary ac-ispell auto-complete web-mode tagedit slim-mode scss-mode sass-mode pug-mode less-css-mode helm-css-scss haml-mode emmet-mode sublimity editorconfig web-beautify livid-mode skewer-mode simple-httpd json-mode json-snatcher json-reformat js2-refactor yasnippet multiple-cursors js2-mode js-doc coffee-mode ws-butler window-numbering which-key volatile-highlights vi-tilde-fringe uuidgen use-package toc-org spaceline powerline restart-emacs request rainbow-delimiters popwin persp-mode pcre2el paradox spinner org-plus-contrib evil-visual-mark-mode spacemacs-theme quelpa org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint info+ indent-guide ido-vertical-mode hydra hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation hide-comnt help-fns+ helm-themes helm-swoop helm-projectile helm-mode-manager helm-make helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-args evil-anzu eval-sexp-fu elisp-slime-nav dumb-jump diminish define-word column-enforce-mode clean-aindent-mode bind-key auto-highlight-symbol auto-compile aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line)))
'(pos-tip-background-color "#073642") '(pos-tip-background-color "#073642")
'(pos-tip-foreground-color "#93a1a1") '(pos-tip-foreground-color "#93a1a1")
'(smartrep-mode-line-active-bg (solarized-color-blend "#859900" "#073642" 0.2)) '(smartrep-mode-line-active-bg (solarized-color-blend "#859900" "#073642" 0.2))
@ -446,4 +445,5 @@ you should place your code here."
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
) '(company-tooltip-common ((t (:inherit company-tooltip :weight bold :underline nil))))
'(company-tooltip-common-selection ((t (:inherit company-tooltip-selection :weight bold :underline nil)))))

76
.vimrc
View File

@ -1,52 +1,43 @@
" Terminal color override " call plug#begin()
set t_Co=256 Plug 'tpope/vim-fugitive'
let g:rehash256 = 1 Plug 'scrooloose/nerdtree'
Plug 'kien/ctrlp.vim'
colorscheme molokai Plug 'FelikZ/ctrlp-py-matcher'
Plug 'Lokaltog/vim-easymotion'
set nocompatible Plug 'vim-airline/vim-airline'
filetype off Plug 'vim-airline/vim-airline-themes'
Plug 'scrooloose/syntastic'
set rtp+=~/.vim/bundle/Vundle.vim Plug 'kchmck/vim-coffee-script'
call vundle#begin()
Plugin 'gmarik/Vundle.vim'
Plugin 'tpope/vim-fugitive'
Plugin 'scrooloose/nerdtree'
Plugin 'kien/ctrlp.vim'
Plugin 'FelikZ/ctrlp-py-matcher'
Plugin 'Lokaltog/vim-easymotion'
Plugin 'bling/vim-airline'
Plugin 'scrooloose/syntastic'
Plugin 'kchmck/vim-coffee-script'
"Plugin 'ervandew/supertab' "Plugin 'ervandew/supertab'
Plugin 'godlygeek/tabular' Plug 'godlygeek/tabular'
Plugin 'editorconfig/editorconfig-vim' Plug 'editorconfig/editorconfig-vim'
Plugin 'terryma/vim-multiple-cursors' Plug 'terryma/vim-multiple-cursors'
Plugin 'mustache/vim-mustache-handlebars' Plug 'mustache/vim-mustache-handlebars'
Plugin 'othree/html5.vim' Plug 'othree/html5.vim'
Plugin 'Shougo/neocomplcache.vim' Plug 'Shougo/neocomplcache.vim'
Plugin 'osyo-manga/vim-over' Plug 'osyo-manga/vim-over'
Plugin 'mhinz/vim-startify' Plug 'mhinz/vim-startify'
Plugin 'godlygeek/csapprox' Plug 'dyng/ctrlsf.vim'
Plugin 'dyng/ctrlsf.vim' Plug 'evidens/vim-twig'
Plugin 'evidens/vim-twig' Plug 'jceb/vim-orgmode'
Plugin 'jceb/vim-orgmode' Plug 'tpope/vim-rails'
Plugin 'tpope/vim-rails' Plug 'marlun/vim-starwars'
Plugin 'marlun/vim-starwars' Plug 'altercation/vim-colors-solarized'
call plug#end()
call vundle#end() " Colorscheme "
syntax on
set background=light
colorscheme solarized
" Syntax on, tab settings, line numbering " Tab settings, line numbering "
filetype plugin indent on filetype plugin indent on
syn on
set expandtab set expandtab
set tabstop=2 set tabstop=2
set shiftwidth=2 set shiftwidth=2
set nu set nu
" Clear empty lines on save " Clear empty lines on save "
autocmd BufWritePre * silent! :%s/\s+$//e autocmd BufWritePre * silent! :%s/\s+$//e
" CtrlP opening of files " " CtrlP opening of files "
@ -74,9 +65,6 @@ let g:ctrlsf_position = "right"
let g:netrw_liststyle = 3 let g:netrw_liststyle = 3
" Gvim stuff " " Gvim stuff "
if has("gui_running")
set guifont=Inconsolata-g\ Medium\ 9
endif
set guioptions-=m " Remove menubar set guioptions-=m " Remove menubar
set guioptions-=T " Remove toolbar set guioptions-=T " Remove toolbar
@ -92,7 +80,7 @@ set nowritebackup
" Airline stuff " " Airline stuff "
let g:airline_powerline_fonts = 1 let g:airline_powerline_fonts = 1
let g:airline_theme = "wombat" let g:airline_theme = 'solarized'
" JSON format " " JSON format "
com! FormatJSON %!python -m json.tool com! FormatJSON %!python -m json.tool

11
.zshrc
View File

@ -25,7 +25,6 @@ compinit
# Color # Color
autoload colors zsh/terminfo autoload colors zsh/terminfo
colors colors
export TERM="xterm-color"
# PATH additions # PATH additions
export GOPATH=~/Sredstva/go export GOPATH=~/Sredstva/go
export PATH="$PATH:/home/g1smo/bin:/home/g1smo/.gem/ruby/2.3.0/bin:$GOPATH/bin" export PATH="$PATH:/home/g1smo/bin:/home/g1smo/.gem/ruby/2.3.0/bin:$GOPATH/bin"
@ -54,13 +53,21 @@ alias ls='ls --color=auto'
alias vi='vim' alias vi='vim'
alias apachelog="gnome-terminal -e \"tail -f /var/log/httpd/error_log\"" alias apachelog="gnome-terminal -e \"tail -f /var/log/httpd/error_log\""
alias nvidiaoff="sudo modprobe -r nvidia_drm nvidia_modeset nvidia-uvm nvidia; sudo tee /proc/acpi/bbswitch <<<OFF" alias nvidiaoff="sudo modprobe -r nvidia_drm nvidia_modeset nvidia-uvm nvidia; sudo tee /proc/acpi/bbswitch <<<OFF"
#alias nvidiaoff="sudo tee /sys/kernel/debug/vgaswitcheroo/switch <<<OFF"
alias sudo="sudo " alias sudo="sudo "
alias grep="grep --color=auto" alias grep="grep --color=auto"
alias paclean="sudo pacman -R \$(pacman -Qdt | awk '{print \$1}')" alias paclean="sudo pacman -R \$(pacman -Qdt | awk '{print \$1}')"
alias ffon="sudo cp /etc/resolv.conf.ff /etc/resolv.conf" alias ffon="sudo cp /etc/resolv.conf.ff /etc/resolv.conf"
alias gitclean="git fetch -p && for branch in \$(git branch -vv | grep ': gone]' | gawk '{print \$1}'); do git branch -D \$branch; echo 'deleted \$branch'; done" alias gitclean="git fetch -p && for branch in \$(git branch -vv | grep ': gone]' | gawk '{print \$1}'); do git branch -D \$branch; echo 'deleted \$branch'; done"
alias wqa="cp /home/g1smo/Sredstva/wandera_qa.yml /home/g1smo/Projects/wandera/app/config/parameters.yml"
# Firefox scaling!
# regular firefox
alias sf="find ~/.mozilla/firefox -name \"prefs.js\" -exec sed -ri 's/(devPixelsPerPx\\\", \\\")[0-9\\.]+/\\11\.00/' {} + ; firefox"
alias ff="find ~/.mozilla/firefox -name \"prefs.js\" -exec sed -ri 's/(devPixelsPerPx\\\", \\\")[0-9\\.]+/\\11\.75/' {} + ; firefox"
# Wandera env
alias wdev="cp /home/g1smo/Sredstva/wandera_dev.yml /home/g1smo/Projects/wandera/app/config/parameters.yml" alias wdev="cp /home/g1smo/Sredstva/wandera_dev.yml /home/g1smo/Projects/wandera/app/config/parameters.yml"
alias wqa="cp /home/g1smo/Sredstva/wandera_qa.yml /home/g1smo/Projects/wandera/app/config/parameters.yml"
# Reverse search shortcut # Reverse search shortcut
bindkey '^R' history-incremental-pattern-search-backward bindkey '^R' history-incremental-pattern-search-backward