Compare commits
No commits in common. "682c1867223e6a286bd572d1cebb1c3f0965a57d" and "6cc0a9871c7160f769d4ebe60ff9d945ac931449" have entirely different histories.
682c186722
...
6cc0a9871c
2 changed files with 125 additions and 143 deletions
|
|
@ -75,15 +75,16 @@
|
|||
(use-package ob-tangle)
|
||||
(let ((src (concat user-emacs-directory "init.org"))
|
||||
(tgt (concat user-emacs-directory "init.el")))
|
||||
(when (file-newer-than-file-p src tgt)
|
||||
(delete-file tgt)
|
||||
(org-babel-tangle-file src tgt "emacs-lisp")
|
||||
;; 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.
|
||||
;; - or this is the initial tangling and we need the repo to exist.
|
||||
(message "checking crafted emacs repo...")
|
||||
(check-crafted-emacs-fresh-repo)
|
||||
))
|
||||
(if (file-newer-than-file-p src tgt)
|
||||
(progn
|
||||
(message "init.org has been changed, tangling...")
|
||||
(org-babel-tangle-file src tgt "emacs-lisp")
|
||||
;; 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.
|
||||
;; - or this is the initial tangling and we need the repo to exist.
|
||||
(message "checking crafted emacs repo...")
|
||||
(check-crafted-emacs-fresh-repo)
|
||||
)))
|
||||
|
||||
;; Configure Crafted Emacs
|
||||
(setq crafted-package-system 'elpaca)
|
||||
|
|
|
|||
247
init.org
247
init.org
|
|
@ -145,7 +145,7 @@ metadata and get the version number from the JSON.
|
|||
#+RESULTS:
|
||||
: pti-latest-github-release
|
||||
|
||||
#+BEGIN_SRC emacs-lisp :tangle no :results value
|
||||
#+BEGIN_SRC emacs-lisp :results value
|
||||
(pti-latest-github-release "plantuml/plantuml")
|
||||
#+END_SRC
|
||||
|
||||
|
|
@ -1260,7 +1260,8 @@ Here is a snapshot of the keybindings dd <2024-07-30 Tue>.
|
|||
(auth-source-pass-get 'secret "customer/jira"))
|
||||
:bind (("C-c ig" . 'org-jira-get-issues)
|
||||
("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
|
||||
|
||||
#+RESULTS:
|
||||
|
|
@ -1452,9 +1453,6 @@ We can add a list of queries
|
|||
#+END_SRC
|
||||
|
||||
** Programming Support Infrastructure
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(report-time-since-load "Programming - Infrastructure")
|
||||
#+END_SRC
|
||||
|
||||
*** Integration with LSP Servers for language support
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
|
|
@ -1501,12 +1499,12 @@ We can add a list of queries
|
|||
*** Flymake Support
|
||||
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(defun pti-flymake-evil-keybindings ()
|
||||
(evil-define-key 'normal flymake-mode-map
|
||||
(kbd "]d") #'flymake-goto-next-error
|
||||
(kbd "[d") #'flymake-goto-prev-error))
|
||||
(after-load 'flymake
|
||||
(evil-define-key 'normal flymake-mode-map
|
||||
(kbd "]d") #'flymake-goto-next-error
|
||||
(kbd "[d") #'flymake-goto-prev-error
|
||||
))
|
||||
|
||||
(add-hook 'flymake-mode-hook #'pti-flymake-evil-keybindings)
|
||||
#+END_SRC
|
||||
|
||||
|
||||
|
|
@ -1636,10 +1634,6 @@ see also [[https://www.masteringemacs.org/article/how-to-get-started-tree-sitter
|
|||
**** TODO Evaluate if Electric Return is still useful
|
||||
|
||||
** Configure Selected Languages
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(report-time-since-load "Programming - Selected Languages")
|
||||
#+END_SRC
|
||||
|
||||
*** Rust Support
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
|
||||
|
|
@ -1833,124 +1827,119 @@ Map the keymap consistently to the eglot mappings.
|
|||
|
||||
** Debugger Support
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(report-time-since-load "Programming - Debugger Support")
|
||||
#+END_SRC
|
||||
;; install DAP servers
|
||||
(setq snam-vscode-js-debug-dir (file-name-concat user-emacs-directory "dape/vscode-js-debug"))
|
||||
(defun snam-install-vscode-js-debug ()
|
||||
"Run installation procedure to install JS debugging support."
|
||||
(interactive)
|
||||
(mkdir snam-vscode-js-debug-dir t)
|
||||
(let ((default-directory (expand-file-name snam-vscode-js-debug-dir)))
|
||||
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
;; install DAP servers
|
||||
(setq pti-vscode-js-debug-dir (file-name-concat user-emacs-directory "dape/vscode-js-debug"))
|
||||
(defun pti-install-vscode-js-debug ()
|
||||
"Run installation procedure to install JS debugging support."
|
||||
(interactive)
|
||||
(mkdir pti-vscode-js-debug-dir t)
|
||||
(let ((default-directory (expand-file-name pti-vscode-js-debug-dir)))
|
||||
(vc-git-clone "https://github.com/microsoft/vscode-js-debug.git" "." nil)
|
||||
(report-time-since-load "git repository created")
|
||||
(call-process "npm" nil "*snam-install*" t "install")
|
||||
(report-time-since-load "npm dependencies installed")
|
||||
(call-process "npx" nil "*snam-install*" t "gulp" "dapDebugServer")
|
||||
(report-time-since-load "vscode-js-debug installed")))
|
||||
|
||||
(vc-git-clone "https://github.com/microsoft/vscode-js-debug.git" "." nil)
|
||||
(report-time-since-load "git repository created")
|
||||
(call-process "npm" nil "*pti-install*" t "install")
|
||||
(report-time-since-load "npm dependencies installed")
|
||||
(call-process "npx" nil "*pti-install*" t "gulp" "dapDebugServer")
|
||||
(report-time-since-load "vscode-js-debug installed")))
|
||||
(setq snam-codelldb-dir (file-name-concat user-emacs-directory "dape/codelldb"))
|
||||
(defun snam-install-codelldb ()
|
||||
"Install Vadimcn.Vscode-Lldb DAP server for C/C++/RUST."
|
||||
(interactive)
|
||||
(let* ((default-directory snam-codelldb-dir)
|
||||
(arch (car (split-string system-configuration "-" nil nil)))
|
||||
(os (pcase system-type
|
||||
('windows-nt "windows")
|
||||
('gnu/linux "linux")
|
||||
('darwin "darwin")
|
||||
(_ "unknown")))
|
||||
(version "1.10.0")
|
||||
(release-url (concat "https://github.com/vadimcn/codelldb/releases/download/v" version "/codelldb-" arch "-" os ".vsix")))
|
||||
(mkdir default-directory t)
|
||||
(url-copy-file release-url "codelldb.zip" t)
|
||||
(report-time-since-load "codelldb archive downloaded")
|
||||
(call-process "unzip" nil "*snam-install*" t "codelldb.zip")
|
||||
(report-time-since-load "codelldb installed")
|
||||
))
|
||||
|
||||
(setq pti-codelldb-dir (file-name-concat user-emacs-directory "dape/codelldb"))
|
||||
(defun pti-install-codelldb ()
|
||||
"Install Vadimcn.Vscode-Lldb DAP server for C/C++/RUST."
|
||||
(interactive)
|
||||
(let* ((default-directory pti-codelldb-dir)
|
||||
(arch (car (split-string system-configuration "-" nil nil)))
|
||||
(os (pcase system-type
|
||||
('windows-nt "windows")
|
||||
('gnu/linux "linux")
|
||||
('darwin "darwin")
|
||||
(_ "unknown")))
|
||||
(version "1.10.0")
|
||||
(release-url (concat "https://github.com/vadimcn/codelldb/releases/download/v" version "/codelldb-" arch "-" os ".vsix")))
|
||||
(mkdir default-directory t)
|
||||
(url-copy-file release-url "codelldb.zip" t)
|
||||
(report-time-since-load "codelldb archive downloaded")
|
||||
(call-process "unzip" nil "*pti-install*" t "codelldb.zip")
|
||||
(report-time-since-load "codelldb installed")
|
||||
))
|
||||
;; configure dape (dap-mode)
|
||||
(use-package dape
|
||||
:ensure (dape :host github :repo "svaante/dape" :wait t)
|
||||
:config (progn
|
||||
;; Use n for next etc. in REPL
|
||||
;; (setq dape-repl-use-shorthand t)
|
||||
|
||||
;; configure dape (dap-mode)
|
||||
(use-package dape
|
||||
:ensure (dape :host github :repo "svaante/dape" :wait t)
|
||||
:defer 5
|
||||
:config (progn
|
||||
;; Use n for next etc. in REPL
|
||||
;; (setq dape-repl-use-shorthand t)
|
||||
;; By default dape uses gdb keybinding prefix
|
||||
;; (setq dape-key-prefix "<space>d")
|
||||
(evil-define-key 'normal 'global (kbd "<leader>d") dape-global-map)
|
||||
|
||||
;; By default dape uses gdb keybinding prefix
|
||||
;; (setq dape-key-prefix "<space>d")
|
||||
(evil-define-key 'normal 'global (kbd "<leader>d") dape-global-map)
|
||||
;; Kill compile buffer on build success
|
||||
;; (add-hook 'dape-compile-compile-hooks 'kill-buffer)
|
||||
|
||||
;; Kill compile buffer on build success
|
||||
;; (add-hook 'dape-compile-compile-hooks 'kill-buffer)
|
||||
;; Projectile users
|
||||
;; (setq dape-cwd-fn 'projectile-project-root))
|
||||
(add-to-list 'dape-configs
|
||||
`(vscode-js-node
|
||||
modes (js-mode js-ts-mode typescript-mode typescript-ts-mode)
|
||||
host "localhost"
|
||||
port 8123
|
||||
command "node"
|
||||
command-cwd ,(file-name-concat snam-vscode-js-debug-dir "dist")
|
||||
command-args ("src/dapDebugServer.js" "8123")
|
||||
:type "pwa-node"
|
||||
:request "launch"
|
||||
:cwd dape-cwd-fn
|
||||
:program dape-find-file-buffer-default
|
||||
:outputCapture "console"
|
||||
:sourceMapRenames t
|
||||
:pauseForSourceMap nil
|
||||
:enableContentValidation t
|
||||
:autoAttachChildProcesses t
|
||||
:console "internalConsole"
|
||||
:killBehavior "forceful"))
|
||||
(add-to-list 'dape-configs
|
||||
`(delve
|
||||
modes (go-mode go-ts-mode)
|
||||
command "dlv"
|
||||
command-args ("dap" "--listen" "127.0.0.1:55878")
|
||||
command-cwd dape-cwd-fn
|
||||
host "127.0.0.1"
|
||||
port 55878
|
||||
:type "debug" ;; needed to set the adapterID correctly as a string type
|
||||
:request "launch"
|
||||
:cwd dape-cwd-fn
|
||||
:program dape-cwd-fn))
|
||||
(add-to-list 'dape-configs
|
||||
`(codelldb
|
||||
modes (c-mode c-ts-mode
|
||||
c++-mode c++-ts-mode
|
||||
rust-ts-mode rust-mode)
|
||||
;; Replace vadimcn.vscode-lldb with the vsix directory you just extracted
|
||||
command ,(expand-file-name
|
||||
(file-name-concat
|
||||
snam-codelldb-dir
|
||||
(concat "extension/adapter/codelldb"
|
||||
(if (eq system-type 'windows-nt)
|
||||
".exe"
|
||||
""))))
|
||||
host "localhost"
|
||||
port 5818
|
||||
command-args ("--port" "5818")
|
||||
:type "lldb"
|
||||
:request "launch"
|
||||
:cwd dape-cwd-fn
|
||||
:program dape-find-file))
|
||||
(add-to-list 'dape-configs
|
||||
`(debugpy
|
||||
modes (python-ts-mode python-mode)
|
||||
command "python"
|
||||
command-args ("-m" "debugpy.adapter")
|
||||
:type "executable"
|
||||
:request "launch"
|
||||
:cwd dape-cwd-fn
|
||||
:program dape-find-file-buffer-default))
|
||||
|
||||
;; Projectile users
|
||||
;; (setq dape-cwd-fn 'projectile-project-root))
|
||||
(add-to-list 'dape-configs
|
||||
`(vscode-js-node
|
||||
modes (js-mode js-ts-mode typescript-mode typescript-ts-mode)
|
||||
host "localhost"
|
||||
port 8123
|
||||
command "node"
|
||||
command-cwd ,(file-name-concat pti-vscode-js-debug-dir "dist")
|
||||
command-args ("src/dapDebugServer.js" "8123")
|
||||
:type "pwa-node"
|
||||
:request "launch"
|
||||
:cwd dape-cwd-fn
|
||||
:program dape-find-file-buffer-default
|
||||
:outputCapture "console"
|
||||
:sourceMapRenames t
|
||||
:pauseForSourceMap nil
|
||||
:enableContentValidation t
|
||||
:autoAttachChildProcesses t
|
||||
:console "internalConsole"
|
||||
:killBehavior "forceful"))
|
||||
(add-to-list 'dape-configs
|
||||
`(delve
|
||||
modes (go-mode go-ts-mode)
|
||||
command "dlv"
|
||||
command-args ("dap" "--listen" "127.0.0.1:55878")
|
||||
command-cwd dape-cwd-fn
|
||||
host "127.0.0.1"
|
||||
port 55878
|
||||
:type "debug" ;; needed to set the adapterID correctly as a string type
|
||||
:request "launch"
|
||||
:cwd dape-cwd-fn
|
||||
:program dape-cwd-fn))
|
||||
(add-to-list 'dape-configs
|
||||
`(codelldb
|
||||
modes (c-mode c-ts-mode
|
||||
c++-mode c++-ts-mode
|
||||
rust-ts-mode rust-mode)
|
||||
;; Replace vadimcn.vscode-lldb with the vsix directory you just extracted
|
||||
command ,(expand-file-name
|
||||
(file-name-concat
|
||||
pti-codelldb-dir
|
||||
(concat "extension/adapter/codelldb"
|
||||
(if (eq system-type 'windows-nt)
|
||||
".exe"
|
||||
""))))
|
||||
host "localhost"
|
||||
port 5818
|
||||
command-args ("--port" "5818")
|
||||
:type "lldb"
|
||||
:request "launch"
|
||||
:cwd dape-cwd-fn
|
||||
:program dape-find-file))
|
||||
(add-to-list 'dape-configs
|
||||
`(debugpy
|
||||
modes (python-ts-mode python-mode)
|
||||
command "python"
|
||||
command-args ("-m" "debugpy.adapter")
|
||||
:type "executable"
|
||||
:request "launch"
|
||||
:cwd dape-cwd-fn
|
||||
:program dape-find-file-buffer-default))
|
||||
|
||||
))
|
||||
))
|
||||
|
||||
|
||||
#+END_SRC
|
||||
|
|
@ -1959,10 +1948,6 @@ Map the keymap consistently to the eglot mappings.
|
|||
|
||||
** Copilot Support
|
||||
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(report-time-since-load "Programming - Copilot Support")
|
||||
#+END_SRC
|
||||
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package copilot
|
||||
:ensure (:host github :repo "zerolfx/copilot.el"
|
||||
|
|
@ -1989,10 +1974,6 @@ the moment.
|
|||
|
||||
** Gitlab Support
|
||||
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(report-time-since-load "Programming - Gitlab Support")
|
||||
#+END_SRC
|
||||
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package gitlab-ci-mode
|
||||
:ensure (:host gitlab :repo "ptillemans/gitlab-ci-mode" :branch "fixes_2024")
|
||||
|
|
|
|||
Loading…
Reference in a new issue