Merge branch 'master' of git.barakmich.com:barak/dotfiles
This commit is contained in:
commit
6e8336f18a
3 changed files with 17 additions and 11 deletions
21
.spacemacs
21
.spacemacs
|
|
@ -25,11 +25,12 @@ values."
|
|||
auto-completion-enable-help-tooltip t
|
||||
auto-completion-enable-snippets-in-popup nil)
|
||||
;; better-defaults
|
||||
idris
|
||||
emacs-lisp
|
||||
mu4e
|
||||
git
|
||||
go
|
||||
themes-megapack
|
||||
;themes-megapack
|
||||
latex
|
||||
markdown
|
||||
(org :variables
|
||||
|
|
@ -71,7 +72,6 @@ This function is called at the very startup of Spacemacs initialization
|
|||
before layers configuration.
|
||||
You should not put any user code in there besides modifying the variable
|
||||
values."
|
||||
(load-file "~/.emacs.local/barak-theme.el")
|
||||
;; This setq-default sexp is an exhaustive list of all the supported
|
||||
;; spacemacs settings.
|
||||
(setq-default
|
||||
|
|
@ -104,7 +104,7 @@ values."
|
|||
;; leuven
|
||||
;; monokai
|
||||
;; zenburn)
|
||||
dotspacemacs-themes '(barak)
|
||||
;;dotspacemacs-themes '(barak)
|
||||
;; If non nil the cursor color matches the state color.
|
||||
dotspacemacs-colorize-cursor-according-to-state t
|
||||
;; Default font. `powerline-scale' allows to quickly tweak the mode-line
|
||||
|
|
@ -229,8 +229,10 @@ user code."
|
|||
"Configuration function for user code.
|
||||
This function is called at the very end of Spacemacs initialization after
|
||||
layers configuration. You are free to put any user code."
|
||||
(load-file "~/.emacs.local/barak-theme.el")
|
||||
(load-theme 'barak t)
|
||||
(fset 'xterm-color-unfontify-region 'font-lock-default-unfontify-region)
|
||||
(setq dotspacemacs-additional-packages '(barak-theme))
|
||||
;(setq dotspacemacs-additional-packages '(barak-theme))
|
||||
(defun kill-buffer-and-its-windows (buffer)
|
||||
"Kill BUFFER and delete its windows. Default is `current-buffer'.
|
||||
BUFFER may be either a buffer or its name (a string)."
|
||||
|
|
@ -313,8 +315,8 @@ BUFFER may be either a buffer or its name (a string)."
|
|||
|
||||
(add-hook 'window-setup-hook 'on-after-init)
|
||||
|
||||
(set-frame-parameter (selected-frame) 'alpha '(85 85))
|
||||
(add-to-list 'default-frame-alist '(alpha 85 85))
|
||||
;(set-frame-parameter (selected-frame) 'alpha '(85 85))
|
||||
;(add-to-list 'default-frame-alist '(alpha 85 85))
|
||||
|
||||
(setq diff-hl-side 'left)
|
||||
(defun cleanup-org-tables ()
|
||||
|
|
@ -407,10 +409,11 @@ BUFFER may be either a buffer or its name (a string)."
|
|||
;; 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.
|
||||
'(evil-want-Y-yank-to-eol t)
|
||||
'(org-support-shift-select (quote always))
|
||||
'(package-selected-packages
|
||||
(quote
|
||||
(powerline spinner org alert log4e gntp markdown-mode hydra parent-mode projectile request go-guru gitignore-mode fringe-helper git-gutter+ git-gutter flycheck pkg-info epl flx magit magit-popup git-commit with-editor smartparens iedit anzu evil goto-chg undo-tree highlight diminish pos-tip go-mode company bind-map bind-key yasnippet packed anaconda-mode pythonic f dash s helm avy helm-core async auto-complete popup package-build yapfify uuidgen py-isort ox-gfm org-projectile org-download mu4e-maildirs-extension mu4e-alert ht live-py-mode link-hint hide-comnt git-link eyebrowse evil-visual-mark-mode evil-unimpaired evil-ediff eshell-z dumb-jump darkokai-theme column-enforce-mode company-auctex auctex-latexmk auctex zonokai-theme zenburn-theme zen-and-art-theme yaml-mode xterm-color ws-butler window-numbering which-key volatile-highlights vi-tilde-fringe use-package underwater-theme ujelly-theme twilight-theme twilight-bright-theme twilight-anti-bright-theme tronesque-theme toxi-theme toc-org tao-theme tangotango-theme tango-plus-theme tango-2-theme systemd sunny-day-theme sublime-themes subatomic256-theme subatomic-theme stekene-theme spacemacs-theme spaceline spacegray-theme soothe-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme smooth-scrolling smeargle shell-pop seti-theme reverse-theme restart-emacs railscasts-theme quelpa pyvenv pytest pyenv-mode py-yapf purple-haze-theme protobuf-mode professional-theme popwin planet-theme pip-requirements phoenix-dark-pink-theme phoenix-dark-mono-theme persp-mode pcre2el pastels-on-dark-theme paradox page-break-lines orgit organic-green-theme org-repo-todo org-present org-pomodoro org-plus-contrib org-bullets open-junk-file omtose-phellack-theme oldlace-theme occidental-theme obsidian-theme noctilux-theme niflheim-theme neotree naquadah-theme mustang-theme multi-term move-text monokai-theme monochrome-theme molokai-theme moe-theme mmm-mode minimal-theme material-theme markdown-toc majapahit-theme magit-gitflow macrostep lush-theme lorem-ipsum linum-relative light-soap-theme leuven-theme jbeans-theme jazz-theme ir-black-theme inkpot-theme info+ indent-guide ido-vertical-mode hy-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation heroku-theme hemisu-theme help-fns+ helm-themes helm-swoop helm-pydoc helm-projectile helm-mode-manager helm-make helm-gitignore helm-flx helm-descbinds helm-company helm-c-yasnippet helm-ag hc-zenburn-theme gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme google-translate golden-ratio go-eldoc gnuplot gitconfig-mode gitattributes-mode git-timemachine git-messenger git-gutter-fringe git-gutter-fringe+ gh-md gandalf-theme flycheck-pos-tip flx-ido flatui-theme flatland-theme firebelly-theme fill-column-indicator farmhouse-theme fancy-battery expand-region exec-path-from-shell evil-visualstar evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-args evil-anzu eval-sexp-fu espresso-theme eshell-prompt-extras esh-help elisp-slime-nav dracula-theme django-theme diff-hl define-word darktooth-theme darkmine-theme darkburn-theme dakrone-theme cython-mode cyberpunk-theme company-statistics company-quickhelp company-go company-anaconda colorsarenice-theme color-theme-sanityinc-tomorrow color-theme-sanityinc-solarized clues-theme clean-aindent-mode cherry-blossom-theme busybee-theme buffer-move bubbleberry-theme bracketed-paste birds-of-paradise-plus-theme badwolf-theme auto-yasnippet auto-highlight-symbol auto-compile apropospriate-theme anti-zenburn-theme ample-zen-theme ample-theme alect-themes aggressive-indent afternoon-theme adaptive-wrap ace-window ace-link ace-jump-helm-line ac-ispell)))
|
||||
(idris-mode prop-menu winum solarized-theme org-category-capture madhat2r-theme dash-functional fuzzy autothemer powerline spinner org alert log4e gntp markdown-mode hydra parent-mode projectile request go-guru gitignore-mode fringe-helper git-gutter+ git-gutter flycheck pkg-info epl flx magit magit-popup git-commit with-editor smartparens iedit anzu evil goto-chg undo-tree highlight diminish pos-tip go-mode company bind-map bind-key yasnippet packed anaconda-mode pythonic f dash s helm avy helm-core async auto-complete popup package-build yapfify uuidgen py-isort ox-gfm org-projectile org-download mu4e-maildirs-extension mu4e-alert ht live-py-mode link-hint hide-comnt git-link eyebrowse evil-visual-mark-mode evil-unimpaired evil-ediff eshell-z dumb-jump darkokai-theme column-enforce-mode company-auctex auctex-latexmk auctex zonokai-theme zenburn-theme zen-and-art-theme yaml-mode xterm-color ws-butler window-numbering which-key volatile-highlights vi-tilde-fringe use-package underwater-theme ujelly-theme twilight-theme twilight-bright-theme twilight-anti-bright-theme tronesque-theme toxi-theme toc-org tao-theme tangotango-theme tango-plus-theme tango-2-theme systemd sunny-day-theme sublime-themes subatomic256-theme subatomic-theme stekene-theme spacemacs-theme spaceline spacegray-theme soothe-theme soft-stone-theme soft-morning-theme soft-charcoal-theme smyx-theme smooth-scrolling smeargle shell-pop seti-theme reverse-theme restart-emacs railscasts-theme quelpa pyvenv pytest pyenv-mode py-yapf purple-haze-theme protobuf-mode professional-theme popwin planet-theme pip-requirements phoenix-dark-pink-theme phoenix-dark-mono-theme persp-mode pcre2el pastels-on-dark-theme paradox page-break-lines orgit organic-green-theme org-repo-todo org-present org-pomodoro org-plus-contrib org-bullets open-junk-file omtose-phellack-theme oldlace-theme occidental-theme obsidian-theme noctilux-theme niflheim-theme neotree naquadah-theme mustang-theme multi-term move-text monokai-theme monochrome-theme molokai-theme moe-theme mmm-mode minimal-theme material-theme markdown-toc majapahit-theme magit-gitflow macrostep lush-theme lorem-ipsum linum-relative light-soap-theme leuven-theme jbeans-theme jazz-theme ir-black-theme inkpot-theme info+ indent-guide ido-vertical-mode hy-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation heroku-theme hemisu-theme help-fns+ helm-themes helm-swoop helm-pydoc helm-projectile helm-mode-manager helm-make helm-gitignore helm-flx helm-descbinds helm-company helm-c-yasnippet helm-ag hc-zenburn-theme gruvbox-theme gruber-darker-theme grandshell-theme gotham-theme google-translate golden-ratio go-eldoc gnuplot gitconfig-mode gitattributes-mode git-timemachine git-messenger git-gutter-fringe git-gutter-fringe+ gh-md gandalf-theme flycheck-pos-tip flx-ido flatui-theme flatland-theme firebelly-theme fill-column-indicator farmhouse-theme fancy-battery expand-region exec-path-from-shell evil-visualstar evil-tutor evil-surround evil-search-highlight-persist evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-args evil-anzu eval-sexp-fu espresso-theme eshell-prompt-extras esh-help elisp-slime-nav dracula-theme django-theme diff-hl define-word darktooth-theme darkmine-theme darkburn-theme dakrone-theme cython-mode cyberpunk-theme company-statistics company-quickhelp company-go company-anaconda colorsarenice-theme color-theme-sanityinc-tomorrow color-theme-sanityinc-solarized clues-theme clean-aindent-mode cherry-blossom-theme busybee-theme buffer-move bubbleberry-theme bracketed-paste birds-of-paradise-plus-theme badwolf-theme auto-yasnippet auto-highlight-symbol auto-compile apropospriate-theme anti-zenburn-theme ample-zen-theme ample-theme alect-themes aggressive-indent afternoon-theme adaptive-wrap ace-window ace-link ace-jump-helm-line ac-ispell)))
|
||||
'(paradox-github-token t)
|
||||
'(safe-local-variable-values
|
||||
(quote
|
||||
|
|
@ -426,8 +429,4 @@ BUFFER may be either a buffer or its name (a string)."
|
|||
;; 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.
|
||||
'(company-tooltip-common ((t (:inherit company-tooltip :weight bold :underline nil))))
|
||||
'(company-tooltip-common-selection ((t (:inherit company-tooltip-selection :weight bold :underline nil))))
|
||||
'(match ((t (:weight bold))))
|
||||
'(show-paren-match ((t (:foreground "chartreuse"))))
|
||||
)
|
||||
|
|
|
|||
|
|
@ -89,6 +89,10 @@ augroup go
|
|||
autocmd FileType go nmap gd <Plug>(go-def)
|
||||
augroup END
|
||||
|
||||
augroup idris
|
||||
autocmd FileType idris nmap <LocalLeader>a a?hole<Esc><LocalLeader>t
|
||||
augroup end
|
||||
|
||||
autocmd FileType go let b:auto_trim_whitespace=1
|
||||
autocmd FileType cpp let b:auto_trim_whitespace=1
|
||||
autocmd FileType perl let b:auto_trim_whitespace=1
|
||||
|
|
@ -97,4 +101,6 @@ autocmd FileType javascript let b:auto_trim_whitespace=1
|
|||
autocmd FileType python let b:auto_trim_whitespace=1
|
||||
autocmd FileType proto let b:auto_trim_whitespace=1
|
||||
autocmd FileType hy let b:auto_trim_whitespace=1
|
||||
autocmd FileType idris let b:auto_trim_whitespace=1
|
||||
autocmd FileType java let b:auto_trim_whitespace=1
|
||||
|
||||
|
|
|
|||
1
.vimrc
1
.vimrc
|
|
@ -136,6 +136,7 @@ Plug 'Shougo/denite.nvim'
|
|||
"Plug 'HerringtonDarkholme/yats.vim'
|
||||
Plug 'tpope/vim-fireplace'
|
||||
Plug 'junegunn/vim-easy-align'
|
||||
Plug 'idris-hackers/idris-vim'
|
||||
|
||||
call plug#end()
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue