Merge branch 'main' of github.com:maciej-szlosarczyk/emacs

.forgejo/workflows/demo.yml

@@ -0,0 +1,18 @@
+on: [push]
+jobs:
+  test:
+    name: "Test config on ${{matrix.node}}"
+    runs-on: docker
+    strategy:
+      matrix:
+        node: ["20"]
+
+    steps:
+      - name: Setup NodeJS
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{matrix.node}}
+      - name: Install eask
+        run: npm install -g eask
+      - name: Uninstall eask
+        run: npm uninstall -g eask

lang/gleam.el

@@ -10,9 +10,26 @@
 
 ;;; Code:
 
+(require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
+(require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el")
+(require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el")
+
+(use-package tree-sitter-indent :straight t)
+
 (use-package gleam-mode
-  :straight '(gleam-mode :type git :host github :repo "gleam-lang/gleam-mode")
+  :requires (tree-sitter-indent)
-  :mode "\\.gleam\\'")
+  :straight '(:type git
+              :host github
+              :repo "gleam-lang/gleam-mode"
+              :files ("gleam-mode.el" "tree-sitter-gleam")))
+
+(defun +custom-lang-gleam/activate-gleam-mode ()
+  "All things Gleam."
+  (set-indent 2)
+  (column-enforce-n 100)
+  (lsp))
+
+(add-hook 'gleam-mode-hook '+custom-lang-gleam/activate-gleam-mode)
 
 (provide '+custom-lang-gleam)
 ;;; gleam.el ends here

lang/other.el

@@ -17,6 +17,7 @@
 (use-package ansible :straight t :defer t)
 (use-package nginx-mode :straight t :defer t)
 (use-package jenkinsfile-mode :straight t :defer t)
+(use-package lua-mode :straight t :defer t)
 (use-package graphql-mode :straight t :defer t)
 (add-to-list 'auto-mode-alist '("\\.graphqls\\'" . graphql-mode))
 

lang/sh.el

@@ -2,6 +2,8 @@
 ;;; Commentary:
 ;;; Code:
 
+(use-package fish-mode :straight t :defer t)
+
 (add-to-list 'auto-mode-alist '("\\.zsh\\'" . sh-mode))
 (add-to-list 'auto-mode-alist '("\\zshrc\\'" . sh-mode))
 (add-to-list 'auto-mode-alist '("\\.zshrc\\'" . sh-mode))

pkg/dashboard.el

@@ -19,6 +19,7 @@
       '("Happy coding!" "I showed you my source code, pls respond"))
 
 (setq dashboard-startup-banner 'logo)
+(setq dashboard-projects-backend 'projectile)
 
 (setq dashboard-items '((recents  . 5)
                         ;; (bookmarks . 5)

pkg/themes.el

@@ -34,6 +34,7 @@
 (load-theme 'base16-darcula t t)
 (load-theme 'base16-solarflare t t)
 (load-theme 'base16-snazzy t t)
+(load-theme 'base16-onedark t t)
 (load-theme 'base16-gruvbox-dark-hard t t)
 (load-theme 'modus-vivendi t t)
 (load-theme 'base16-zenbones t t)
@@ -49,7 +50,7 @@
 
 (spaceline-emacs-theme)
 
-(enable-theme 'sanityinc-tomorrow-eighties)
+(enable-theme 'base16-onedark)
 
 (provide '+custom-pkg-themes)
 ;;; themes.el ends here

straight/versions/default.el

@@ -4,7 +4,7 @@
  ("apropospriate-theme" . "591e0c2bcc886009e84d9815bd64428b1b04a97b")
  ("autothemer" . "cb4d4b69f8bb1f8158d2311692b7607794b75829")
  ("avy" . "be612110cb116a38b8603df367942e2bb3d9bdbe")
- ("base16-emacs" . "c24d84b6c4794d1fc92429b6c70009434a137fe4")
+ ("base16-emacs" . "c7ea8116d331fd9ce913267489e7846c34795b38")
  ("buffer-move" . "e7800b3ab1bd76ee475ef35507ec51ecd5a3f065")
  ("bui.el" . "f3a137628e112a91910fd33c0cff0948fa58d470")
  ("caml-mode" . "47defafa2b08fb680e89bfee9cb9ce82bd9e3bcf")
@@ -20,11 +20,11 @@
  ("copilot.el" . "fd4d7e8c1e95aa9d3967b19905c9b8c3e03f6a5c")
  ("counsel-projectile" . "40d1e1d4bb70acb00fddd6f4df9778bf2c52734b")
  ("cyberpunk-theme.el" . "1fd5350ddfc53c30e6eef82af77c62d7c825df3c")
- ("dap-mode" . "2f0c5b28578ce65ec746e4084ba72ba5c652ea79")
+ ("dap-mode" . "11431a26bc4c8ca92b097dbdbcbdc9e3d7fb5583")
- ("dart-mode" . "dffc0209a19fdfac72b861d6adb445c1b6b464f7")
+ ("dart-mode" . "44beb628e5b4774062f7486008e06ae663e1ced0")
  ("dash-at-point" . "fba1a6f42ea51d05110e12c62bdced664059eb55")
- ("dash.el" . "5df7605da5a080df769d4f260034fb0e5e86a7a4")
+ ("dash.el" . "1de9dcb83eacfb162b6d9a118a4770b1281bcd84")
- ("deft" . "28be94d89bff2e1c7edef7244d7c5ba0636b1296")
+ ("deft" . "b369d7225d86551882568788a23c5497b232509c")
  ("dhall-mode" . "87ab69fe765d87b3bb1604a306a8c44d6887681d")
  ("diminish.el" . "fbd5d846611bad828e336b25d2e131d1bc06b83d")
  ("docker.el" . "d5255a65b7240d0038cc417f301b43df05a27922")
@@ -36,16 +36,17 @@
  ("eldoc" . "9465ed2e4ade33af370ef77462fae7e136a41967")
  ("elisp-refs" . "541a064c3ce27867872cf708354a65d83baf2a6d")
  ("elisp-tree-sitter" . "3cfab8a0e945db9b3df84437f27945746a43cc71")
- ("elixir-ts-mode" . "6db05baed9a34d01edf0bfdd804d951dedc6dccb")
+ ("elixir-ts-mode" . "b08d399e29714fe3d968db925aec0e1dfac54d89")
  ("emacs-aio" . "da93523e235529fa97d6f251319d9e1d6fc24a41")
  ("emacs-ansible" . "1d7de8d3ddac980715eebd87ee66859f8665b101")
  ("emacs-dashboard" . "ed1a6a452e26e2042faec2e073f1441d73a69447")
  ("emacs-direnv" . "14f74269af34f8c30ab4a521eff290b74460daed")
  ("emacs-elixir" . "00d6580a040a750e019218f9392cf9a4c2dac23a")
- ("emacs-fsharp-mode" . "b4d31c3da018cfbb3d1f9e6fd416d8777f0835bd")
+ ("emacs-fish" . "2526b1803b58cf145bc70ff6ce2adb3f6c246f89")
+ ("emacs-fsharp-mode" . "677d78c4d6cb574086408082dedbcaef04a85359")
  ("emacs-gradle-mode" . "e4d665d5784ecda7ddfba015f07c69be3cfc45f2")
- ("emacs-leuven-theme" . "28a2d1a3f22b894e1b973c62a6c78786cfe5ab1f")
+ ("emacs-leuven-theme" . "a504c1d20625fe373ad5ea4ff3d94ea3706cbb87")
- ("emacs-reformatter" . "76315e32a1c075d943184fe7b32f1cef98a8272a")
+ ("emacs-reformatter" . "0d29a04d69d47599e2cb7f1a8f8e897a2b592921")
  ("emacs-theme-darktooth" . "2358dd334b5dcb6dc9828422bd7bd1e4da556819")
  ("emacs-which-key" . "bc3c0c619f14f054a878c6e311eaf5ee1d39d471")
  ("emacsmirror-mirror" . "cee023f5e045f395a25d2056735900c6443cc401")
@@ -61,7 +62,7 @@
  ("gleam-mode" . "399cb373d4c55e97157de25807fbd0eba0ac0639")
  ("gnu-elpa-mirror" . "a96991f8c617a7949d20bd8cbbf73c113d550ff6")
  ("go-mode.el" . "6f4ff9ef874d151ed8d297a80f1bf27db5d9dbf0")
- ("graphql-mode" . "2183895ea7932359586c4bb99e8562c4aef3aaf7")
+ ("graphql-mode" . "ef4aecaeada77f46d1f0465ab62b9e9f537ec260")
  ("groovy-emacs-modes" . "7b8520b2e2d3ab1d62b35c426e17ac25ed0120bb")
  ("haskell-mode" . "43b4036bf02b02de75643a1a2a31e28efac1c50b")
  ("hcl-mode" . "37f2cb1bf6fb51fbf99d4fac256298fcd6d1dd24")
@@ -73,7 +74,7 @@
  ("js2-mode" . "dfbc6dad4cc9a4ce7ddb54efd1546af4346a2dc3")
  ("json-mode" . "bfd1557aaa20b7518b808fdc869f094b52205234")
  ("json-snatcher" . "b28d1c0670636da6db508d03872d96ffddbc10f2")
- ("jsonrpc" . "bc7aeb5294d16677ae70b72f8e5e9eea2d756164")
+ ("jsonrpc" . "812faa14545ba5c210f477d7a186ac03dbc17b5e")
  ("jump.el" . "55caa66a7cc6e0b1a76143fd40eff38416928941")
  ("keyfreq" . "c6955162307f37c2ac631d9daf118781009f8dda")
  ("kotlin-mode" . "fddd747e5b4736e8b27a147960f369b86179ddff")
@@ -100,15 +101,14 @@
  ("parseclj" . "6af22372e0fe14df882dd300b22b12ba2d7e00b0")
  ("parseedn" . "3407e4530a367b6c2b857dae261cdbb67a440aaa")
  ("pfuture" . "19b53aebbc0f2da31de6326c495038901bffb73c")
- ("php-mode" . "a0bcafbe30494b2c5a70c2fe05f2bb0859e83645")
+ ("php-mode" . "c8e4c16ca0d234f4a659713a94467f0c32ef4bc8")
- ("pkg-info" . "76ba7415480687d05a4353b27fea2ae02b8d9d61")
+ ("posframe" . "f4e9e509ba96ceb3c2b2b054957291607fb52651")
- ("posframe" . "017deece88360c7297265680d78a0bb316470716")
  ("powerline" . "c35c35bdf5ce2d992882c1f06f0f078058870d4a")
  ("projectile" . "0163b335a18af0f077a474d4dc6b36e22b5e3274")
  ("purescript-mode" . "eacc61aaafe6055b5f278c9843558f220f18b153")
- ("queue" . "7ab8f23e770f64f6bd28a44c46c8becfc1af03d8")
+ ("queue" . "df8a1a2ad77d57c25e7005f0add275c13f9db20f")
  ("rainbow-delimiters" . "f40ece58df8b2f0fb6c8576b527755a552a5e763")
- ("rainbow-mode" . "70ed10d410ef00c82c49b2ba41647930626d6218")
+ ("rainbow-mode" . "0740f31f300982534183a2f60b1918de418a6f2c")
  ("rbs-mode" . "fd766a943d5f1f0624e10ffce096b9aaba14a5f4")
  ("reason-mode" . "d657ff75572a8ea7eda6fe22ada3a2ebf5bc6119")
  ("rspec-mode" . "29df3d081c6a1cbdf840cd13d45ea1c100c5bbaa")
@@ -121,21 +121,22 @@
  ("slime-company" . "f20ecc4104d4c35052696e7e760109fb02060e72")
  ("spaceline" . "086420d16e526c79b67fc1edec4c2ae1e699f372")
  ("speed-type" . "b982ee6081a11837760eeaed73c4f413eefb07b1")
- ("spinner" . "67681b8f1580a7cd7a1aa49d78eaa30d11f7c178")
+ ("spinner" . "be1fcae967a3d3a00cb83ea764d8d329b45f8cd2")
  ("straight.el" . "b3760f5829dba37e855add7323304561eb57a3d4")
- ("swiper" . "4546ce0ca4655512387116b02939ef42ae21fb9f")
+ ("swiper" . "2a25a6fb5b081cb141c5eccac8ee58ab1feeb747")
  ("tablist" . "fcd37147121fabdf003a70279cf86fbe08cfac6f")
  ("terraform-mode" . "e8b57df8c2a3d3171f3768f60eb84067f553289c")
  ("transient" . "beecdc85799231338314bd20292f71fc8cd687e8")
  ("tree-sitter-langs" . "b6fd6758c7ea359363ab2761f3c4396981bb5329")
  ("treemacs" . "7cfe40a33c11a6477b43afe25e83cded6166aa5b")
  ("tuareg" . "1d53723e39f22ab4ab76d31f2b188a2879305092")
- ("undo-tree" . "f9e7eac16f674aa7ed8fa065401d26c0258a84f8")
+ ("typescript.el" . "1cf78d7ef8e0a1684a2cf265539c54ccff4068c0")
+ ("undo-tree" . "5e9f4c92348b3cfd6f140c1730294017dca4bc05")
  ("use-package" . "a6e856418d2ebd053b34e0ab2fda328abeba731c")
  ("visual-regexp.el" . "48457d42a5e0fe10fa3a9c15854f1f127ade09b5")
- ("web-mode" . "f19788e76c2359075975c20b8fda1f0b5080f042")
+ ("web-mode" . "005aa62d6f41fbf9bc045cac3b3b772716ee8ba7")
- ("with-editor" . "5db5f0eb2202f52d44f529fe00654c866bb64eb1")
+ ("with-editor" . "1b4526453ef6bdee30635f469aa26085c02b1ac1")
- ("yaml-mode" . "5b58248ab255dff6cfa4c4057a191bc4446ee5b6")
+ ("yaml-mode" . "7b5ce294fb15c2c8926fa476d7218aa415550a2a")
  ("yaml.el" . "70c4fcead97e9bd6594e418c922ae769818f4245")
  ("yasnippet" . "5b565c54b0dce77f6f0e4dd12111f43379e26d8d")
  ("yasnippet-snippets" . "e6ec9f1822913cea7dc67cde6aeb8f2625980950")