diff options
| -rwxr-xr-x | desktop/.config/sway/config | 2 | ||||
| -rw-r--r-- | emacs/.config/emacs/emacs-custom.el | 4 | ||||
| -rw-r--r-- | emacs/.config/emacs/init.el | 1 | ||||
| -rw-r--r-- | emacs/.config/emacs/lisp/kj-development.el | 55 | ||||
| -rw-r--r-- | emacs/.config/emacs/lisp/kj-init.el | 40 |
5 files changed, 94 insertions, 8 deletions
diff --git a/desktop/.config/sway/config b/desktop/.config/sway/config index 4e8b396..fc1581b 100755 --- a/desktop/.config/sway/config +++ b/desktop/.config/sway/config @@ -17,7 +17,7 @@ set $menu rofi -show run | xargs swaymsg exec -- default_border pixel 2 default_floating_border none -font pango:monospace 0 +# font pango:monospace 0 titlebar_padding 1 titlebar_border_thickness 0 diff --git a/emacs/.config/emacs/emacs-custom.el b/emacs/.config/emacs/emacs-custom.el index 5d1cf73..df4c014 100644 --- a/emacs/.config/emacs/emacs-custom.el +++ b/emacs/.config/emacs/emacs-custom.el @@ -10,7 +10,9 @@ "88267200889975d801f6c667128301af0bc183f3450c4b86138bfb23e8a78fb1" default)) '(safe-local-variable-values - '((eval sly-connect "localhost" 9090) (sly-port . 9090) + '((Package . CL-WHO) (Package . HUNCHENTOOT) (Base . 10) + (Package . CL-USER) (Syntax . COMMON-LISP) + (eval sly-connect "localhost" 9090) (sly-port . 9090) (checkdoc-package-keywords-flag)))) (custom-set-faces ;; custom-set-faces was added by Custom. diff --git a/emacs/.config/emacs/init.el b/emacs/.config/emacs/init.el index ddc40f1..9d07662 100644 --- a/emacs/.config/emacs/init.el +++ b/emacs/.config/emacs/init.el @@ -38,3 +38,4 @@ (cl-loop for path in (directory-files kj/module-directory) if (string-match "\\([^/]*\\).el" path) do (require (intern (match-string-no-properties 1 path)))) +(put 'set-goal-column 'disabled nil) diff --git a/emacs/.config/emacs/lisp/kj-development.el b/emacs/.config/emacs/lisp/kj-development.el index aefba85..da0d328 100644 --- a/emacs/.config/emacs/lisp/kj-development.el +++ b/emacs/.config/emacs/lisp/kj-development.el @@ -5,12 +5,26 @@ :config (setq eglot-events-buffer-size 0)) +(use-package with-editor + :hook ((shell-mode . with-editor-export-editor))) + +(use-package puni + :defer t + :init + (puni-global-mode) + (electric-pair-mode 1) + :config + (keymap-set puni-mode-map "C-w" nil) + :bind + (("C-<right>" . puni-slurp-forward) + ("C-<left>" . puni-slurp-backward))) + (add-hook 'prog-mode-hook 'subword-mode) ;; Only used to get better eglot snippets. (use-package yasnippet :config - (add-to-list 'yas-snippet-dirs (expand-file-name "yasnippets" user-emacs-directory)) + ;;(add-to-list 'yas-snippet-dirs (expand-file-name "yasnippets" user-emacs-directory)) (yas-global-mode)) (use-package tempel @@ -97,8 +111,8 @@ (use-package yaml-mode :mode "\\.\(yml|yaml\)\\'") -;; (use-package ansi-color -;; :hook (compilation-filter . ansi-color-compilation-filter)) +(use-package ansi-color :elpaca nil + :hook (compilation-filter . ansi-color-compilation-filter)) (use-package diff-hl :config @@ -116,8 +130,39 @@ (use-package ess) -(use-package sly +;; (use-package sly +;; :custom +;; (inferior-lisp-program "sbcl")) + +(use-package slime :custom - (inferior-lisp-program "sbcl")) + (inferior-lisp-program "sbcl") + :config + (defvar kj/slime-history-ring nil) + (defvar kj/slime-history-index nil) + (add-to-list 'consult-mode-histories + '(slime-repl-mode slime-repl-input-history + slime-repl-input-history-position + beginning-of-line)) + (load (expand-file-name "~/.cache/quicklisp/slime-helper.el")) + ;; Replace "sbcl" with the path to your implementation + (setq inferior-lisp-program "sbcl") + (slime-setup '(slime-fancy slime-asdf))) + +(use-package exercism) +(defun kj/run-exercism-test () + (interactive) + (let* ((directory default-directory) + (exercise + (and (string-match (rx (* anychar) "/" (group (+ (not "/"))) "/" eol) + directory) + (match-string 1 directory))) + (test-file (concat directory exercise "-test.lisp"))) + (unless (file-exists-p test-file) + (error "Not found: %s" test-file)) + (slime-switch-to-output-buffer) + (slime-cd directory) + (slime-load-file test-file) + (slime-eval (list (intern (concat exercise "-test:run-tests")))))) (provide 'kj-development) diff --git a/emacs/.config/emacs/lisp/kj-init.el b/emacs/.config/emacs/lisp/kj-init.el index 98738e9..eb49606 100644 --- a/emacs/.config/emacs/lisp/kj-init.el +++ b/emacs/.config/emacs/lisp/kj-init.el @@ -44,6 +44,7 @@ (use-package modus-themes :init + :disabled (load-theme 'modus-operandi-tinted) (load-theme 'modus-vivendi-tinted t t) :config @@ -54,6 +55,10 @@ '(avy-lead-face-1 ((t :inherit (bold modus-themes-subtle-green)))) '(avy-lead-face-2 ((t :inherit (bold modus-themes-subtle-magenta)))))) +(use-package deeper-blue :elpaca nil + :init + (load-theme 'deeper-blue)) + (use-package doom-themes) (setq alert-default-style 'libnotify) @@ -64,15 +69,48 @@ (setq use-dialog-box nil) (setq display-time-24hr-format t) -(display-battery-mode 1) +(use-package emacs + :elpaca nil + :defer 5 + :init + (require 'battery) + (when (and battery-status-function + (not (string-match-p "unknown" + (battery-format "%B" + (funcall battery-status-function))))) + (display-battery-mode 1))) +(setopt display-time-default-load-average nil) + (display-time-mode 1) (use-package doom-modeline :ensure t + :disabled :init (doom-modeline-mode 1) :config (setq doom-modeline-buffer-encoding 'nondefault)) +(use-package emacs + :elpaca nil + :defer 1 + :init + (defvar kj/minor-mode-alist-overrides + '((ws-butler "") + (gcmh-mode "") + (editorconfig-mode "") + (yas-minor-mode "") + (selected-minor-mode "") + (anzu-mode "") + (projectile-mode "") + (eldoc-mode "") + (mixed-pitch-mode "") + (which-key-mode ""))) + (defun kj/clean-mode-line () + (dolist (override kj/minor-mode-alist-overrides) + (if-let ((e (assoc (car override) minor-mode-alist))) + (setf (nth 1 e) (nth 1 override))))) + (add-to-list 'change-major-mode-hook 'kj/clean-mode-line)) + (use-package emojify :bind (("C-c C-i C-e" . emojify-insert-emoji)) |