From 1a17d956b3ab69e12fb9dc320274efa27b45635f Mon Sep 17 00:00:00 2001 From: Uko Kokņevičs Date: Mon, 10 Mar 2025 02:31:33 +0200 Subject: Switch from straight.el to elpaca --- arkta/arkta-cosmetic.el | 37 ++++++------ arkta/arkta-progmodes.el | 142 ++++++++++++++++++++++++----------------------- arkta/arkta-project.el | 4 +- 3 files changed, 94 insertions(+), 89 deletions(-) (limited to 'arkta') diff --git a/arkta/arkta-cosmetic.el b/arkta/arkta-cosmetic.el index 0d329aa..6595b27 100644 --- a/arkta/arkta-cosmetic.el +++ b/arkta/arkta-cosmetic.el @@ -2,12 +2,13 @@ ;; Copyright © 2018-2025 Uko Koknevics (use-package ansi-color + :ensure nil :hook (compilation-filter . ansi-color-compilation-filter) :custom (ansi-color-for-compilation-mode t)) (use-package centaur-tabs - :straight t + :ensure t :demand t :init (defun arkta/disable-centaur-tabs-mode () @@ -32,7 +33,7 @@ (centaur-tabs-mode +1)) (use-package display-fill-column-indicator - :straight '(display-fill-column-indicator :type built-in) + :ensure nil :demand t :init (defun arkta/disable-dfci () @@ -42,7 +43,7 @@ (global-display-fill-column-indicator-mode +1)) (use-package display-line-numbers - :straight '(display-line-numbers :type built-in) + :ensure nil :demand t :init (defun arkta/disable-dln () @@ -52,7 +53,7 @@ (global-display-line-numbers-mode +1)) (use-package doom-modeline - :straight t + :ensure t :custom (doom-modeline-bar-width 4) (doom-modeline-battery t) @@ -68,12 +69,12 @@ (doom-modeline-mode +1)) (use-package emojify - :straight t + :ensure t :config (global-emojify-mode +1)) (use-package faces - :straight '(faces :type built-in) + :ensure nil :custom-face (default ((t (:weight ,(if +mac+ 'medium 'regular) :slant normal @@ -82,62 +83,62 @@ :height 130))))) (use-package git-gutter - :straight t + :ensure t :config (global-git-gutter-mode +1)) (use-package hl-line - :straight '(hl-line :type built-in) + :ensure nil :config (global-hl-line-mode +1)) (use-package hl-todo - :straight t + :ensure t :config (global-hl-todo-mode +1)) (use-package modus-themes - :straight t + :ensure t :config - (load-theme 'modus-operandi)) + (load-theme 'modus-operandi t)) (use-package nerd-icons - :straight t + :ensure t :init (defun arkta/nerd-icons-maybe-install-fonts () (when (and (display-graphic-p) (not (find-font (font-spec :family nerd-icons-font-family)))) ;; TODO: Maybe also reinstall them every month or so (nerd-icons-install-fonts t))) - :hook ((after-init server-after-make-frame) . arkta/nerd-icons-maybe-install-fonts)) + :hook ((elpaca-after-init server-after-make-frame) . arkta/nerd-icons-maybe-install-fonts)) (use-package rainbow-mode - :straight t + :ensure t :init (defun arkta/enable-rainbow () (rainbow-mode +1)) :hook (prog-mode . arkta/enable-rainbow)) (use-package scroll-bar - :straight '(scroll-bar :type built-in) + :ensure nil :defer t :config (scroll-bar-mode -1)) (use-package solaire-mode - :straight t + :ensure t :config (solaire-global-mode +1)) (use-package time - :straight '(time :type built-in) + :ensure nil :custom (display-time-default-load-average nil) :config (display-time-mode +1)) (use-package tool-bar - :straight '(tool-bar :type built-in) + :ensure nil :defer t :config (tool-bar-mode -1)) diff --git a/arkta/arkta-progmodes.el b/arkta/arkta-progmodes.el index 977fd92..ba9c066 100644 --- a/arkta/arkta-progmodes.el +++ b/arkta/arkta-progmodes.el @@ -1,9 +1,15 @@ ;; -*- lexical-binding: t -*- ;; Copyright © 2018-2025 Uko Koknevics +(use-package auto-compile + :after elisp-mode + :ensure t + :hook ((emacs-lisp-mode . auto-compile-on-load-mode) + (emacs-lisp-mode . auto-compile-on-save-mode))) + (use-package c-ts-mode :after treesit - :straight '(c-ts-mode :type built-in) + :ensure nil :mode ("\\.c\\'" ("\\.cpp\\'" . c++-ts-mode)) :init @@ -24,45 +30,47 @@ (use-package cmake-ts-mode :after treesit - :straight '(cmake-ts-mode :type built-in) + :ensure nil :mode ("CMakeLists\\.txt\\'" "\\.cmake\\'")) +(use-package company-mlton + :after (company sml) + :ensure '(company-mlton :host github + :repo "MatthewFluet/company-mlton") + :hook (sml-mode . company-mlton-init)) + (use-package csharp-mode :after treesit - :straight '(csharp-mode :type built-in) + :ensure nil :mode "\\.cs\\'") (use-package css-mode :after treesit - :straight '(css-mode :type built-in) + :ensure nil :mode "\\.css\\'") (use-package dart-mode - :straight t + :ensure t :mode "\\.dart\\'") (use-package dockerfile-ts-mode :after treesit - :straight '(dockerfile-ts-mode :type built-in) + :ensure nil :mode "Dockerfile\\'") (use-package ebuild-mode - :straight t + :ensure (ebuild-mode :host github + :repo "emacsmirror/ebuild-mode") :mode ("\\.ebuild\\'" "\\.eclass\\'")) (use-package elisp-mode - :straight '(elisp-mode :type built-in) - :mode ("\\.el\\'" . emacs-lisp-mode) - :init - (use-package auto-compile - :straight t - :hook ((emacs-lisp-mode . auto-compile-on-load-mode) - (emacs-lisp-mode . auto-compile-on-save-mode)))) + :ensure nil + :mode ("\\.el\\'" . emacs-lisp-mode)) (use-package elixir-mode - :straight t + :ensure t :mode "\\.exs?\\'" :init (defun arkta/elixir-setup () @@ -70,12 +78,12 @@ :hook (elixir-mode . arkta/elixir-setup)) (use-package gdscript-mode - :straight t + :ensure t :mode "\\.gd\\'") (use-package go-ts-mode :after treesit - :straight '(go-ts-mode :type built-in) + :ensure nil :mode "\\.go\\'" :init (defun arkta/go-setup () @@ -85,60 +93,56 @@ :hook (go-ts-mode . arkta/go-setup)) (use-package groovy-mode - :straight t + :ensure t :mode ("Jenkinsfile\\'" "\\.jenkinsfile\\'" "\\.gradle\\'" "\\.groovy\\'")) (use-package haskell-mode - :straight t + :ensure t :mode "\\.hs\\'") +(use-package htmlize + :ensure t) + (use-package java-ts-mode :after treesit - :straight '(java-ts-mode :type built-in) + :ensure nil :mode "\\.java\\'") (use-package js :after treesit - :straight '(js :type built-in) + :ensure nil :mode ("\\.js\\'" . js-ts-mode)) (use-package json-ts-mode :after treesit - :straight '(json-ts-mode :type built-in) + :ensure nil :mode "\\.json\\'") (use-package lisp-mode - :straight '(lisp-mode :type built-in) - :mode "\\.lisp\\'" - :init - (use-package slime - :straight t - :after lisp-mode - :commands slime - :custom - (inferior-lisp-program (executable-find "sbcl")))) + :ensure nil + :mode "\\.lisp\\'") (use-package lua-mode - :straight t + :ensure t :custom (lua-indent-level 4) :mode ("\\.lua\\'" "\\.rockspec\\'")) -(use-package makefile-mode - :straight '(make-mode :type built-in) +(use-package make-mode + :ensure nil :mode (("Makefile\\'" . makefile-gmake-mode) - "GNUmakefile\\'" - "\\.mk\\(\\.template\\)?\\'")) + ("GNUmakefile\\'" . makefile-mode) + ("\\.mk\\(\\.template\\)?\\'" . makefile-mode))) (use-package markdown-mode - :straight t + :ensure t :mode ("\\.md\\'" . gfm-mode)) (use-package nasm-mode - :straight t + :ensure t :mode ("\\.asm\\'" "\\.inc\\'") :init @@ -147,105 +151,105 @@ :hook (nasm-mode . arkta/nasm-setup)) (use-package nix-mode - :straight t + :ensure t :mode "\\.nix\\'") (use-package nxml-mode - :straight '(nxml-mode :type built-in) + :ensure nil :mode ("\\.xml\\'" "\\.plist\\'" "\\.svg\\'")) (use-package org - :straight '(org :type built-in) + :ensure nil + :after htmlize :bind (("C-c l" . org-store-link) ("C-c a" . org-agenda)) :mode ("\\.org\\'" . org-mode) - :init - (use-package htmlize - :straight t) :custom (org-agenda-files '("~/TODO.org")) (org-log-done t)) (use-package php-mode - :straight t + :ensure t :mode "\\.php\\'") (use-package pico8-mode - :straight '(pico8-mode :host github - :repo "Kaali/pico8-mode") + :ensure '(pico8-mode :host github + :repo "Kaali/pico8-mode") :mode "\\.p8\\'") (use-package prolog - :straight '(prolog :type built-in) + :ensure nil :mode ("\\.pl\\'" . prolog-mode)) (use-package python :after treesit - :straight '(python :type built-in) + :ensure nil :mode ("\\.py\\'" . python-ts-mode)) (use-package ruby-ts-mode :after treesit - :straight '(ruby-ts-mode :type built-in) + :ensure nil :mode "\\.rb\\'") (use-package rust-ts-mode :after treesit - :straight '(rust-ts-mode :type built-in) + :ensure nil :mode "\\.rs\\'") (use-package scala-mode - :straight t + :ensure t :mode "\\.scala\\'") (use-package scheme - :straight '(scheme :type built-in) + :ensure nil :commands scheme-mode :mode ("\\.scm\\'" . scheme-mode) :config (put 'module 'scheme-indent-function 2)) +(use-package slime + :ensure t + :after lisp-mode + :commands slime + :custom + (inferior-lisp-program (executable-find "sbcl"))) + (use-package smalltalk-mode - :straight t + :ensure t :mode "\\.st\\'") (use-package svelte-mode - :straight t + :ensure t :mode ("\\.svelte\\'" "\\.svx\\'")) (use-package sml-mode - :straight t - :mode "\\.sml\\'" - :init - (use-package company-mlton - :after company - :straight '(company-mlton :host github - :repo "MatthewFluet/company-mlton") - :hook (sml-mode . company-mlton-init))) + :ensure t + :mode "\\.sml\\'") (use-package toml-ts-mode :after treesit - :straight '(toml-ts-mode :type built-in) + :ensure nil :mode "\\.toml\\'") (use-package typescript-ts-mode :after treesit - :straight '(typescript-ts-mode :type built-in) + :ensure nil :mode "\\.ts\\'") -(use-package typst-mode - :straight t +(use-package typst-ts-mode + :after treesit + :ensure t :mode "\\.typ\\'") (use-package yaml-ts-mode :after treesit - :straight '(yaml-ts-mode :type built-in) + :ensure nil :mode ("\\.clang-\\(tidy\\|format\\)\\'" "\\.ya?ml\\'")) (use-package zig-mode - :straight t + :ensure t :mode "\\.zig\\'") (provide 'arkta-progmodes) diff --git a/arkta/arkta-project.el b/arkta/arkta-project.el index 4b75961..4b1d3f5 100644 --- a/arkta/arkta-project.el +++ b/arkta/arkta-project.el @@ -1,5 +1,5 @@ ;; -*- lexical-binding: t -*- -;; Copyright © 2018-2024 Uko Koknevics +;; Copyright © 2018-2025 Uko Koknevics ;; TODO: See about porting this to project.el: ;; (define-key map (kbd "a") #'projectile-find-other-file) @@ -102,7 +102,7 @@ A thin wrapper around `xref-references-in-directory'." (substring-no-properties (or (thing-at-point 'symbol) ""))) (use-package project - :straight '(project :type built-in) + :ensure nil :config (defvar-keymap arkta/project-prefix-map :parent project-prefix-map -- cgit v1.2.3