From 9f52c19e772aad14733fad11802613f67b8b6612 Mon Sep 17 00:00:00 2001 From: amirrezaask Date: Sun, 15 Mar 2020 22:49:32 +0330 Subject: [PATCH 1/3] fix fg42-font-size applying issue --- lib/extensions/editor/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/extensions/editor/init.el b/lib/extensions/editor/init.el index 6e0073a..045f3e8 100644 --- a/lib/extensions/editor/init.el +++ b/lib/extensions/editor/init.el @@ -58,7 +58,7 @@ ;; Font Configuration ----------------------------------- (ability font () "Sets the default font to fg42 font" - (add-to-list 'default-frame-alist (cons 'font fg42-font)) + (add-to-list 'default-frame-alist (cons 'font (format "%s-%d" fg42-font fg42-font-size))) (set-face-attribute 'default t :font fg42-font)) ;; ------------------------------------------------------ From 6d7d35409b2e735d26057b0f821df1f67c6f5dc0 Mon Sep 17 00:00:00 2001 From: amirrezaask Date: Sun, 15 Mar 2020 23:38:57 +0330 Subject: [PATCH 2/3] new devops extension with support for k8s, docker and ansible --- lib/extensions/development.el | 2 +- lib/extensions/devops.el | 19 +++++++++++++++++++ lib/extensions/devops/init.el | 12 ++++++++++++ lib/extensions/editor.el | 2 +- 4 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 lib/extensions/devops.el create mode 100644 lib/extensions/devops/init.el diff --git a/lib/extensions/development.el b/lib/extensions/development.el index d0560c0..42f5281 100644 --- a/lib/extensions/development.el +++ b/lib/extensions/development.el @@ -9,7 +9,7 @@ (depends-on 'yasnippet) (depends-on 'yasnippet-snippets) (depends-on 'smart-mode-line) -(depends-on 'dockerfile-mode) + (depends-on 'quickrun) (depends-on 'dash) (depends-on 'websocket) diff --git a/lib/extensions/devops.el b/lib/extensions/devops.el new file mode 100644 index 0000000..0b43bac --- /dev/null +++ b/lib/extensions/devops.el @@ -0,0 +1,19 @@ +;;; DevopsExtension --- Enable Devops support in FG42 +;;; Commentary: +;;; Code: +(require 'fpkg) +(require 'fg42/extension) +(require 'extensions/devops/init) + +;; dependencies +(depends-on 'kubel) +(depends-on 'ansible) +(depends-on 'docker) +(depends-on 'dockerfile-mode) + +(extension devops + :version 0.0.1 + :on-initialize extensions/devops + :docs "lib/extensions/devops/readme.org") +(provide 'extensions/devops) +;; devops ends here diff --git a/lib/extensions/devops/init.el b/lib/extensions/devops/init.el new file mode 100644 index 0000000..b38f84c --- /dev/null +++ b/lib/extensions/devops/init.el @@ -0,0 +1,12 @@ +;;; devops-init --- The entry point for devops extension +;;; Commentary: +;;; Code: + +(defun extensions/devops-initialize () + "Initialize devops extension." + (exec-path-from-shell-initialize) + (add-to-list 'auto-mode-alist '("Dockerfile\\'" . dockerfile-mode)) + (add-hook 'yaml-mode-hook (lambda () (ansible)))) + +(provide 'extensions/devops/init) +;;; init ends here. diff --git a/lib/extensions/editor.el b/lib/extensions/editor.el index 7f003e1..d8a7459 100644 --- a/lib/extensions/editor.el +++ b/lib/extensions/editor.el @@ -25,7 +25,7 @@ (depends-on 'eyebrowse) -;; general for simpler keybindin +;; general for simpler keybinding (depends-on 'general) ;; Themes From ed3f95f84437c3e6377f4eab8d9ee118e6848102 Mon Sep 17 00:00:00 2001 From: amirrezaask Date: Mon, 16 Mar 2020 00:24:00 +0330 Subject: [PATCH 3/3] fix stupid bug and add devops extension to user default config --- config/fg42.user.el | 1 + lib/extensions/devops.el | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/fg42.user.el b/config/fg42.user.el index aca9dd7..23bb7c7 100644 --- a/config/fg42.user.el +++ b/config/fg42.user.el @@ -37,6 +37,7 @@ 'arduino 'java 'racket + 'devops 'irc 'latex) diff --git a/lib/extensions/devops.el b/lib/extensions/devops.el index 0b43bac..3854d1b 100644 --- a/lib/extensions/devops.el +++ b/lib/extensions/devops.el @@ -13,7 +13,7 @@ (extension devops :version 0.0.1 - :on-initialize extensions/devops + :on-initialize extensions/devops-initialize :docs "lib/extensions/devops/readme.org") (provide 'extensions/devops) ;; devops ends here