Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
emacs_version:
- 29.4
- 30.1
- 30.2
- release-snapshot
ignore_warnings:
- false
Expand Down
33 changes: 25 additions & 8 deletions init.el
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

(defvar bootstrap-version)
(setq straight-use-package-by-default t)
(setq straight-recipes-gnu-elpa-url "git@github.com:emacsmirror/gnu_elpa.git")
(let ((bootstrap-file
(expand-file-name
"straight/repos/straight.el/bootstrap.el"
Expand Down Expand Up @@ -160,6 +161,7 @@
)

(use-package org
:straight (:type built-in)
:bind (("<f9>" . org-capture)
("<f10>" . org-agenda))

Expand Down Expand Up @@ -351,7 +353,8 @@
(add-to-list 'eglot-server-programs
`((python-ts-mode python-mode) . ,(eglot-alternatives
'(("poetry" "run" "pylsp")
("hatch" "run" "lsp:run"))))))
("hatch" "run" "lsp:run")
("uv" "run" "basedpyright-langserver" "--stdio"))))))

(use-package rustic
;; I would like to make rustic window for compilation narrower and
Expand Down Expand Up @@ -777,12 +780,12 @@
("M-<return>" . copilot-accept-completion-by-line)))

(use-package treesit-auto
:custom
(treesit-auto-install 'prompt)
;; avoid yaml-ts-mode as it's very broken https://www.reddit.com/r/emacs/comments/17gtxmr/indentation_in_yamltsmode/
(treesit-auto-langs '(python typescript terraform dockerfile))
:config
(global-treesit-auto-mode))
:custom
(treesit-auto-install 'prompt)
;; avoid yaml-ts-mode as it's very broken https://www.reddit.com/r/emacs/comments/17gtxmr/indentation_in_yamltsmode/
(treesit-auto-langs '(python typescript terraform dockerfile nix))
:config
(global-treesit-auto-mode))

(use-package terraform-ts-mode
:straight (:host github :type git :repo "kgrotel/terraform-ts-mode")
Expand All @@ -804,7 +807,7 @@
(auth-source-1password-enable))

(use-package shell-maker
:straight (:type git :host github :repo "xenodium/shell-maker" :files ("shell-maker*.el")))
:straight (:type git :host github :repo "xenodium/shell-maker" :files ("shell-maker*.el" "markdown-overlays.el")))

(use-package chatgpt-shell
:straight (:type git :host github :repo "xenodium/chatgpt-shell" :files ("chatgpt-shell*.el"))
Expand All @@ -824,3 +827,17 @@
(nerd-icons-font-family "Hack Nerd Font Mono"))

(use-package fish-mode)

(use-package nix-ts-mode
:mode "\\.nix\\'")

(use-package acp
:straight (:host github :type git :repo "xenodium/acp.el"))

(use-package agent-shell
:straight (:host github :type git :repo "xenodium/agent-shell"))


(use-package mise
:config
(global-mise-mode))
13 changes: 8 additions & 5 deletions straight/versions/default.el
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
(("aggressive-indent-mode" . "a437a45868f94b77362c6b913c5ee8e67b273c42")
(("acp.el" . "767f5222ea777cfecd44f3365fbc1362225f4e84")
("agent-shell" . "876643a92c732513d3a04f6823e3095e1755f664")
("aggressive-indent-mode" . "a437a45868f94b77362c6b913c5ee8e67b273c42")
("auth-source-1password" . "7bb8ad3507c58cc642b2ebbd7e57a91efab80e14")
("caddyfile-mode" . "fc41148f5a7eb320f070666f046fb9d88cf17680")
("chatgpt-shell" . "060fcba148d31d0320f018230efae4d3394a0ee3")
Expand Down Expand Up @@ -58,12 +60,13 @@
("markdown-mode" . "d2d960bec164e91e1a3315b176e2bcc324e63c95")
("melpa" . "ed2c4cc0ce0a0da9863f27cca3abf18f1c198e33")
("mermaid-mode" . "e74d4da7612c7a88e07f9dd3369e3b9fd36f396c")
("mise.el" . "60ef63466d07417a9ef956af363baae39c9ddf34")
("multiple-cursors.el" . "dd10cf2334333838e4550f091a75695448e26765")
("nerd-icons.el" . "546ee20caf825e65da4c5435d31f13d269ed2a81")
("nix-ts-mode" . "d769e53ccc0f40026fd11c7e23bf419c2caf4732")
("no-littering" . "ea15b1c607d4036ce37326bd5b4b2f4291ddfd60")
("nongnu-elpa" . "21d496592222284f3d624227fa41633e472e6a1c")
("orderless" . "96b74d2450ab4ab1a175d0e86c62f6695c4709b5")
("org" . "eebc9be7caecc9325d5e142410fbfc64ff0ae6cf")
("ox-jira.el" . "00184f8fdef02a3a359a253712e8769cbfbea3ba")
("paredit" . "af075775af91f2dbc63b915d762b4aec092946c4")
("poetry.el" . "1dff0d4a51ea8aff5f6ce97b154ea799902639ad")
Expand All @@ -76,12 +79,12 @@
("rustic" . "22a5ef8bfd5a34ced945c2722938eb29632371d4")
("s.el" . "dda84d38fffdaf0c9b12837b504b402af910d01d")
("seq" . "da86da9bf111f68fb81efd466d76d53af5aebc00")
("shell-maker" . "4b859e220b98b368baf74457b302c074635c7aa5")
("shell-maker" . "82dae7acab575a6454e1ff19654248982ee2c9e1")
("smart-mode-line" . "bbed708eb8393697e01ab2474dfb54d7c5ea7905")
("smartparens" . "c7519a1b69f196050a13e2230b7532893b077086")
("so-long" . "db3f4c502aa35567eecdf2d3b759edf08d19413d")
("spinner" . "fa117f0893788f3fe24673715a6b83bb34d238dd")
("straight.el" . "b3760f5829dba37e855add7323304561eb57a3d4")
("straight.el" . "0ad6fd8f37bd918c72989df18c76a68649f0a372")
("terraform-mode" . "5bdd734a87f67f6574664f63eb4d02a0bc74c0d0")
("terraform-ts-mode" . "985ed2a65dfdddcd50c5efd52975caff10ffb9d2")
("tide" . "6a35fe355f1442da34b976bf2decf008d6e4f991")
Expand All @@ -101,4 +104,4 @@
("yasnippet" . "fe1f4e0e96ce42d8668920335eb22c3c009dab3e")
("yasnippet-snippets" . "f1907ed38acc479e78d5c113810465e4d77d8604")
("zenburn-emacs" . "82112c64c5b0d3b866e82417dd730e0d0d7e1424"))
:gamma
:epsilon