From 27632c523a486714f8bd9d2f2e806bfafab6471b Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 23 Dec 2016 09:46:08 +0100 Subject: [PATCH] misc changes from pgh --- commonshrc | 2 ++ config/qutebrowser/keys.conf | 6 ++--- spacemacs | 48 +++++++++++------------------------- 3 files changed, 20 insertions(+), 36 deletions(-) diff --git a/commonshrc b/commonshrc index 207ba0f..9e73e14 100644 --- a/commonshrc +++ b/commonshrc @@ -19,6 +19,8 @@ export BROWSER=xdg-open alias udetokei='tokei $(rg --files)' +alias time=$(which time) + # passc passc() { pass show "$1" | (read i; cat; echo -n "$i" | xclip -l 1 -se c) diff --git a/config/qutebrowser/keys.conf b/config/qutebrowser/keys.conf index 84176c2..c00de84 100644 --- a/config/qutebrowser/keys.conf +++ b/config/qutebrowser/keys.conf @@ -168,13 +168,13 @@ hint images tab hint images tab-bg .i -hint links fill ":open {hint-url}" +hint links fill :open {hint-url} ;o -hint links fill ":open -t {hint-url}" +hint links fill :open -t {hint-url} ;O -hint links fill ":open -b {hint-url}" +hint links fill :open -b {hint-url} .o hint links yank diff --git a/spacemacs b/spacemacs index 741b309..65a9221 100644 --- a/spacemacs +++ b/spacemacs @@ -12,6 +12,9 @@ ;; of a list then all discovered layers will be installed. dotspacemacs-configuration-layers '( + javascript + markdown + c-c++ ;; ---------------------------------------------------------------- ;; Example of useful layers you may want to use right away. ;; Uncomment some layer names and press (Vim style) or @@ -83,8 +86,9 @@ before layers configuration." dotspacemacs-colorize-cursor-according-to-state t ;; Default font. `powerline-scale' allows to quickly tweak the mode-line ;; size to make separators look not too crappy. - dotspacemacs-default-font '("Source Code Pro" - :size 13 + dotspacemacs-default-font '(;"Source Code Pro" + "Monospace" + :size 14 :weight normal :width normal :powerline-scale 1.1) @@ -160,15 +164,11 @@ before layers configuration." dotspacemacs-default-package-repository nil ) ;; User initialization goes here - (setq twelf-root "/home/gebner/twelf/") - ; (load (concat twelf-root "emacs/twelf-init.el")) (setq mu4e-mu-binary "/var/run/current-system/sw/bin/mu") (setq user-full-name "Gabriel Ebner" user-mail-address "gebner@gebner.org") (setq mu4e-compose-signature "Gabriel.") - ;; (setq message-send-mail-function 'message-send-mail-with-sendmail - ;; sendmail-program "msmtp") (setq message-send-mail-function 'smtpmail-send-it mu4e-sent-messages-behavior 'sent smtpmail-smtp-server "mail.gebner.org" @@ -190,6 +190,7 @@ before layers configuration." (when (fboundp 'imagemagick-register-types) (imagemagick-register-types)) (setq mu4e-html2text-command "elinks -dump") + (setq mu4e-use-fancy-chars t) (setq evil-in-single-undo t) ) @@ -212,11 +213,15 @@ This is the place where most of your configurations should be done. Unless it is explicitly specified that a variable should be set before a package is loaded, you should place your code here." + (setq twelf-root "/home/gebner/twelf/") + (when (file-exists-p twelf-root) + (load-file (concat twelf-root "emacs/twelf-init.el"))) + (setq lean-rootdir "/home/gebner/lean") (when (file-exists-p lean-rootdir) (setq load-path (cons (concat lean-rootdir "/src/emacs") load-path)) - (require 'lean-mode)) -) + (require 'lean-mode) + (spacemacs|define-jump-handlers lean-mode lean-find-definition))) ;; Do not write anything past this comment. This is where Emacs will ;; auto-generate custom variable definitions. @@ -225,35 +230,12 @@ 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. - '(company-tooltip-common ((t (:inherit company-tooltip :weight bold :underline nil)))) - '(company-tooltip-common-selection ((t (:inherit company-tooltip-selection :weight bold :underline nil)))) - '(ensime-implicit-highlight ((nil nil)))) + ) (custom-set-variables ;; custom-set-variables was added by Custom. ;; 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. - '(ahs-case-fold-search nil t) - '(ahs-default-range (quote ahs-range-whole-buffer) t) - '(ahs-idle-interval 0.25 t) - '(ahs-idle-timer 0 t) - '(ahs-inhibit-face-list nil t) - '(browse-url-browser-function (quote browse-url-xdg-open)) - '(flycheck-display-errors-function (quote flycheck-display-error-messages-unless-error-list)) - '(ledger-post-account-alignment-column 2) - '(org-pretty-entities t) - '(org-startup-with-latex-preview t) '(package-selected-packages (quote - (which-key vdirel use-package toc-org spaceline paradox org-plus-contrib neotree mwim ledger-mode hl-todo highlight-indentation helm-projectile helm-company helm-ag git-link expand-region evil-unimpaired ensime sbt-mode dumb-jump diff-hl column-enforce-mode aggressive-indent ace-window auctex anzu smartparens undo-tree flycheck yasnippet helm helm-core ht projectile magit magit-popup git-commit with-editor async dash ws-butler window-numbering volatile-highlights vi-tilde-fringe uuidgen spinner spacemacs-theme solarized-theme smeargle scala-mode restart-emacs rainbow-delimiters quelpa powerline popwin pkg-info pcre2el orgit org-vcard org-projectile org-present org-pomodoro org-download org-bullets open-junk-file noflet mu4e-alert move-text mmm-mode magit-gitflow macrostep lua-mode lorem-ipsum linum-relative link-hint info+ indent-guide ido-vertical-mode hydra hungry-delete htmlize highlight-parentheses highlight-numbers help-fns+ helm-themes helm-swoop helm-mode-manager helm-make helm-gitignore helm-flx helm-descbinds helm-c-yasnippet google-translate golden-ratio gnuplot gitconfig-mode gitattributes-mode git-timemachine git-messenger git-gutter-fringe git-gutter-fringe+ flycheck-pos-tip flycheck-ledger flx-ido fill-column-indicator fancy-battery f eyebrowse exec-path-from-shell evil-visualstar evil-visual-mark-mode 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 elisp-slime-nav diminish define-word dash-functional company-statistics company-auctex clean-aindent-mode bind-key auto-yasnippet auto-highlight-symbol auto-compile auctex-latexmk adaptive-wrap ace-link ace-jump-helm-line ac-ispell))) - '(paradox-github-token t) - '(preview-default-preamble - (quote - ("\\RequirePackage[" - ("," . preview-default-option-list) - "]{preview}[2004/11/05]" "\\PreviewEnvironment{prooftree}"))) - '(preview-scale-function 1.2) - '(ring-bell-function (quote ignore)) - '(scala-indent:align-forms t) - '(scala-indent:align-parameters t) - '(scala-indent:default-run-on-strategy scala-indent:operator-strategy)) + (disaster company-c-headers cmake-mode clang-format persp-mode ws-butler window-numbering which-key web-beautify volatile-highlights vi-tilde-fringe vdirel uuidgen use-package toc-org spacemacs-theme spaceline solarized-theme smeargle restart-emacs rainbow-delimiters quelpa popwin pcre2el paradox orgit org-projectile org-present org-pomodoro org-plus-contrib org-download org-bullets open-junk-file noflet neotree mwim mu4e-alert move-text mmm-mode markdown-toc magit-gitflow macrostep lorem-ipsum livid-mode linum-relative link-hint ledger-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-company helm-c-yasnippet helm-ag google-translate golden-ratio gnuplot gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link git-gutter-fringe git-gutter-fringe+ gh-md flycheck-pos-tip flycheck-ledger 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 ensime elisp-slime-nav dumb-jump diff-hl define-word company-tern company-statistics company-auctex column-enforce-mode coffee-mode clean-aindent-mode auto-yasnippet auto-highlight-symbol auto-compile auctex-latexmk aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line ac-ispell))))