From 4aaf02141dcac500a715ad448eda5bb6f3610ec1 Mon Sep 17 00:00:00 2001 From: Ryan Yeske Date: Fri, 3 Jun 2022 19:57:20 -0700 Subject: [PATCH 1/9] update branches --- .github/workflows/makefile.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index e4dadb2..a52ea7c 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -2,9 +2,9 @@ name: Makefile CI on: push: - branches: [ "main" ] + branches: [ "main", "make-actions" ] pull_request: - branches: [ "main" ] + branches: [ "main", "make-actions" ] jobs: build: From 47209950c623e12703ceb62795567b27bcf52cba Mon Sep 17 00:00:00 2001 From: Ryan Yeske Date: Fri, 3 Jun 2022 19:58:41 -0700 Subject: [PATCH 2/9] update targets that are run --- .github/workflows/makefile.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index a52ea7c..acdb6e3 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -14,14 +14,5 @@ jobs: steps: - uses: actions/checkout@v3 - - name: configure - run: ./configure - - - name: Install dependencies - run: make - - - name: Run check - run: make check - - - name: Run distcheck - run: make distcheck + - name: stow + run: make stow From 34861c021dde3753d7cf889440f67f84e362f2ef Mon Sep 17 00:00:00 2001 From: Ryan Yeske Date: Fri, 3 Jun 2022 20:01:22 -0700 Subject: [PATCH 3/9] actions: install stow --- .github/workflows/makefile.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index acdb6e3..f7939d4 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -14,5 +14,8 @@ jobs: steps: - uses: actions/checkout@v3 + - name: install deps + run: sudo apt-get install -y stow + - name: stow run: make stow From c9d761a0a547b4aed840780ee792f97e7633f66d Mon Sep 17 00:00:00 2001 From: Ryan Yeske Date: Fri, 3 Jun 2022 20:20:24 -0700 Subject: [PATCH 4/9] actions: start emacs --- .github/workflows/makefile.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index f7939d4..953df4a 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -15,7 +15,10 @@ jobs: - uses: actions/checkout@v3 - name: install deps - run: sudo apt-get install -y stow + run: sudo apt-get install -y stow emacs - name: stow run: make stow + + - name: emacs + run: emacs --batch --load .emacs --eval '(kill-emacs)' From 127ec3c1b87b2ad0a0fd7beadac9a5621813441d Mon Sep 17 00:00:00 2001 From: Ryan Yeske Date: Fri, 3 Jun 2022 20:23:06 -0700 Subject: [PATCH 5/9] actions: show current directory, comment out push --- .github/workflows/makefile.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 953df4a..7549411 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -1,8 +1,8 @@ name: Makefile CI on: - push: - branches: [ "main", "make-actions" ] + # push: + # branches: [ "main", "make-actions" ] pull_request: branches: [ "main", "make-actions" ] @@ -20,5 +20,8 @@ jobs: - name: stow run: make stow + - name: pwd + run: pwd + - name: emacs - run: emacs --batch --load .emacs --eval '(kill-emacs)' + run: emacs --batch --load ./.emacs --eval '(kill-emacs)' From f7147ddcfe6d0caa4fcb5fd5cf569ed9ffda4f81 Mon Sep 17 00:00:00 2001 From: Ryan Yeske Date: Fri, 3 Jun 2022 20:26:10 -0700 Subject: [PATCH 6/9] show tree --- .github/workflows/makefile.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 7549411..dfbcb0c 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -20,8 +20,8 @@ jobs: - name: stow run: make stow - - name: pwd - run: pwd + - name: tree + run: ls -lR /home/runner - name: emacs run: emacs --batch --load ./.emacs --eval '(kill-emacs)' From 845256a02f8165f568b98d99affc2b59c1eba168 Mon Sep 17 00:00:00 2001 From: Ryan Yeske Date: Fri, 3 Jun 2022 20:29:14 -0700 Subject: [PATCH 7/9] play games with paths --- .github/workflows/makefile.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index dfbcb0c..74f40b4 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -21,7 +21,7 @@ jobs: run: make stow - name: tree - run: ls -lR /home/runner + run: ls -lRa /home/runner/work/dotfiles - name: emacs - run: emacs --batch --load ./.emacs --eval '(kill-emacs)' + run: HOME=/home/runner/work/dotfiles emacs --batch --load /home/runner/work/dotfiles/.emacs --eval '(kill-emacs)' From 54b8db781bb62a92b1671389f70cccd4cda1753e Mon Sep 17 00:00:00 2001 From: Ryan Yeske Date: Fri, 3 Jun 2022 20:35:06 -0700 Subject: [PATCH 8/9] emacs: add emacs-custom.el to dotfiles --- emacs/.emacs-custom.el | 67 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 emacs/.emacs-custom.el diff --git a/emacs/.emacs-custom.el b/emacs/.emacs-custom.el new file mode 100644 index 0000000..2b26b76 --- /dev/null +++ b/emacs/.emacs-custom.el @@ -0,0 +1,67 @@ +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; 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. + '(ansi-color-faces-vector + [default default default italic underline success warning error]) + '(ansi-color-names-vector + ["black" "#d55e00" "#009e73" "#f8ec59" "#0072b2" "#cc79a7" "#56b4e9" "white"]) + '(custom-enabled-themes '(wombat)) + '(display-battery-mode t) + '(display-time-mode t) + '(enable-recursive-minibuffers t) + '(indent-tabs-mode nil) + '(ispell-dictionary nil) + '(magit-diff-refine-hunk 'all) + '(menu-bar-mode nil) + '(ns-command-modifier 'meta) + '(org-adapt-indentation nil) + '(org-agenda-span 'day) + '(org-archive-location ".archive.org::datetree/* From %s") + '(org-cycle-global-at-bob t) + '(org-drill-save-buffers-after-drill-sessions-p nil) + '(org-drill-scope '("~/Dropbox/org/drill.org")) + '(org-image-actual-width '(640)) + '(org-refile-targets '((org-agenda-files :maxlevel . 2))) + '(org-stuck-projects + '("+project-someday/-DONE" + ("WAITING" "TODO" "NEXT" "DELEGATED" "CANCELLED") + ("ignore" "someday") + "")) + '(package-selected-packages + '(yaml projectilex org-roam dashboard vertico rcirc-styles rubocopfmt consult-spotify consult orderless rust-mode git-link yasnippet markdown-mode deft org-brain origami xterm-color graphql-mode org-drill web-mode nix-mode yaml-mode projectile magit use-package)) + '(pcomplete-ignore-case t) + '(rcirc-server-alist + '(("irc.libera.chat" :nick "rcy" :port 6697 :user-name "rcy" :channels + ("#emb #rcirc #tasteslikeme #djfullmoon") + :encryption tls))) + '(scroll-bar-mode nil) + '(show-paren-mode t) + '(tool-bar-mode nil) + '(visible-bell t) + '(web-mode-code-indent-offset 2) + '(web-mode-enable-auto-quoting nil) + '(web-mode-enable-comment-interpolation t) + '(web-mode-enable-engine-detection t) + '(web-mode-markup-indent-offset 2) + '(webjump-sites + '((#("JIRA (Pn)" 0 9 + (face nil)) + . + [simple-query "https://precisionnutrition.atlassian.net/jira/your-work" "https://precisionnutrition.atlassian.net/browse/" ""]) + ("DuckDuckGo" . + [simple-query "duckduckgo.com" "duckduckgo.com/?q=" ""]) + ("Google" . + [simple-query "www.google.com" "www.google.com/search?q=" ""]) + ("Wikipedia" . + [simple-query "wikipedia.org" "wikipedia.org/wiki/" ""]))) + '(yas-global-mode t)) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; 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. + '(cursor ((t (:background "yellow")))) + '(highlight ((t (:background "dark green" :foreground "white" :underline nil)))) + '(region ((t (:extend t :background "#000077" :foreground "white"))))) From 028eeea02fbd23714255a6d936cc5eb6fe1de346 Mon Sep 17 00:00:00 2001 From: Ryan Yeske Date: Fri, 3 Jun 2022 20:40:03 -0700 Subject: [PATCH 9/9] add aspell as a dep (attempt at emacs startup) --- .github/workflows/makefile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 74f40b4..f51701c 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v3 - name: install deps - run: sudo apt-get install -y stow emacs + run: sudo apt-get install -y stow emacs aspell - name: stow run: make stow