From 251d5e93988654533931773b93643ac743241935 Mon Sep 17 00:00:00 2001 From: Valentin Boettcher Date: Sat, 23 Feb 2019 00:03:56 +0100 Subject: [PATCH] Update .emacs, make colors verbose --- colors.sh | 4 +- config.desktop.sh | 6 +-- depenecies | 1 + dots/home/.emacs | 71 ++++++++++++++++++++++++------------ dots/screenlayout/desktop.sh | 2 +- 5 files changed, 54 insertions(+), 30 deletions(-) create mode 100644 depenecies diff --git a/colors.sh b/colors.sh index 47ee396..353b407 100644 --- a/colors.sh +++ b/colors.sh @@ -62,8 +62,8 @@ EOF sed -i -s 's/#//' $OOMOXCONF # make the theme - tools/oomox-gtk-theme/change_color.sh $OOMOXCONF >/dev/null 2>&1 - tools/oomox-archdroid-icon-theme/change_color.sh $OOMOXCONF >/dev/null 2>&1 + tools/oomox-gtk-theme/change_color.sh $OOMOXCONF; >/dev/null 2>&1 + tools/oomox-archdroid-icon-theme/change_color.sh $OOMOXCONF; >/dev/null 2>&1 fi OOMOXTHEME="oomox-"$SCHEME } diff --git a/config.desktop.sh b/config.desktop.sh index 142d501..9137274 100644 --- a/config.desktop.sh +++ b/config.desktop.sh @@ -3,8 +3,8 @@ ETH_DEV="enp3s0" MAIN_NET=$ETH_DEV MAIN_FONT="Source Code Pro 8" -MAIN_MONITOR=DisplayPort-1 -MONITORS=(DVI-D-1 DisplayPort-0) -SCREENLAYOUT="desktop" +MAIN_MONITOR=DP-1 +MONITORS=(DVI-I-1 DP-3) +SCREENLAYOUT="xrandr --output DVI-I-1 --mode 1920x1080 --pos 0x0 --rotate normal --output DP-3 --mode 1920x1080 --pos 3840x0 --rotate normal --output DP-2 --off --output DP-1 --primary --mode 1920x1080 --pos 1920x0 --rotate normal --output DVI-D-1 --off" RYGEL="true" BAR_POS="bottom" diff --git a/depenecies b/depenecies new file mode 100644 index 0000000..8c326c4 --- /dev/null +++ b/depenecies @@ -0,0 +1 @@ +sassc diff --git a/dots/home/.emacs b/dots/home/.emacs index fdc335f..b090653 100644 --- a/dots/home/.emacs +++ b/dots/home/.emacs @@ -37,30 +37,14 @@ ;; 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. - '(custom-safe-themes (quote ("4cf3221feff536e2b3385209e9b9dc4c2e0818a69a1cdb4b522756bcdf4e00a4" - "84d2f9eeb3f82d619ca4bfffe5f157282f4779732f48a5ac1484d94d5ff5b279" - "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" - "8db4b03b9ae654d4a57804286eb3e332725c84d7cdab38463cb6b97d5762ad26" - "065efdd71e6d1502877fd56 -21b984cded01717930639ded0e569e1724d058af8" - default))) - '(package-selected-packages (quote (srefactor sly-repl-ansi-color sly-quicklisp - sly-macrostep sly ranger company-tabnine counsel-notmuch - circe-notifications circe pretty-mode lispy - info-beamer auctex-latexmk ag indium js-doc - yasnippet-classic-snippets yasnippet-snippets - ivy-yasnippet counsel sage-shell-mode dummyparens - magit-filenotify docker-compose-mode docker - xref-js2 js2-refactor flycheck-rtags flycheck - ivy-rtags rtags auctex magit flycheck-rust - avy-flycheck company racer cargo rust-mode - restart-emacs json-mode multiple-cursors swiper - ivy xresources-theme powerline))) - '(safe-local-variable-values (quote ((TeX-master . t)))) + '(custom-safe-themes + '("4cf3221feff536e2b3385209e9b9dc4c2e0818a69a1cdb4b522756bcdf4e00a4" "84d2f9eeb3f82d619ca4bfffe5f157282f4779732f48a5ac1484d94d5ff5b279" "a27c00821ccfd5a78b01e4f35dc056706dd9ede09a8b90c6955ae6a390eb1c1e" "8db4b03b9ae654d4a57804286eb3e332725c84d7cdab38463cb6b97d5762ad26" "065efdd71e6d1502877fd56 +21b984cded01717930639ded0e569e1724d058af8" default)) + '(package-selected-packages + '(web-mode counsel-projectile jade-mode srefactor sly-repl-ansi-color sly-quicklisp sly-macrostep sly ranger company-tabnine counsel-notmuch circe-notifications circe pretty-mode lispy info-beamer auctex-latexmk ag indium js-doc yasnippet-classic-snippets yasnippet-snippets ivy-yasnippet counsel sage-shell-mode dummyparens magit-filenotify docker-compose-mode docker xref-js2 js2-refactor flycheck-rtags flycheck ivy-rtags rtags auctex magit flycheck-rust avy-flycheck company racer cargo rust-mode restart-emacs json-mode multiple-cursors swiper ivy xresources-theme powerline)) + '(safe-local-variable-values '((TeX-master . t))) '(show-paren-mode t) - '(tramp-syntax (quote default) - nil - (tramp))) + '(tramp-syntax 'default nil (tramp))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -194,7 +178,6 @@ (add-hook 'js2-mode-hook #'js2-imenu-extras-mode) (js2r-add-keybindings-with-prefix "C-c C-r") -(define-key js2-mode-map (kbd "C-k") #'js2r-kill) (add-hook 'js2-mode-hook #'indium-interaction-mode) ;; js-mode (which js2 is based on) binds "M-." which conflicts with xref, so ;; unbind it. @@ -483,8 +466,48 @@ (global-set-key (kbd "C-S-") 'mc/add-cursor-on-click) (put 'narrow-to-region 'disabled nil) +;; JSDoc +(setq js-doc-mail-address "hiro@protagon.space" + js-doc-author (format "Valentin Boettcher <%s>" js-doc-mail-address) + js-doc-url "protagon.space" + js-doc-license "MIT") + ;; Keybindings (progn (define-key key-translation-map (kbd "H-3") (kbd "•")) ; bullet (define-key key-translation-map (kbd "H-4") (kbd "◇")) ; white diamond (define-key key-translation-map (kbd "H-5") (kbd "†"))) + + +;; Projectile +(projectile-mode +1) +(define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map) +(counsel-projectile-mode) + +;; Web Mode +(add-to-list 'auto-mode-alist '("\\.phtml\\'" . web-mode)) +(add-to-list 'auto-mode-alist '("\\.tpl\\.php\\'" . web-mode)) +(add-to-list 'auto-mode-alist '("\\.[agj]sp\\'" . web-mode)) +(add-to-list 'auto-mode-alist '("\\.as[cp]x\\'" . web-mode)) +(add-to-list 'auto-mode-alist '("\\.erb\\'" . web-mode)) +(add-to-list 'auto-mode-alist '("\\.mustache\\'" . web-mode)) +(add-to-list 'auto-mode-alist '("\\.djhtml\\'" . web-mode)) +(add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode)) +(setq web-mode-engines-alist + '(("ctemplate" . "/home/hiro/Documents/projects/seminarst/.*\\.html\\'"))) + +;; Rename Buffers +(defun rename-file-and-buffer (new-name) + "Renames both current buffer and file it's visiting to NEW-NAME." + (interactive "sNew name: ") + (let ((name (buffer-name)) + (filename (buffer-file-name))) + (if (not filename) + (message "Buffer '%s' is not visiting a file!" name) + (if (get-buffer new-name) + (message "A buffer named '%s' already exists!" new-name) + (progn + (rename-file filename new-name 1) + (rename-buffer new-name) + (set-visited-file-name new-name) + (set-buffer-modified-p nil)))))) diff --git a/dots/screenlayout/desktop.sh b/dots/screenlayout/desktop.sh index 4bf53ae..07ba08c 100755 --- a/dots/screenlayout/desktop.sh +++ b/dots/screenlayout/desktop.sh @@ -1,2 +1,2 @@ #!/bin/sh -xrandr --output DisplayPort-1 --mode 1920x1080 --pos 1920x0 --rotate normal --output DisplayPort-0 --mode 1920x1080 --pos 3840x0 --rotate normal --output DisplayPort-2 --off --output DVI-I-0 --off --output DVI-D-1 --mode 1920x1080 --pos 0x0 --rotate normal +xrandr --output DVI-I-1 --mode 1920x1080 --pos 0x0 --rotate normal --output DP-3 --mode 1920x1080 --pos 3840x0 --rotate normal --output DP-2 --off --output DP-1 --primary --mode 1920x1080 --pos 1920x0 --rotate normal --output DVI-D-1 --off