|
|
@@ -23,8 +23,6 @@
|
|
|
(straight-use-package 'neotree)
|
|
|
(straight-use-package 'rust-mode)
|
|
|
(straight-use-package 'markdown-mode)
|
|
|
-(straight-use-package 'moe-theme)
|
|
|
-(straight-use-package 'ample-theme)
|
|
|
(straight-use-package 'slime)
|
|
|
(straight-use-package 'ac-slime)
|
|
|
(straight-use-package 'evil)
|
|
|
@@ -85,14 +83,22 @@
|
|
|
'(tal-mode :type git :host github
|
|
|
:repo "rafapaezbas/uxntal-mode"))
|
|
|
|
|
|
+;; Haskell Mode
|
|
|
+(straight-use-package 'haskell-mode)
|
|
|
+
|
|
|
;;; Cursor highlighter
|
|
|
(straight-use-package
|
|
|
'(beacon :type git :host github
|
|
|
:repo "Malabarba/beacon"))
|
|
|
(beacon-mode)
|
|
|
-
|
|
|
(global-set-key (kbd "C-c B") 'beacon-mode)
|
|
|
|
|
|
+;; Org to reveal.js presentations
|
|
|
+;; Docs: https://github.com/yjwen/org-reveal#configuration
|
|
|
+(straight-use-package 'org-reveal)
|
|
|
+(require 'ox-reveal)
|
|
|
+(setq org-reveal-root "file:///home/swatson/Repos/reveal.js")
|
|
|
+
|
|
|
;; Vimperator like hints for
|
|
|
;; file navigationaki2o/emacs-pophint
|
|
|
(straight-use-package
|
|
|
@@ -119,6 +125,8 @@
|
|
|
;; As such -- MELPA config
|
|
|
;; This config is likely redudant and I can use the straight
|
|
|
;; MELPA interface, but it's working and I'm too lazy to change it
|
|
|
+;; 2022/03/03 - Using straight MEPLA interface also surfaces this bug.
|
|
|
+;; Below seems to be only reliable cross platform way to include this package
|
|
|
(require 'package)
|
|
|
(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
|
|
|
(package-install 'symon)
|
|
|
@@ -155,7 +163,6 @@
|
|
|
;; (require 'ido)
|
|
|
(ido-mode t)
|
|
|
|
|
|
-
|
|
|
(require 'yasnippet)
|
|
|
|
|
|
;; Configure focus
|
|
|
@@ -241,8 +248,12 @@
|
|
|
(interactive)
|
|
|
(load-theme 'solarized-light))
|
|
|
|
|
|
+;; General is typically used for mode specific
|
|
|
+;; rebinds and keymaps, while 'global-set-key
|
|
|
+;; is still used for global keymaps for the sake of
|
|
|
+;; clarity
|
|
|
+(straight-use-package 'general)
|
|
|
;; Keybinds/macros
|
|
|
-;;(global-set-key (kbd "C-c C-q") #'mu-magit-kill-buffers magit-status-mode-map)
|
|
|
(global-set-key (kbd "C-c C-q") #'mu-magit-kill-buffers)
|
|
|
(global-set-key (kbd "C-c ;") 'comment-line)
|
|
|
(global-set-key (kbd "C-c b") 'fzf-switch-buffer)
|
|
|
@@ -252,7 +263,8 @@
|
|
|
(fzf-find-file)))
|
|
|
(global-set-key (kbd "C-c e") '(lambda ()
|
|
|
(interactive)
|
|
|
- (diff-hl-mode)
|
|
|
+ (diff-hl-modeca
|
|
|
+
|
|
|
(diff-hl-flydiff-mode)))
|
|
|
(global-set-key (kbd "C-c d") 'slime-describe-symbol)
|
|
|
(global-set-key (kbd "C-c M-r") 'slime-restart-inferior-lisp)
|
|
|
@@ -279,6 +291,7 @@
|
|
|
(interactive)
|
|
|
(switch-to-buffer "*Messages*")))
|
|
|
(global-set-key (kbd "C-c C-f") 'find-file-at-point)
|
|
|
+(global-set-key (kbd "C-c m p") 'mpc-toggle-play)
|
|
|
|
|
|
;;; Erc config
|
|
|
(setq erc-nick "speskk")
|
|
|
@@ -316,14 +329,12 @@
|
|
|
(load "~/Repos/dotfiles/emacs/elisp/rclone.el")
|
|
|
(global-set-key (kbd "C-c o") 'rclone-post-buffer)
|
|
|
(global-set-key (kbd "C-c C-o") 'rclone-get-org)
|
|
|
-(global-set-key (kbd "C-c C-P") 'post-region-to-pb)
|
|
|
-(global-set-key (kbd "C-c 2 p") 'display-pb)
|
|
|
-
|
|
|
|
|
|
;; Small helper functions
|
|
|
(load "~/Repos/dotfiles/emacs/elisp/helpers.el")
|
|
|
(global-set-key (kbd "C-c p") 'display-full-buffer-path)
|
|
|
-
|
|
|
+(global-set-key (kbd "C-c C-P") 'post-region-to-pb)
|
|
|
+(global-set-key (kbd "C-c 2 p") 'display-pb)
|
|
|
|
|
|
;; Disable bars
|
|
|
(menu-bar-mode -1)
|
|
|
@@ -357,7 +368,7 @@
|
|
|
(if (eq system-type 'gnu/linux)
|
|
|
(if (display-graphic-p)
|
|
|
(progn
|
|
|
-
|
|
|
+
|
|
|
(load (expand-file-name "~/quicklisp/slime-helper.el"))
|
|
|
(setq inferior-lisp-program (locate-file "sbcl" exec-path exec-suffixes 1))
|
|
|
;; https://emacs.stackexchange.com/questions/332/how-can-i-find-the-path-to-an-executable-with-emacs-lisp
|
