From df48f59f16f071b86db20cba5f147903dc44a529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jure=20Podgor=C5=A1ek?= Date: Wed, 28 Feb 2018 23:32:33 +0100 Subject: [PATCH] Updates, added termite terminal --- .Xresources | 7 +++--- .config/i3/config | 7 ++++-- .config/termite/config | 51 ++++++++++++++++++++++++++++++++++++++++++ .spacemacs | 13 +++++------ .vimrc | 1 + .zshrc | 2 +- 6 files changed, 68 insertions(+), 13 deletions(-) create mode 100644 .config/termite/config diff --git a/.Xresources b/.Xresources index 35f3ca1..4290c5c 100644 --- a/.Xresources +++ b/.Xresources @@ -56,8 +56,9 @@ Xft.rgba: rgb !!! Urxvt options !!! ! font -URxvt*font: xft:Fira Mono Medium:size=10 -URxvt*letterSpace: -1 +URxvt*font: xft:Fira Mono Medium:size=10,xft:Noto Emoji:size=10 +! Fix letter spacing; this is not needed in patched urxvt +! URxvt*letterSpace: -1 ! hide scrollbar URxvt*scrollBar: false ! do not scroll with output @@ -71,7 +72,7 @@ URxvt*secondaryScreen: 1 URxvt*secondaryScroll: 0 URxvt*secondaryWheel: 1 ! open URLs -URxvt*perl-ext-common: default,url-select,keyboard-select,tabbed,resize-font +URxvt*perl-ext-common: default,url-select,keyboard-select URxvt.keysym.M-u: perl:url-select:select_next URxvt.url-select.launcher: /usr/bin/xdg-open URxvt.url-select.underline: true diff --git a/.config/i3/config b/.config/i3/config index 5c0ccc1..f9135e7 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -140,7 +140,6 @@ bindsym Mod1+Shift+j move workspace to output left # workspace bindings assign [class="Firefox"] $w2 -assign [class="Chromium"] $w2 assign [class="Gnote"] $w9 assign [class="Slack"] $w4 assign [class="Riot"] $w4 @@ -234,6 +233,9 @@ exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Tapp # Touchpad natural scrolling exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Natural Scrolling Enabled" 1 +# Cursor acceleration +exec --no-startup-id xinput set-prop "SynPS/2 Synaptics TouchPad" "libinput Accel Speed" 0.456 + # Autolock exec --no-startup-id xautolock -time 10 -locker 'i3lock-wrapper' & @@ -286,7 +288,8 @@ bindsym XF86AudioLowerVolume exec "$vol_down_cmd && $vol_sig_cmd" bindsym XF86AudioMute exec "pamixer -t && $vol_sig_cmd" # start a terminal -bindsym $mod+Return exec i3-sensible-terminal +#bindsym $mod+Return exec i3-sensible-terminal +bindsym $mod+Return exec termite # kill focused window bindsym $mod+Shift+q kill diff --git a/.config/termite/config b/.config/termite/config new file mode 100644 index 0000000..a8f5030 --- /dev/null +++ b/.config/termite/config @@ -0,0 +1,51 @@ +[options] +font = Fira Mono Medium 10 + +[colors] +#!!############################################## +#! Solarized color scheme for the X Window System +#! +#! http://ethanschoonover.com/solarized +#!!############################################## +# +#!!16/8 HEX SOLARIZED TERMCOL XTERM/HEX L*A*B RGB HSB +#!!---- ------- --------- ------- ----------- ---------- ----------- ----------- +#!! 0/4 #073642 base02 black 235 #262626 20 -12 -12 7 54 66 192 90 26 +#!! 1/1 #dc322f red red 160 #d70000 50 65 45 220 50 47 1 79 86 +#!! 2/2 #859900 green green 64 #5f8700 60 -20 65 133 153 0 68 100 60 +#!! 3/3 #b58900 yellow yellow 136 #af8700 60 10 65 181 137 0 45 100 71 +#!! 4/4 #268bd2 blue blue 33 #0087ff 55 -10 -45 38 139 210 205 82 82 +#!! 5/5 #d33682 magenta magenta 125 #af005f 50 65 -05 211 54 130 331 74 83 +#!! 6/6 #2aa198 cyan cyan 37 #00afaf 60 -35 -05 42 161 152 175 74 63 +#!! 7/7 #eee8d5 base2 white 254 #e4e4e4 92 -00 10 238 232 213 44 11 93 +#!! 8/4 #002b36 base03 brblack 234 #1c1c1c 15 -12 -12 0 43 54 193 100 21 +#!! 9/3 #cb4b16 orange brred 166 #d75f00 50 50 55 203 75 22 18 89 80 +#!!10/7 #586e75 base01 brgreen 240 #585858 45 -07 -07 88 110 117 194 25 46 +#!!11/7 #657b83 base00 bryellow 241 #626262 50 -07 -07 101 123 131 195 23 51 +#!!12/6 #839496 base0 brblue 244 #808080 60 -06 -03 131 148 150 186 13 59 +#!!13/5 #6c71c4 violet brmagenta 61 #5f5faf 50 15 -45 108 113 196 237 45 77 +#!!14/4 #93a1a1 base1 brcyan 245 #8a8a8a 65 -05 -02 147 161 161 180 9 63 +#!!15/7 #fdf6e3 base3 brwhite 230 #ffffd7 97 00 10 253 246 227 44 10 99 + +foreground = #839496 +#background = #002b36 +background = rgba(0, 43, 54, 0.9) + +# Solarized +# --------- +color0 = #073642 +color1 = #dc322f +color2 = #859900 +color3 = #b58900 +color4 = #268bd2 +color5 = #d33682 +color6 = #2aa198 +color7 = #eee8d5 +color8 = #002b36 +color9 = #cb4b16 +color10 = #586e75 +color11 = #657b83 +color12 = #839496 +color13 = #6c71c4 +color14 = #93a1a1 +color15 = #fdf6e3 diff --git a/.spacemacs b/.spacemacs index 0872e3b..1e36980 100644 --- a/.spacemacs +++ b/.spacemacs @@ -527,8 +527,12 @@ before packages are loaded." (setq js-indent-level 4) (setq js2-indent-level 4) + ;; js2 globals + (setq js2-global-externs '("require" "process")) + ;; Web mode indent level - (setq web-mode-markup-indent-offset 2) + (setq web-mode-markup-indent-offset 4) + (setq sgml-basic-offset 4) ) (defun dotspacemacs/emacs-custom-settings () @@ -543,12 +547,7 @@ This function is called at the very end of Spacemacs initialization." ;; If there is more than one, they won't work right. '(package-selected-packages (quote - (web-mode paradox orgit nameless company counsel flycheck helm helm-core magit magit-popup ghub with-editor cider simple-httpd ivy zenburn-theme yasnippet-snippets yapfify ws-butler winum which-key wgrep web-beautify volatile-highlights vi-tilde-fringe uuidgen use-package toc-org tao-theme tagedit symon swiper suscolors-theme string-inflection spinner spaceline-all-the-icons solarized-theme smex smeargle slim-mode scss-mode sayid sass-mode rudel rjsx-mode restart-emacs request rainbow-delimiters queue pyvenv pytest pyenv-mode py-isort pug-mode popwin pippel pip-requirements phpunit phpcbf php-extras php-auto-yasnippets persp-mode pcre2el password-generator overseer org-projectile org-present org-pomodoro org-mime org-download org-bullets org-brain open-junk-file neotree move-text mmm-mode markdown-toc magit-gitflow macrostep lorem-ipsum livid-mode live-py-mode linum-relative link-hint less-css-mode json-mode js2-refactor js-doc ivy-purpose ivy-hydra indent-guide importmagic impatient-mode hy-mode hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-make gruvbox-theme google-translate golden-ratio gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy font-lock+ flycheck-pos-tip flx-ido floobits 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-org evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu emmet-mode elisp-slime-nav editorconfig dumb-jump drupal-mode diminish diff-hl define-word dakrone-light-theme cython-mode counsel-projectile counsel-css company-web company-tern company-statistics company-php company-auctex company-anaconda column-enforce-mode coffee-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode cider-eval-sexp-fu centered-cursor-mode browse-at-remote auto-yasnippet auto-highlight-symbol auto-compile auctex-latexmk all-the-icons-dired aggressive-indent adaptive-wrap ace-window ace-link ac-ispell))) - '(safe-local-variable-values - (quote - ((cider-cljs-lein-repl . "(do (user/go) (user/cljs-repl))") - (cider-refresh-after-fn . "reloaded.repl/resume") - (cider-refresh-before-fn . "reloaded.repl/suspend"))))) + (zenburn-theme yasnippet-snippets web-mode pyvenv overseer org-mime org-brain dumb-jump counsel-projectile counsel-css counsel swiper ace-link ac-php-core company smartparens flycheck helm helm-core ivy magit ghub yasnippet php-mode cider which-key exec-path-from-shell evil org-plus-contrib yapfify xcscope ws-butler winum wgrep web-beautify volatile-highlights vi-tilde-fringe uuidgen use-package undo-tree toc-org tao-theme tagedit symon suscolors-theme string-inflection spaceline-all-the-icons solarized-theme smex smeargle slim-mode scss-mode sayid sass-mode rudel rjsx-mode restart-emacs request rainbow-delimiters queue pytest pyenv-mode py-isort pug-mode popwin pippel pipenv pip-requirements phpunit phpcbf php-extras php-auto-yasnippets persp-mode pcre2el password-generator paradox orgit org-projectile org-present org-pomodoro org-download org-bullets open-junk-file neotree nameless move-text mmm-mode markdown-toc magit-gitflow macrostep lorem-ipsum livid-mode live-py-mode linum-relative link-hint less-css-mode json-mode js2-refactor js-doc ivy-xref ivy-purpose ivy-hydra indent-guide importmagic impatient-mode hy-mode hungry-delete hl-todo highlight-parentheses highlight-numbers highlight-indentation helm-make gruvbox-theme goto-chg google-translate golden-ratio gnuplot gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md geiser fuzzy font-lock+ flycheck-pos-tip flx-ido floobits fill-column-indicator fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-surround evil-search-highlight-persist evil-org evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-magit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-exchange evil-escape evil-ediff evil-cleverparens evil-args evil-anzu emmet-mode elisp-slime-nav editorconfig drupal-mode diminish diff-hl define-word dakrone-light-theme cython-mode company-web company-tern company-statistics company-php company-auctex company-anaconda column-enforce-mode coffee-mode clojure-snippets clojure-cheatsheet clj-refactor clean-aindent-mode cider-eval-sexp-fu centered-cursor-mode browse-at-remote auto-yasnippet auto-highlight-symbol auto-compile auctex-latexmk all-the-icons-dired aggressive-indent adaptive-wrap ace-window 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/.vimrc b/.vimrc index ae1f3dc..3ac9e46 100644 --- a/.vimrc +++ b/.vimrc @@ -90,3 +90,4 @@ if !exists("g:vdebug_options") endif let g:vdebug_options["port"] = 9001 let g:vdebug_options["idekey"] = "xdebug" + diff --git a/.zshrc b/.zshrc index a48b26e..f6c3fdc 100644 --- a/.zshrc +++ b/.zshrc @@ -54,7 +54,7 @@ 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 llc="sshfs 10.0.0.203:/Users/g1smo/Projects/LickList ~/ll -oauto_cache,reconnect,no_readahead -o Ciphers=arcfour -o Compression=no" alias llc="sudo mount -t nfs -o noacl,nocto,rsize=32768,wsize=32768,noatime,nodiratime 10.0.0.203:/Users/g1smo/Projects/LickList ~/ll" -alias llcc="sudo mount -t nfs -o noacl,nocto,rsize=32768,wsize=32768,noatime,nodiratime 192.168.8.103:/Users/g1smo/Projects/LickList ~/ll" +alias llcc="sudo mount -t nfs -o noacl,nocto,rsize=32768,wsize=32768,noatime,nodiratime 192.168.8.105:/Users/g1smo/Projects/LickList ~/ll" alias lld="sudo umount -l ~/ll" # Firefox scaling!