diff --git a/.spacemacs b/.spacemacs index d003443..fdd3308 100644 --- a/.spacemacs +++ b/.spacemacs @@ -31,6 +31,7 @@ values." ;; List of configuration layers to load. dotspacemacs-configuration-layers '( + yaml ;; ---------------------------------------------------------------- ;; Example of useful layers you may want to use right away. ;; Uncomment some layer names and press (Vim style) or @@ -52,6 +53,11 @@ values." html javascript php + elm + vimscript + + ;; Disable flychecker + (syntax-checking :variables syntax-checking-enable-by-default nil) ) ;; List of additional packages that will be installed without being ;; wrapped in a layer. If you need some configuration for these @@ -62,10 +68,11 @@ values." ;;sublimity all-the-icons all-the-icons-dired - color-theme-sanityinc-tomorrow - underwater-theme - ample-theme yascroll + solarized-theme + color-theme-solarized + color-theme-sanityinc-solarized + zenburn-theme ) ;; A list of packages that cannot be updated. dotspacemacs-frozen-packages '() @@ -139,12 +146,11 @@ values." ;; Press T n to cycle to the next theme in the list (works great ;; with 2 themes variants, one dark and one light) dotspacemacs-themes '( - solarized-dark - spacemacs-dark - ample-light - underwater - sanityinc-tomorrow-day - spacemacs-light + ;;zenburn + solarized-light + ;;solarized-dark + ;;sanityinc-solarized-light + ;;spacemacs-dark ) ;; If non nil the cursor color matches the state color in GUI Emacs. dotspacemacs-colorize-cursor-according-to-state t @@ -152,9 +158,12 @@ values." ;; quickly tweak the mode-line size to make separators look not too crappy. dotspacemacs-default-font '( ;;"Source Code Pro" - "Fira Code Retina" - :size 22 - :weight normal + ;;"Fira Code Retina" + "Fira Mono" + :size 24 + ;;:weight semibold + :weight semibold + :style medium :width normal :powerline-scale 1.0) ;; The leader key @@ -349,6 +358,7 @@ you should place your code here." ;; Scrollbar (use-package yascroll) (global-yascroll-bar-mode t) + (setq yascroll:delay-to-hide nil) ) ;; Do not write anything past this comment. This is where Emacs will @@ -358,88 +368,13 @@ you should place your code here." ;; 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. - '(ansi-color-faces-vector - [default bold shadow italic underline bold bold-italic bold]) - '(ansi-color-names-vector - ["#0a0814" "#f2241f" "#67b11d" "#b1951d" "#4f97d7" "#a31db1" "#28def0" "#b2b2b2"]) - '(compilation-message-face (quote default)) - '(cua-global-mark-cursor-color "#2aa198") - '(cua-normal-cursor-color "#839496") - '(cua-overwrite-cursor-color "#b58900") - '(cua-read-only-cursor-color "#859900") - '(custom-enabled-themes (quote (sanityinc-solarized-dark))) '(custom-safe-themes (quote - ("4aee8551b53a43a883cb0b7f3255d6859d766b6c5e14bcb01bed572fcbef4328" "4cf3221feff536e2b3385209e9b9dc4c2e0818a69a1cdb4b522756bcdf4e00a4" "bffa9739ce0752a37d9b1eee78fc00ba159748f50dc328af4be661484848e476" "fa2b58bb98b62c3b8cf3b6f02f058ef7827a8e497125de0254f56e373abee088" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "3c98d13ae2fc7aa59f05c494e8a15664ff5fe5db5256663a907272869c4130dd" "71182be392aa922f3c05e70087a40805ef2d969b4f8f965dfc0fc3c2f5df6168" "19ba41b6dc0b5dd34e1b8628ad7ae47deb19f968fe8c31853d64ea8c4df252b8" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" default))) + ("bffa9739ce0752a37d9b1eee78fc00ba159748f50dc328af4be661484848e476" "4cf3221feff536e2b3385209e9b9dc4c2e0818a69a1cdb4b522756bcdf4e00a4" "d677ef584c6dfc0697901a44b885cc18e206f05114c8a3b7fde674fce6180879" "a8245b7cc985a0610d71f9852e9f2767ad1b852c2bdea6f4aadc12cce9c4d6d0" default))) '(evil-want-Y-yank-to-eol nil) - '(fci-rule-color "#eee8d5" t) - '(global-yascroll-bar-mode t) - '(highlight-changes-colors (quote ("#d33682" "#6c71c4"))) - '(highlight-symbol-colors - (--map - (solarized-color-blend it "#002b36" 0.25) - (quote - ("#b58900" "#2aa198" "#dc322f" "#6c71c4" "#859900" "#cb4b16" "#268bd2")))) - '(highlight-symbol-foreground-color "#93a1a1") - '(highlight-tail-colors - (quote - (("#073642" . 0) - ("#546E00" . 20) - ("#00736F" . 30) - ("#00629D" . 50) - ("#7B6000" . 60) - ("#8B2C02" . 70) - ("#93115C" . 85) - ("#073642" . 100)))) - '(hl-bg-colors - (quote - ("#7B6000" "#8B2C02" "#990A1B" "#93115C" "#3F4D91" "#00629D" "#00736F" "#546E00"))) - '(hl-fg-colors - (quote - ("#002b36" "#002b36" "#002b36" "#002b36" "#002b36" "#002b36" "#002b36" "#002b36"))) - '(magit-diff-use-overlays nil) - '(nrepl-message-colors - (quote - ("#dc322f" "#cb4b16" "#b58900" "#546E00" "#B4C342" "#00629D" "#2aa198" "#d33682" "#6c71c4"))) '(package-selected-packages (quote - (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-foreground-color "#93a1a1") - '(smartrep-mode-line-active-bg (solarized-color-blend "#859900" "#073642" 0.2)) - '(term-default-bg-color "#002b36") - '(term-default-fg-color "#839496") - '(vc-annotate-background nil) - '(vc-annotate-background-mode nil) - '(vc-annotate-color-map - (quote - ((20 . "#dc322f") - (40 . "#cb4b16") - (60 . "#b58900") - (80 . "#859900") - (100 . "#2aa198") - (120 . "#268bd2") - (140 . "#d33682") - (160 . "#6c71c4") - (180 . "#dc322f") - (200 . "#cb4b16") - (220 . "#b58900") - (240 . "#859900") - (260 . "#2aa198") - (280 . "#268bd2") - (300 . "#d33682") - (320 . "#6c71c4") - (340 . "#dc322f") - (360 . "#cb4b16")))) - '(vc-annotate-very-old-color nil) - '(weechat-color-list - (quote - (unspecified "#002b36" "#073642" "#990A1B" "#dc322f" "#546E00" "#859900" "#7B6000" "#b58900" "#00629D" "#268bd2" "#93115C" "#d33682" "#00736F" "#2aa198" "#839496" "#657b83"))) - '(xterm-color-names - ["#073642" "#dc322f" "#859900" "#b58900" "#268bd2" "#d33682" "#2aa198" "#eee8d5"]) - '(xterm-color-names-bright - ["#002b36" "#cb4b16" "#586e75" "#657b83" "#839496" "#6c71c4" "#93a1a1" "#fdf6e3"]) - '(yascroll:delay-to-hide nil)) + (tern request helm-core markdown-mode magit-popup git-commit yasnippet color-theme-solarized color-theme color-theme-sanityinc-solarized emacs-color-theme-solarized-theme bind-key all-the-icons highlight helm magit yaml-mode yascroll ws-butler window-numbering which-key web-mode web-beautify volatile-highlights vimrc-mode vi-tilde-fringe uuidgen use-package toc-org tagedit spacemacs-theme spaceline solarized-theme smeargle slim-mode scss-mode sass-mode restart-emacs rainbow-delimiters quelpa pug-mode popwin phpunit phpcbf php-extras php-auto-yasnippets persp-mode pcre2el paradox orgit org-projectile org-present org-pomodoro org-plus-contrib org-download org-bullets open-junk-file neotree move-text mmm-mode markdown-toc magit-gitflow macrostep lorem-ipsum livid-mode linum-relative link-hint less-css-mode json-mode js2-refactor js-doc info+ indent-guide ido-vertical-mode hungry-delete htmlize hl-todo highlight-parentheses highlight-numbers highlight-indentation hide-comnt help-fns+ helm-themes helm-swoop helm-projectile helm-mode-manager helm-make helm-gitignore helm-flx helm-descbinds helm-css-scss helm-company helm-c-yasnippet helm-ag google-translate golden-ratio gnuplot gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link gh-md flycheck-pos-tip flycheck-elm flx-ido fill-column-indicator fancy-battery eyebrowse expand-region exec-path-from-shell evil-visualstar evil-visual-mark-mode evil-unimpaired 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-ediff evil-args evil-anzu eval-sexp-fu emmet-mode elm-mode elisp-slime-nav editorconfig dumb-jump drupal-mode define-word dactyl-mode company-web company-tern company-statistics column-enforce-mode coffee-mode clean-aindent-mode auto-yasnippet auto-highlight-symbol auto-compile all-the-icons-dired aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line ac-ispell)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/.zshrc b/.zshrc index bfc1b6b..83f63e5 100644 --- a/.zshrc +++ b/.zshrc @@ -66,8 +66,8 @@ alias sf="find ~/.mozilla/firefox -name \"prefs.js\" -exec sed -ri 's/(devPixels 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 wqa="cp /home/g1smo/Sredstva/wandera_qa.yml /home/g1smo/Projects/wandera/app/config/parameters.yml" +alias wdev="cp /home/g1smo/Projects/w_params_dev.yml /home/g1smo/Projects/wandera/app/config/parameters.yml" +alias wqa="cp /home/g1smo/Projects/w_params_qa.yml /home/g1smo/Projects/wandera/app/config/parameters.yml" # Reverse search shortcut bindkey '^R' history-incremental-pattern-search-backward @@ -83,11 +83,10 @@ export PHP_INI_SCAN_DIR="/etc/php56/conf.d/" # NVM export NVM_DIR="/home/g1smo/.nvm" -[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" +#[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" alias invm="source /usr/share/nvm/init-nvm.sh" alias sc="chromium --force-device-scale-factor=1" # GTK interface scale export GDK_SCALE=1 export GDK_DPI_SCALE=0.6 -