From fce73acdfcdc1995cab8dba0f03629f331f5ea12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Wed, 23 Dec 2020 21:36:34 +0100 Subject: [PATCH] Updated MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Woźniak --- .emacs.d/init.el | 101 ++++++++++++------- .local/bin/{docker-start.sh => docker-start} | 0 .signature | 3 + .xinitrc | 4 +- 4 files changed, 72 insertions(+), 36 deletions(-) rename .local/bin/{docker-start.sh => docker-start} (100%) create mode 100644 .signature diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 72c20c0..0e087d9 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -5,11 +5,11 @@ (setq package-enable-at-startup nil) (setq package-archives '( - ("ELPA" . "http://tromey.com/elpa/") - ("gnu" . "http://elpa.gnu.org/packages/") - ("melpa" . "https://melpa.org/packages/") - ("ORG" . "https://orgmode.org/elpa/") - ) + ("ELPA" . "http://tromey.com/elpa/") + ("gnu" . "http://elpa.gnu.org/packages/") + ("melpa" . "https://melpa.org/packages/") + ("ORG" . "https://orgmode.org/elpa/") + ) ) (package-initialize) (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3") @@ -27,6 +27,10 @@ ;; Remove working cl (require 'cl-lib) (setq byte-compile-warnings '(cl-functions)) +(advice-add 'sh-set-shell :around + (lambda (orig-fun &rest args) + (cl-letf (((symbol-function 'message) #'ignore)) + (apply orig-fun args)))) ;; install use-package (unless (package-installed-p 'use-package) @@ -55,10 +59,15 @@ (add-hook 'text-mode-hook 'auto-fill-mode) (setq-default fill-column 80) +; Global turn on flycheck +(add-hook 'after-init-hook #'global-flycheck-mode) + +; Org Files (add-hook 'org-mode-hook '(lambda () (setq fill-column 80))) (add-hook 'org-mode-hook 'auto-fill-mode) (add-hook 'org-mode-hook 'turn-on-flyspell) + ;; Broswer (setq browse-url-browser-function 'browse-url-generic browse-url-generic-program "browser-x") @@ -85,7 +94,6 @@ (if (condition-case nil (require 'mozc)(error nil)) (setq ecb-be-more-like-better-yes-p t) (message "Monz not available; not configuring") ) -;(require 'mozc) (setq default-input-method "japanese-mozc") ;; Enable Smex @@ -120,24 +128,26 @@ (use-package company :ensure t ) - -(require 'company) (global-company-mode) -;; Shell -(add-hook 'sh-mode-hook 'company-mode) +;; Shell - bash +(use-package flymake-shellcheck + :ensure t + ) +(use-package flycheck-bashate + :ensure t + ) -;; Latex -;(eval-after-load 'company -; '(push 'company-robe company-backends)) +(require 'bash-completion) +(bash-completion-setup) -;; Ruby -;(eval-after-load 'auto-complete -; '(add-to-list 'ac-modes 'inf-ruby-mode)) -;(add-hook 'inf-ruby-mode-hook 'ac-inf-ruby-enable) -;(eval-after-load 'inf-ruby ' -; '(define-key inf-ruby-mode-map (kbd "TAB") 'auto-complete)) +(use-package flymake-shell + :ensure t + ) + +(require 'flymake-shell) +(add-hook 'sh-set-shell-hook 'flymake-shell-load) ;; Theme (use-package dracula-theme @@ -160,28 +170,22 @@ ) (global-set-key (kbd "C-x g") 'magit-status) -;; ruby sorce code -(use-package flymake-ruby - :ensure t - :config - ) - +;; Helpers for easily building Emacs flymake checkers. (use-package flymake-easy :ensure t :config ) -;;robe -(use-package robe - :ensure t - :config - ) - ;; Error list (define-key flymake-mode-map (kbd "M-n") 'flymake-goto-next-error) (define-key flymake-mode-map (kbd "M-p") 'flymake-goto-prev-error) ;; Ruby +(use-package flymake-ruby + :ensure t + :config + ) + (require 'robe) (add-hook 'ruby-mode-hook 'robe-mode) (add-hook 'robe-mode-hook 'ac-robe-setup) @@ -189,6 +193,12 @@ (require 'flymake-ruby) (add-hook 'ruby-mode-hook 'flymake-ruby-load) +;;robe +(use-package robe + :ensure t + :config + ) + ;; Docker (use-package dockerfile-mode :ensure t @@ -205,12 +215,38 @@ :config ) +;; Ansible +(use-package ansible + :ensure t + :config + ) + +(use-package ansible-doc + :ensure t + :config + ) + +(use-package company-ansible + :ensure t + :config + ) + +(add-to-list 'company-backends 'company-ansible) +(add-hook 'yaml-mode-hook '(lambda () (ansible 1))) +(add-hook 'yaml-mode-hook #'ansible-doc-mode) + ;; Markdown-mode (use-package markdown-mode :ensure t :config ) +;; Apache +(use-package apache-mode + :ensure t + :config + ) + ;; Livedown ;;; sudo npm install -g livedown ;;; (add-to-list 'load-path (expand-file-name "~/.emacs.d/emacs-livedown")) @@ -248,9 +284,6 @@ ;; no "bell" (audible notification): (setq ring-bell-function 'ignore) -;; highlight: -;(global-hl-line-mode 1) - ;; auto reloading (reverting) buffers (global-auto-revert-mode 1) diff --git a/.local/bin/docker-start.sh b/.local/bin/docker-start similarity index 100% rename from .local/bin/docker-start.sh rename to .local/bin/docker-start diff --git a/.signature b/.signature new file mode 100644 index 0000000..5f88c91 --- /dev/null +++ b/.signature @@ -0,0 +1,3 @@ +Regards, +Marcin Woźniak +https://yorune.pl diff --git a/.xinitrc b/.xinitrc index 221a7a7..8787103 100644 --- a/.xinitrc +++ b/.xinitrc @@ -18,8 +18,8 @@ xautolock -time 15 -locker slock& nm-applet --sm-disable& #sudo /root/.local/bin/protonvpn c -f& dunst -config& -#browser-x& -#QT_SCALE_FACTOR=1.5 keepassxc & +browser-x& +QT_SCALE_FACTOR=1.5 keepassxc & /usr/local/bin/st -e /bin/sh -c "tmux new-session -s BASE -n HOME '/bin/zsh'\; split-window 'htop'\; new-window -n MAIL 'neomutt'\; new-window -n NEWSBOAT 'newsboat -r '\; new-window -n MUSIC 'cmus'"& #(sleep 30 && getforecast)& sudo /usr/bin/rdate -s ntp.task.gda.pl && sudo /sbin/hwclock --systohc