From 030d4b667718ff841436bfc6bce553e24b2cc9a9 Mon Sep 17 00:00:00 2001 From: Marcel Schoengens Date: Fri, 18 Mar 2022 19:27:22 +0100 Subject: [PATCH] Update dotconfigs --- emacs/spacemacs | 62 ++++++++++++++++++++++++++++++++----------------- tmux/tmux.conf | 2 ++ zsh/zshrc | 3 ++- 3 files changed, 45 insertions(+), 22 deletions(-) diff --git a/emacs/spacemacs b/emacs/spacemacs index 007abbe..66973fd 100644 --- a/emacs/spacemacs +++ b/emacs/spacemacs @@ -32,29 +32,22 @@ values." dotspacemacs-configuration-layers '( auto-completion - yaml - spacemacs-org - markdown - swift - python - ipython-notebook - git - ;; ---------------------------------------------------------------- - ;; Example of useful layers you may want to use right away. - ;; Uncomment some layer names and press (Vim style) or - ;; (Emacs style) to install them. - ;; ---------------------------------------------------------------- - helm docker - ;; better-defaults emacs-lisp + git + helm + ipython-notebook + nginx + markdown org - ;; (shell :variables - ;; shell-default-height 30 - ;; shell-default-position 'bottom) - ;; spell-checking - ;; syntax-checking - ;; version-control + php + python + spacemacs-org + swift + syntax-checking + systemd + version-control + yaml ) ;; List of additional packages that will be installed without being ;; wrapped in a layer. If you need some configuration for these @@ -380,10 +373,37 @@ package is loaded, you should place your code here." '(org-lowest-priority 90) '(package-selected-packages (quote - (ein skewer-mode deferred websocket js2-mode simple-httpd exec-path-from-shell 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)))) + (ein skewer-mode deferred websocket js2-mode simple-httpd exec-path-from-shell dockerfile-mode docker json-mode tablist docker-tramp json-snatcher json-reformat helm-company helm-c-yasnippet fuzzy company-statistics 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 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. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. ) +(defun dotspacemacs/emacs-custom-settings () + "Emacs custom settings. +This is an auto-generated function, do not modify its content directly, use +Emacs customize menu instead. +This function is called at the very end of Spacemacs initialization." +(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. + '(org-agenda-files + (quote + ("/Users/mschoengens/Documents/docs-private/orgmode/org-mode.org" "~/Documents/docs-sm/organisation/projects.org"))) + '(org-default-priority 85) + '(org-enable-priority-commands t) + '(org-highest-priority 65) + '(org-lowest-priority 90) + '(package-selected-packages + (quote + (jedi company-jedi systemd ein skewer-mode deferred websocket js2-mode simple-httpd exec-path-from-shell dockerfile-mode docker json-mode tablist docker-tramp json-snatcher json-reformat helm-company helm-c-yasnippet fuzzy company-statistics 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 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. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + ) +) diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 7d646ff..6fd26ab 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -4,3 +4,5 @@ set-option -g escape-time 0 set-window-option -g allow-rename off bind-key h swap-window -t -1 bind-key l swap-window -t +1 +set -g status-bg blue +set -g status-fg black diff --git a/zsh/zshrc b/zsh/zshrc index 251ea87..20419f9 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -191,6 +191,7 @@ compdef st=ssh alias dc='docker-compose --env-file docker-compose.env' alias dstat='dstat -tclmsgdnpy' +alias glances='glances -b' if [[ ${+SYSTEM_STACK_DIR} ]]; then alias gdc="$(readlink -f $SYSTEM_STACK_DIR)/bin/gdc" @@ -203,7 +204,7 @@ if [[ $(uname) = "Linux" ]]; then alias gl='glances -b' alias grep='grep --color' alias ls='ls --color' - alias l='ls -lh --color' + alias l='ls -lha --color' alias open='xdg-open' fi