diff options
| -rw-r--r-- | .gitea/workflows/git-sync.yaml | 36 | ||||
| -rw-r--r-- | init.el | 4 | ||||
| -rw-r--r-- | modules/init-company.el | 5 | ||||
| -rw-r--r-- | modules/init-icons.el | 2 | ||||
| -rw-r--r-- | modules/init-ivy.el | 1 | ||||
| -rw-r--r-- | modules/init-neotree.el | 4 | ||||
| -rw-r--r-- | modules/init-web-mode.el | 1 |
7 files changed, 44 insertions, 9 deletions
diff --git a/.gitea/workflows/git-sync.yaml b/.gitea/workflows/git-sync.yaml index 7ad4e72..561f3b4 100644 --- a/.gitea/workflows/git-sync.yaml +++ b/.gitea/workflows/git-sync.yaml @@ -3,13 +3,45 @@ name: git-sync-with-mirror on: push: branches: [ master ] + pull_request: + branches: [ master ] workflow_dispatch: jobs: + test: + runs-on: ubuntu-latest + timeout-minutes: 10 + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Install Emacs + run: | + sudo apt-get update + sudo apt-get install -y emacs-nox + + - name: Setup environment + run: | + cp .env.example .env + + - name: Load configuration + run: | + emacs --batch -l init.el + + - name: Byte compile configuration + run: | + emacs --batch -f batch-byte-compile init.el modules/*.el + git-sync: runs-on: ubuntu-latest + needs: test + timeout-minutes: 15 steps: + - name: Checkout + uses: actions/checkout@v4 + - name: git-sync env: git_sync_source_repo: git@git.fridu.us:heckyel/emacs-personal.git @@ -19,8 +51,8 @@ jobs: with: source_repo: git@git.fridu.us:heckyel/emacs-personal.git source_branch: "master" - destination_repo: ssh://git@c.fridu.us/software/emacs-personal.git destination_branch: "master" + destination_repo: ssh://git@c.fridu.us/software/emacs-personal.git source_ssh_private_key: ${{ secrets.GIT_SYNC_SOURCE_SSH_PRIVATE_KEY }} destination_ssh_private_key: ${{ secrets.GIT_SYNC_DESTINATION_SSH_PRIVATE_KEY }} @@ -33,7 +65,7 @@ jobs: with: source_repo: git@git.fridu.us:heckyel/emacs-personal.git source_branch: "master" - destination_repo: git@git.sr.ht:~heckyel/emacs-personal destination_branch: "master" + destination_repo: git@git.sr.ht:~heckyel/emacs-personal source_ssh_private_key: ${{ secrets.GIT_SYNC_SOURCE_SSH_PRIVATE_KEY }} destination_ssh_private_key: ${{ secrets.GIT_SYNC_DESTINATION_SSH_PRIVATE_KEY }} @@ -51,6 +51,8 @@ gc-cons-percentage 0.1)))) ;;; Modules directory +(if noninteractive + (setq user-emacs-directory default-directory)) (push (concat user-emacs-directory "modules") load-path) ;;;------------------------------ @@ -135,7 +137,7 @@ ;;; Settings (setq settings-file (expand-file-name "settings.el" user-emacs-directory)) ;;; Loads settings file -(when (file-exists-p custom-file) +(when (file-exists-p settings-file) (load settings-file)) ;; enable erase-buffer command diff --git a/modules/init-company.el b/modules/init-company.el index c8ad1a5..1c958ad 100644 --- a/modules/init-company.el +++ b/modules/init-company.el @@ -1,8 +1,8 @@ ;;; init-company.el --- .Emacs Configuration -*- lexical-binding: t -*- ;;; Commentary: -;; Company es un famework de Emacs para el completado de texto. +;; Company is a framework for text completion in Emacs. -;;; code: +;;; Code: (use-package company :defer 5 :diminish @@ -29,7 +29,6 @@ (global-company-mode t)) (use-package company-quickhelp - :ensure t :after company :config (company-quickhelp-mode 1)) diff --git a/modules/init-icons.el b/modules/init-icons.el index a768f78..67f8fe9 100644 --- a/modules/init-icons.el +++ b/modules/init-icons.el @@ -15,7 +15,7 @@ ;;--------------------------------- (when (display-graphic-p) (unless (member "all-the-icons" (font-family-list)) - (setq neotree-mode-hook 'all-the-icons-install-fonts)))) + (add-hook 'neotree-mode-hook #'all-the-icons-install-fonts)))) ;; fix performace (setq inhibit-compacting-font-caches t) diff --git a/modules/init-ivy.el b/modules/init-ivy.el index cac5ec0..c4a7d48 100644 --- a/modules/init-ivy.el +++ b/modules/init-ivy.el @@ -32,6 +32,7 @@ ;; hydra (use-package hydra :pin "MELPA" + :after ivy :config (hydra-add-font-lock)) (use-package swiper diff --git a/modules/init-neotree.el b/modules/init-neotree.el index dfa5d44..8fb9e51 100644 --- a/modules/init-neotree.el +++ b/modules/init-neotree.el @@ -12,6 +12,7 @@ (use-package neotree :ensure t + :after projectile :pin "MELPA" :commands (neotree-show neotree-hide @@ -69,8 +70,7 @@ (when (and (require 'neotree nil t) (fboundp 'neo-buffer--insert-root-entry) (fboundp 'shrink-root-entry)) - (advice-add #'neo-buffer--insert-root-entry :override #'shrink-root-entry)) - ) + (advice-add #'neo-buffer--insert-root-entry :override #'shrink-root-entry))) (defun neotree-project-dir-toggle () "Open NeoTree using the project root, using find-file-in-project or the current buffer directory." diff --git a/modules/init-web-mode.el b/modules/init-web-mode.el index 0d98f63..475ea63 100644 --- a/modules/init-web-mode.el +++ b/modules/init-web-mode.el @@ -4,6 +4,7 @@ ;;; Code: (use-package web-mode + :after projectile :pin "MELPA" :mode (("\\.html?\\'" . web-mode) ("\\.djhtml\\'" . web-mode) |