diff --git a/.config/terminator/config b/.config/terminator/config index d921085..8d5d1ed 100644 --- a/.config/terminator/config +++ b/.config/terminator/config @@ -53,6 +53,7 @@ [[Medium]] background_darkness = 0.8 background_type = transparent + cursor_color = "#ffffff" font = Droid Sans Mono Dotted 14 foreground_color = "#ffffff" scrollback_infinite = True diff --git a/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml b/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml index 5d97713..657bbfc 100644 --- a/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml +++ b/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml @@ -50,6 +50,18 @@ + + + + + + + + + + + + diff --git a/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml index 4f25354..84fddcc 100644 --- a/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ b/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -10,15 +10,13 @@ - - - - - - - + + + + + @@ -38,7 +36,6 @@ - @@ -83,17 +80,19 @@ + - - - - - - - + + + + + + + + diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 289257d..8fe3870 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,6 +1,6 @@ ;;; init.el --- Spacemacs Initialization File ;; -;; Copyright (c) 2012-2016 Sylvain Benner & Contributors +;; Copyright (c) 2012-2017 Sylvain Benner & Contributors ;; ;; Author: Sylvain Benner ;; URL: https://github.com/syl20bnr/spacemacs @@ -16,20 +16,19 @@ ;; lower value in your dotfile (function `dotspacemacs/user-config') (setq gc-cons-threshold 100000000) -(defconst spacemacs-version "0.200.3" "Spacemacs version.") +(defconst spacemacs-version "0.200.9" "Spacemacs version.") (defconst spacemacs-emacs-min-version "24.4" "Minimal version of Emacs.") (if (not (version<= spacemacs-emacs-min-version emacs-version)) - (message (concat "Your version of Emacs (%s) is too old. " - "Spacemacs requires Emacs version %s or above.") - emacs-version spacemacs-emacs-min-version) + (error (concat "Your version of Emacs (%s) is too old. " + "Spacemacs requires Emacs version %s or above.") + emacs-version spacemacs-emacs-min-version) (load-file (concat (file-name-directory load-file-name) "core/core-load-paths.el")) (require 'core-spacemacs) (spacemacs/init) - (spacemacs/maybe-install-dotfile) (configuration-layer/sync) - (spacemacs-buffer/display-info-box) + (spacemacs-buffer/display-startup-note) (spacemacs/setup-startup-hook) (require 'server) (unless (server-running-p) (server-start))) diff --git a/.spacemacs b/.spacemacs index 283c1f7..a9ac93f 100644 --- a/.spacemacs +++ b/.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")))) ) diff --git a/.vim/filetype.vim b/.vim/filetype.vim index 4f42c32..585ea4f 100644 --- a/.vim/filetype.vim +++ b/.vim/filetype.vim @@ -89,6 +89,10 @@ augroup go autocmd FileType go nmap gd (go-def) augroup END +augroup idris + autocmd FileType idris nmap a a?holet +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 diff --git a/.vimrc b/.vimrc index e829aa8..4a939f2 100644 --- a/.vimrc +++ b/.vimrc @@ -98,6 +98,7 @@ Plug 'Shougo/deoplete.nvim' Plug 'zchee/deoplete-go', {'build': {'unix': 'make'}} Plug 'zchee/deoplete-jedi' Plug 'b4winckler/vim-angry' +Plug 'clojure-vim/async-clj-omni' Plug 'tristen/vim-sparkup' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' @@ -136,6 +137,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() @@ -443,6 +445,10 @@ au FileType go nmap c :GoCoverlayT au FileType coq nmap a :CoqToCursor au FileType coq imap a :CoqToCursor +au FileType clojure let g:deoplete#keyword_patterns = {} +au FileType clojure let g:deoplete#keyword_patterns.clojure = '[\w!$%&*+/:<=>?@\^_~\-\.#]*' + + " Make the Quickfix window respond well to commands (for instance, q to close, " Enter to select, etc). In tandem with the above. augroup QFixToggle diff --git a/.xinitrc b/.xinitrc index f14b088..b3cab50 100755 --- a/.xinitrc +++ b/.xinitrc @@ -16,11 +16,11 @@ xfsettingsd & xrdb -merge .Xdefaults & #gnome-settings-daemon & -xscreensaver -no-splash & +#xscreensaver -no-splash & #kupfer --no-splash & rofi -key-run control-space -fuzzy -terminal run_terminal & -nm-applet & -gnome-sound-applet & +#nm-applet & +#gnome-sound-applet & remmina -i & #setxkbmap -option ctrl:nocaps & xmodmap ~/.Xmodmap & @@ -29,8 +29,8 @@ xmodmap ~/.Xmodmap & # Running a really minimal arch system? This helps: /usr/lib/xfce4/notifyd/xfce4-notifyd & -pulseaudio --start & -blueman-applet & +#pulseaudio --start & +#blueman-applet & #wicd-gtk --tray & if [ -f ~/.xrandrrc ]; then @@ -39,9 +39,9 @@ fi ~/.fehbg & -if command -v compton &>/dev/null; then - compton -b --config ~/.compton.conf & -fi +#if command -v compton &>/dev/null; then + #compton -b --config ~/.compton.conf & +#fi #exec awesome exec i3 #exec startxfce4