Compare commits
2 commits
6cc0a9871c
...
682c186722
Author | SHA1 | Date | |
---|---|---|---|
682c186722 | |||
bcf0d2b445 |
2 changed files with 143 additions and 125 deletions
|
@ -75,16 +75,15 @@
|
||||||
(use-package ob-tangle)
|
(use-package ob-tangle)
|
||||||
(let ((src (concat user-emacs-directory "init.org"))
|
(let ((src (concat user-emacs-directory "init.org"))
|
||||||
(tgt (concat user-emacs-directory "init.el")))
|
(tgt (concat user-emacs-directory "init.el")))
|
||||||
(if (file-newer-than-file-p src tgt)
|
(when (file-newer-than-file-p src tgt)
|
||||||
(progn
|
(delete-file tgt)
|
||||||
(message "init.org has been changed, tangling...")
|
|
||||||
(org-babel-tangle-file src tgt "emacs-lisp")
|
(org-babel-tangle-file src tgt "emacs-lisp")
|
||||||
;; this is a good time to check if the crafted-emacs repo is fresh
|
;; this is a good time to check if the crafted-emacs repo is fresh
|
||||||
;; - we just updated the init.org file so we expect changes.
|
;; - we just updated the init.org file so we expect changes.
|
||||||
;; - or this is the initial tangling and we need the repo to exist.
|
;; - or this is the initial tangling and we need the repo to exist.
|
||||||
(message "checking crafted emacs repo...")
|
(message "checking crafted emacs repo...")
|
||||||
(check-crafted-emacs-fresh-repo)
|
(check-crafted-emacs-fresh-repo)
|
||||||
)))
|
))
|
||||||
|
|
||||||
;; Configure Crafted Emacs
|
;; Configure Crafted Emacs
|
||||||
(setq crafted-package-system 'elpaca)
|
(setq crafted-package-system 'elpaca)
|
||||||
|
|
55
init.org
55
init.org
|
@ -145,7 +145,7 @@ metadata and get the version number from the JSON.
|
||||||
#+RESULTS:
|
#+RESULTS:
|
||||||
: pti-latest-github-release
|
: pti-latest-github-release
|
||||||
|
|
||||||
#+BEGIN_SRC emacs-lisp :results value
|
#+BEGIN_SRC emacs-lisp :tangle no :results value
|
||||||
(pti-latest-github-release "plantuml/plantuml")
|
(pti-latest-github-release "plantuml/plantuml")
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
|
@ -1260,8 +1260,7 @@ Here is a snapshot of the keybindings dd <2024-07-30 Tue>.
|
||||||
(auth-source-pass-get 'secret "customer/jira"))
|
(auth-source-pass-get 'secret "customer/jira"))
|
||||||
:bind (("C-c ig" . 'org-jira-get-issues)
|
:bind (("C-c ig" . 'org-jira-get-issues)
|
||||||
("C-c ip" . 'org-jira-get-projects)
|
("C-c ip" . 'org-jira-get-projects)
|
||||||
("C-c ij" . 'org-jira-get-issues-from-custom-jql)
|
("C-c ij" . 'org-jira-get-issues-from-custom-jql)))
|
||||||
("C-c cc" . 'org-jira-add-comment)))
|
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
#+RESULTS:
|
#+RESULTS:
|
||||||
|
@ -1453,6 +1452,9 @@ We can add a list of queries
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
** Programming Support Infrastructure
|
** Programming Support Infrastructure
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(report-time-since-load "Programming - Infrastructure")
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
*** Integration with LSP Servers for language support
|
*** Integration with LSP Servers for language support
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
@ -1499,12 +1501,12 @@ We can add a list of queries
|
||||||
*** Flymake Support
|
*** Flymake Support
|
||||||
|
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(after-load 'flymake
|
(defun pti-flymake-evil-keybindings ()
|
||||||
(evil-define-key 'normal flymake-mode-map
|
(evil-define-key 'normal flymake-mode-map
|
||||||
(kbd "]d") #'flymake-goto-next-error
|
(kbd "]d") #'flymake-goto-next-error
|
||||||
(kbd "[d") #'flymake-goto-prev-error
|
(kbd "[d") #'flymake-goto-prev-error))
|
||||||
))
|
|
||||||
|
|
||||||
|
(add-hook 'flymake-mode-hook #'pti-flymake-evil-keybindings)
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
|
|
||||||
|
@ -1634,6 +1636,10 @@ see also [[https://www.masteringemacs.org/article/how-to-get-started-tree-sitter
|
||||||
**** TODO Evaluate if Electric Return is still useful
|
**** TODO Evaluate if Electric Return is still useful
|
||||||
|
|
||||||
** Configure Selected Languages
|
** Configure Selected Languages
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(report-time-since-load "Programming - Selected Languages")
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
*** Rust Support
|
*** Rust Support
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
|
||||||
|
@ -1826,27 +1832,31 @@ Configure Geiser and Scheme
|
||||||
Map the keymap consistently to the eglot mappings.
|
Map the keymap consistently to the eglot mappings.
|
||||||
|
|
||||||
** Debugger Support
|
** Debugger Support
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(report-time-since-load "Programming - Debugger Support")
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
;; install DAP servers
|
;; install DAP servers
|
||||||
(setq snam-vscode-js-debug-dir (file-name-concat user-emacs-directory "dape/vscode-js-debug"))
|
(setq pti-vscode-js-debug-dir (file-name-concat user-emacs-directory "dape/vscode-js-debug"))
|
||||||
(defun snam-install-vscode-js-debug ()
|
(defun pti-install-vscode-js-debug ()
|
||||||
"Run installation procedure to install JS debugging support."
|
"Run installation procedure to install JS debugging support."
|
||||||
(interactive)
|
(interactive)
|
||||||
(mkdir snam-vscode-js-debug-dir t)
|
(mkdir pti-vscode-js-debug-dir t)
|
||||||
(let ((default-directory (expand-file-name snam-vscode-js-debug-dir)))
|
(let ((default-directory (expand-file-name pti-vscode-js-debug-dir)))
|
||||||
|
|
||||||
(vc-git-clone "https://github.com/microsoft/vscode-js-debug.git" "." nil)
|
(vc-git-clone "https://github.com/microsoft/vscode-js-debug.git" "." nil)
|
||||||
(report-time-since-load "git repository created")
|
(report-time-since-load "git repository created")
|
||||||
(call-process "npm" nil "*snam-install*" t "install")
|
(call-process "npm" nil "*pti-install*" t "install")
|
||||||
(report-time-since-load "npm dependencies installed")
|
(report-time-since-load "npm dependencies installed")
|
||||||
(call-process "npx" nil "*snam-install*" t "gulp" "dapDebugServer")
|
(call-process "npx" nil "*pti-install*" t "gulp" "dapDebugServer")
|
||||||
(report-time-since-load "vscode-js-debug installed")))
|
(report-time-since-load "vscode-js-debug installed")))
|
||||||
|
|
||||||
(setq snam-codelldb-dir (file-name-concat user-emacs-directory "dape/codelldb"))
|
(setq pti-codelldb-dir (file-name-concat user-emacs-directory "dape/codelldb"))
|
||||||
(defun snam-install-codelldb ()
|
(defun pti-install-codelldb ()
|
||||||
"Install Vadimcn.Vscode-Lldb DAP server for C/C++/RUST."
|
"Install Vadimcn.Vscode-Lldb DAP server for C/C++/RUST."
|
||||||
(interactive)
|
(interactive)
|
||||||
(let* ((default-directory snam-codelldb-dir)
|
(let* ((default-directory pti-codelldb-dir)
|
||||||
(arch (car (split-string system-configuration "-" nil nil)))
|
(arch (car (split-string system-configuration "-" nil nil)))
|
||||||
(os (pcase system-type
|
(os (pcase system-type
|
||||||
('windows-nt "windows")
|
('windows-nt "windows")
|
||||||
|
@ -1858,13 +1868,14 @@ Map the keymap consistently to the eglot mappings.
|
||||||
(mkdir default-directory t)
|
(mkdir default-directory t)
|
||||||
(url-copy-file release-url "codelldb.zip" t)
|
(url-copy-file release-url "codelldb.zip" t)
|
||||||
(report-time-since-load "codelldb archive downloaded")
|
(report-time-since-load "codelldb archive downloaded")
|
||||||
(call-process "unzip" nil "*snam-install*" t "codelldb.zip")
|
(call-process "unzip" nil "*pti-install*" t "codelldb.zip")
|
||||||
(report-time-since-load "codelldb installed")
|
(report-time-since-load "codelldb installed")
|
||||||
))
|
))
|
||||||
|
|
||||||
;; configure dape (dap-mode)
|
;; configure dape (dap-mode)
|
||||||
(use-package dape
|
(use-package dape
|
||||||
:ensure (dape :host github :repo "svaante/dape" :wait t)
|
:ensure (dape :host github :repo "svaante/dape" :wait t)
|
||||||
|
:defer 5
|
||||||
:config (progn
|
:config (progn
|
||||||
;; Use n for next etc. in REPL
|
;; Use n for next etc. in REPL
|
||||||
;; (setq dape-repl-use-shorthand t)
|
;; (setq dape-repl-use-shorthand t)
|
||||||
|
@ -1884,7 +1895,7 @@ Map the keymap consistently to the eglot mappings.
|
||||||
host "localhost"
|
host "localhost"
|
||||||
port 8123
|
port 8123
|
||||||
command "node"
|
command "node"
|
||||||
command-cwd ,(file-name-concat snam-vscode-js-debug-dir "dist")
|
command-cwd ,(file-name-concat pti-vscode-js-debug-dir "dist")
|
||||||
command-args ("src/dapDebugServer.js" "8123")
|
command-args ("src/dapDebugServer.js" "8123")
|
||||||
:type "pwa-node"
|
:type "pwa-node"
|
||||||
:request "launch"
|
:request "launch"
|
||||||
|
@ -1917,7 +1928,7 @@ Map the keymap consistently to the eglot mappings.
|
||||||
;; Replace vadimcn.vscode-lldb with the vsix directory you just extracted
|
;; Replace vadimcn.vscode-lldb with the vsix directory you just extracted
|
||||||
command ,(expand-file-name
|
command ,(expand-file-name
|
||||||
(file-name-concat
|
(file-name-concat
|
||||||
snam-codelldb-dir
|
pti-codelldb-dir
|
||||||
(concat "extension/adapter/codelldb"
|
(concat "extension/adapter/codelldb"
|
||||||
(if (eq system-type 'windows-nt)
|
(if (eq system-type 'windows-nt)
|
||||||
".exe"
|
".exe"
|
||||||
|
@ -1948,6 +1959,10 @@ Map the keymap consistently to the eglot mappings.
|
||||||
|
|
||||||
** Copilot Support
|
** Copilot Support
|
||||||
|
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(report-time-since-load "Programming - Copilot Support")
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(use-package copilot
|
(use-package copilot
|
||||||
:ensure (:host github :repo "zerolfx/copilot.el"
|
:ensure (:host github :repo "zerolfx/copilot.el"
|
||||||
|
@ -1974,6 +1989,10 @@ the moment.
|
||||||
|
|
||||||
** Gitlab Support
|
** Gitlab Support
|
||||||
|
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(report-time-since-load "Programming - Gitlab Support")
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(use-package gitlab-ci-mode
|
(use-package gitlab-ci-mode
|
||||||
:ensure (:host gitlab :repo "ptillemans/gitlab-ci-mode" :branch "fixes_2024")
|
:ensure (:host gitlab :repo "ptillemans/gitlab-ci-mode" :branch "fixes_2024")
|
||||||
|
|
Loading…
Reference in a new issue