From a56233db18ce7c73ab39d37175b3be51eb933c91 Mon Sep 17 00:00:00 2001 From: TuDatTr Date: Tue, 12 Jan 2021 11:18:49 +0100 Subject: [PATCH] Added Ansible Mode to Emacs --- config/.local/share/ranger/bookmarks | 2 +- config/.ssh/config | 73 +++++------- emacs/.emacs.d/config.org | 116 +++++++++++-------- emacs/.emacs.d/init.el | 3 +- emacs/.emacs.d/snippets/c++-mode/fun_comment | 10 ++ emacs/.emacs.d/snippets/org-mode/lecture | 5 + emacs/.emacs.d/snippets/org-mode/template | 4 +- 7 files changed, 115 insertions(+), 98 deletions(-) create mode 100644 emacs/.emacs.d/snippets/c++-mode/fun_comment create mode 100644 emacs/.emacs.d/snippets/org-mode/lecture diff --git a/config/.local/share/ranger/bookmarks b/config/.local/share/ranger/bookmarks index 4e35812..c1cda87 100644 --- a/config/.local/share/ranger/bookmarks +++ b/config/.local/share/ranger/bookmarks @@ -9,5 +9,5 @@ t:/home/tuan/Templates w:/home/tuan/workspace_l/Projects k:/home/tuan/Documents/Uni/Studium/2017&2018 Wintersemester/Rechnerstrukturen und Betriebssysteme [4,0]/Rechnerstrukturen q:/home/tuan/.nextcloud/Quick Drop -':/home/tuan/.emacs.d/snippets/c++-mode +':/home/tuan/f/b e:/home/tuan/Documents/CTF/TryHackMe/Ice/2_Recon diff --git a/config/.ssh/config b/config/.ssh/config index 094956e..caa3a66 100644 --- a/config/.ssh/config +++ b/config/.ssh/config @@ -42,7 +42,7 @@ Host goldi User goldi IdentityFile /mnt/veracrypt1/goldi -# Gitlab/Hub +# Services Host github.com Hostname github.com Port 22 @@ -63,79 +63,64 @@ Host picoCTF # Homeserver Host proxmox - HostName 192.168.178.38 + HostName 10.1.10.2 Port 22 User root IdentityFile /mnt/veracrypt1/proxmox +## CT Host nginx - HostName 192.168.178.24 + HostName 10.1.11.100 Port 22 User root IdentityFile /mnt/veracrypt1/proxmox Host nextcloud - HostName 192.168.178.25 - Port 22 - User root - IdentityFile /mnt/veracrypt1/proxmox - -Host sonarr - HostName 192.168.178.43 - Port 22 - User root - IdentityFile /mnt/veracrypt1/proxmox - -Host portainer - HostName 192.168.178.39 + HostName 10.1.11.102 Port 22 User root IdentityFile /mnt/veracrypt1/proxmox Host fireflyiii - HostName 192.168.178.40 + HostName 10.1.11.105 Port 22 User root IdentityFile /mnt/veracrypt1/proxmox -Host pfsense - HostName 192.168.178.55 - Port 2222 - User root - IdentityFile /mnt/veracrypt1/proxmox - Host pihole - HostName 192.168.178.47 - Port 22 - User root - IdentityFile /mnt/veracrypt1/proxmox - -Host nfs - HostName 192.168.178.37 + HostName 10.1.11.108 Port 22 User root IdentityFile /mnt/veracrypt1/proxmox Host plex - HostName 192.168.178.48 + HostName 10.1.11.110 + Port 22 + User root + IdentityFile /mnt/veracrypt1/proxmox + +Host plex-00 + HostName 10.1.11.107 + Port 22 + User root + IdentityFile /mnt/veracrypt1/tudattr + +Host ansible + HostName 10.1.11.104 + Port 22 + User root + IdentityFile /mnt/veracrypt1/proxmox + +## VM + +Host nfs + HostName 10.1.11.109 Port 22 User root IdentityFile /mnt/veracrypt1/proxmox Host torrent - HostName 192.168.178.64 - Port 22 - User root - IdentityFile /mnt/veracrypt1/proxmox - -Host minecraft - HostName 192.168.178.59 - Port 22 - User root - IdentityFile /mnt/veracrypt1/proxmox - -Host ftb - HostName 192.168.178.61 + HostName 10.1.11.111 Port 22 User root IdentityFile /mnt/veracrypt1/proxmox diff --git a/emacs/.emacs.d/config.org b/emacs/.emacs.d/config.org index e9643a7..80e8160 100644 --- a/emacs/.emacs.d/config.org +++ b/emacs/.emacs.d/config.org @@ -1,6 +1,6 @@ #+TITLE: Emacs Configuration from [[https://gitlab.com/TuDatTr/][TuDatTr]] -#+REVEAL_ROOT: https://cdn.jsdelivr.net/npm/reveal.js -#+OPTIONS: n:t +#+SETUPFILE: ~/Templates/Org-Mode/setupfile.org +#+OPTIONS: \n:t * Preface Before installing and using emacs, emacs should be run as a daemon. @@ -25,7 +25,7 @@ #+begin_src emacs-lisp (unless (package-installed-p 'use-package) - (package-install 'use-package)) + (package-install 'use-package)) (require 'use-package) (setq use-package-always-ensure t) @@ -51,36 +51,37 @@ #+begin_src emacs-lisp (use-package evil - :init - (setq evil-want-keybinding nil) - :config - (evil-mode 1) - (setq evil-search-module 'evil-search)) + :init + (setq evil-want-keybinding nil) + :config + (evil-mode 1) + (setq evil-search-module 'evil-search)) (use-package evil-collection - :config - (evil-collection-init)) + :config + (evil-collection-init)) #+end_src *** [[https://github.com/abo-abo/swiper][Ivy]]/[[https://github.com/abo-abo/swiper][Counsil]]/[[https://github.com/abo-abo/swiper][Swiper]] - =Ivy - a generic completion frontend for Emacs, Swiper - isearch with an overview, and more. Oh, man!= + =Ivy - a generic completion frontend for Emacs= + =Swiper - isearch with an overview, and more. Oh, man!= #+begin_src emacs-lisp (use-package prescient) (use-package ivy-prescient - :config - (ivy-prescient-mode 1)) + :config + (ivy-prescient-mode 1)) (use-package ivy) (use-package counsel - :diminish counsel-mode - :config - (counsel-mode 1)) + :diminish counsel-mode + :config + (counsel-mode 1)) (use-package swiper - :bind (("C-s" . 'swiper))) + :bind (("C-s" . 'swiper))) #+end_src *** [[https://magit.vc/][Magit]] @@ -95,11 +96,11 @@ #+begin_src emacs-lisp (use-package auctex - :defer t - :config - (setq TeX-parse-self t) - (setq-default TeX-master nil) - (setq TeX-PDF-mode t)) + :defer t + :config + (setq TeX-parse-self t) + (setq-default TeX-master nil) + (setq TeX-PDF-mode t)) #+end_src *** [[https://github.com/yjwen/org-reveal][ox-reveal]] @@ -142,9 +143,9 @@ #+begin_src emacs-lisp (use-package yasnippet - :config - (setq yas-snippet-dirs '("~/.emacs.d/snippets/")) - (yas-global-mode 1)) + :config + (setq yas-snippet-dirs '("~/.emacs.d/snippets/")) + (yas-global-mode 1)) #+end_src *** [[https://github.com/company-mode/company-mode][company-mode]] @@ -152,8 +153,8 @@ #+begin_src emacs-lisp (use-package company - :config - (global-company-mode)) + :config + (global-company-mode)) #+end_src *** [[https://github.com/flycheck/flycheck][flycheck]] @@ -168,9 +169,18 @@ *** [[https://github.com/hniksic/emacs-htmlize][htmlize.el]] =Convert buffer text and decorations to HTML.= -#+begin_src emacs-lisp + #+begin_src emacs-lisp (use-package htmlize) -#+end_src + #+end_src + +*** [[https://github.com/k1LoW/emacs-ansible][ansible]] + =Ansible minor mode= + + #+BEGIN_SRC emacs-lisp + (use-package ansible + :config + (ansible 1)) + #+END_SRC * Appearance This section is for appearance customization. Either via packages or manually. @@ -191,8 +201,9 @@ #+begin_src emacs-lisp (add-hook 'window-setup-hook - '(lambda () - (set-face-background 'default "unspecified-bg"))) + '(lambda () + (if not (display-graphic-p) + (set-face-background 'default "unspecified-bg")))) #+end_src ** Menubar @@ -228,35 +239,38 @@ (setq org-pretty-entities t) (setq org-src-fontify-natively t))) #+end_src + *** Keybindings -#+begin_src emacs-lisp - (define-key org-mode-map (kbd "C-c ,") 'org-insert-structure-template) -#+end_src + #+begin_src emacs-lisp + (define-key org-mode-map (kbd "C-c ,") 'org-insert-structure-template) + #+end_src - Enables specific languages for org-babel, so those languages can be used and compiled in code blocks and disable the compilation concirmation. The code afterwords enables proper indentation inside those source blocks. - #+begin_src emacs-lisp - (org-babel-do-load-languages - 'org-babel-load-languages - '((emacs-lisp . t) - (C . t) - (makefile . t) - (shell . t) - (latex . t) - (python . t))) + Enables specific languages for org-babel, so those languages can be used and compiled in code blocks and disable the compilation confirmation. The code afterwords enables proper indentation inside those source blocks. + #+begin_src emacs-lisp + (org-babel-do-load-languages + 'org-babel-load-languages + '((emacs-lisp . t) + (C . t) + (makefile . t) + (shell . t) + (latex . t) + (python . t))) + + (setq org-confirm-babel-evaluate nil) + (setq org-src-tab-acts-natively t) + #+end_src - (setq org-confirm-babel-evaluate nil) - (setq org-src-tab-acts-natively t) - #+end_src ** C-Mode #+begin_src emacs-lisp (add-hook 'c-mode-hook - (lambda () - (display-line-numbers-mode 1))) + (lambda () + (display-line-numbers-mode 1))) #+end_src ** C++-Mode #+begin_src emacs-lisp (add-hook 'c++-mode-hook - (lambda () - (display-line-numbers-mode 1))) + (lambda () + (display-line-numbers-mode 1))) #+end_src + diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 37b20b8..b01f8f8 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -5,8 +5,9 @@ ;; 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. + '(auth-source-save-behavior nil) '(package-selected-packages - '(go-mode yasnippet use-package theme-magic rainbow-mode rainbow-delimiters ox-twbs ox-reveal ox-hugo org-bullets no-littering moe-theme magit ivy-prescient god-mode evil-collection diminish counsel auctex))) + '(ansible yasnippet use-package theme-magic rainbow-mode rainbow-delimiters ox-twbs ox-reveal ox-hugo org-bullets no-littering moe-theme magit ivy-prescient htmlize god-mode go-mode flycheck evil-collection diminish counsel company auctex))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/emacs/.emacs.d/snippets/c++-mode/fun_comment b/emacs/.emacs.d/snippets/c++-mode/fun_comment new file mode 100644 index 0000000..4fa396e --- /dev/null +++ b/emacs/.emacs.d/snippets/c++-mode/fun_comment @@ -0,0 +1,10 @@ +# -*- mode: snippet -*- +# name: function template +# key: /** +# -- +/** + @brief $0 + + @param[in] + @result + */ \ No newline at end of file diff --git a/emacs/.emacs.d/snippets/org-mode/lecture b/emacs/.emacs.d/snippets/org-mode/lecture new file mode 100644 index 0000000..0c5d88a --- /dev/null +++ b/emacs/.emacs.d/snippets/org-mode/lecture @@ -0,0 +1,5 @@ +# -*- mode: snippet -*- +# name: lecture title +# key: lec +# -- +Lecture - Number - Name \ No newline at end of file diff --git a/emacs/.emacs.d/snippets/org-mode/template b/emacs/.emacs.d/snippets/org-mode/template index 72c2e31..f530123 100644 --- a/emacs/.emacs.d/snippets/org-mode/template +++ b/emacs/.emacs.d/snippets/org-mode/template @@ -3,4 +3,6 @@ # key: template # -- #+TITLE: $0 -#+SETUPFILE: ~/Templates/Org-Mode/setupfile.org \ No newline at end of file +#+SETUPFILE: ~/Templates/Org-Mode/setupfile.org + +$1 \ No newline at end of file