Merge branch 'master' of https://git.asgard.bitvalve.org/mschoengens/dotconfigs
This commit is contained in:
Marcel Schoengens
+16
-7
@@ -31,21 +31,21 @@ values."
|
||||
;; List of configuration layers to load.
|
||||
dotspacemacs-configuration-layers
|
||||
'(
|
||||
markdown
|
||||
yaml
|
||||
markdown
|
||||
swift
|
||||
python
|
||||
git
|
||||
;; ----------------------------------------------------------------
|
||||
;; Example of useful layers you may want to use right away.
|
||||
;; Uncomment some layer names and press <SPC f e R> (Vim style) or
|
||||
;; <M-m f e R> (Emacs style) to install them.
|
||||
;; ----------------------------------------------------------------
|
||||
helm
|
||||
;; auto-completion
|
||||
auto-completion
|
||||
docker
|
||||
;; better-defaults
|
||||
emacs-lisp
|
||||
;; git
|
||||
;; markdown
|
||||
org
|
||||
;; (shell :variables
|
||||
;; shell-default-height 30
|
||||
@@ -319,7 +319,7 @@ package is loaded, you should place your code here."
|
||||
(global-set-key "\C-cb" 'org-iswitchb)
|
||||
(custom-set-variables
|
||||
'(org-agenda-files (list "~/Documents/docs-private/orgmode/org-mode.org"
|
||||
"~/Documents/docs-sm/organisation/projekte/projects.org")))
|
||||
"~/Documents/docs-sm/organisation/projects.om")))
|
||||
'(org-enable-priority-commands t)
|
||||
'(org-highest-priority ?A)
|
||||
'(org-lowest-priority ?Z)
|
||||
@@ -328,6 +328,7 @@ package is loaded, you should place your code here."
|
||||
(setq org-agenda-log-mode-items '(closed))
|
||||
(setq org-agenda-custom-commands
|
||||
'(("b" "Purchases List" tags-todo "BUY")
|
||||
("B" "Big Spendings List" tags-todo "+BIGSPENDS")
|
||||
("h" "Home Todo List" tags "HOME"))
|
||||
)
|
||||
)
|
||||
@@ -339,6 +340,13 @@ package is loaded, you should place your code here."
|
||||
(org-agenda-write "test1.ics")
|
||||
)
|
||||
|
||||
(defun browse-url-default-macosx-browser (url &optional new-window)
|
||||
(interactive (browse-url-interactive-arg "URL: "))
|
||||
(if (and new-window (>= emacs-major-version 23))
|
||||
(ns-do-applescript
|
||||
(format "tell application \"Safari\" to open location \"%s\"\n" url))
|
||||
(start-process (concat "open " url) nil "open" url)))
|
||||
|
||||
;; Do not write anything past this comment. This is where Emacs will
|
||||
;; auto-generate custom variable definitions.
|
||||
(custom-set-variables
|
||||
@@ -346,14 +354,15 @@ package is loaded, 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.
|
||||
'(org-agenda-files (quote ("~/Documents/docs-private/orgmode/org-mode.org")))
|
||||
'(org-agenda-files
|
||||
(list "~/Documents/docs-private/orgmode/org-mode.org" "~/Documents/docs-sm/organisation/projects.om"))
|
||||
'(org-default-priority 85)
|
||||
'(org-enable-priority-commands t)
|
||||
'(org-highest-priority 65)
|
||||
'(org-lowest-priority 90)
|
||||
'(package-selected-packages
|
||||
(quote
|
||||
(mmm-mode markdown-toc markdown-mode gh-md swift3-mode swift-mode org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-mime org-download htmlize gnuplot yapfify pyvenv pytest pyenv-mode py-isort pip-requirements live-py-mode hy-mode dash-functional helm-pydoc cython-mode anaconda-mode pythonic ws-butler winum 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 org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx 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-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f dash s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async))))
|
||||
(dockerfile-mode docker json-mode tablist docker-tramp json-snatcher json-reformat helm-company helm-c-yasnippet fuzzy company-statistics company-anaconda company auto-yasnippet yasnippet ac-ispell auto-complete smeargle orgit magit-gitflow helm-gitignore gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link evil-magit realgud magit yaml-mode pandoc pandoc-mode mmm-mode markdown-toc markdown-mode gh-md swift3-mode swift-mode org-projectile org-category-capture org-present org-pomodoro alert log4e gntp org-mime org-download htmlize gnuplot yapfify pyvenv pytest pyenv-mode py-isort pip-requirements live-py-mode hy-mode dash-functional helm-pydoc cython-mode anaconda-mode pythonic ws-butler winum 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 org-bullets open-junk-file neotree move-text macrostep lorem-ipsum linum-relative link-hint indent-guide hydra hungry-delete hl-todo highlight-parentheses highlight-numbers parent-mode highlight-indentation helm-themes helm-swoop helm-projectile helm-mode-manager helm-make projectile pkg-info epl helm-flx helm-descbinds helm-ag google-translate golden-ratio flx-ido flx 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-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state smartparens evil-indent-plus evil-iedit-state iedit evil-exchange evil-escape evil-ediff evil-args evil-anzu anzu evil goto-chg undo-tree eval-sexp-fu highlight elisp-slime-nav dumb-jump f dash s diminish define-word column-enforce-mode clean-aindent-mode bind-map bind-key auto-highlight-symbol auto-compile packed aggressive-indent adaptive-wrap ace-window ace-link ace-jump-helm-line helm avy helm-core popup async))))
|
||||
(custom-set-faces
|
||||
;; custom-set-faces was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
|
||||
@@ -153,6 +153,26 @@ function sortimages () {
|
||||
esac
|
||||
}
|
||||
|
||||
|
||||
read -r -d '' REMOTE_CMD << EOF
|
||||
if [ \$(command -v module 2> /dev/null | wc -l) -gt 0 ]; then
|
||||
module load tmux
|
||||
fi
|
||||
|
||||
if [ \$(lsof -U 2> /dev/null | grep ^tmux | wc -l) -gt 0 ]; then
|
||||
tmux a
|
||||
else
|
||||
tmux
|
||||
fi
|
||||
EOF
|
||||
|
||||
function st () {
|
||||
ssh -t $@ ${REMOTE_CMD}
|
||||
}
|
||||
|
||||
compdef st=ssh
|
||||
|
||||
|
||||
### Alias configuration
|
||||
|
||||
if [[ $(uname) = "Linux" ]]; then
|
||||
|
||||
Reference in New Issue
Block a user