Compare commits

..

No commits in common. "da9d8ee705edf8396e48d06347b1b56b283da7c9" and "32bd2244e04738ddbf1a3a751160f394efb0e769" have entirely different histories.

2 changed files with 10 additions and 102 deletions

View File

@ -15,9 +15,3 @@ eclipse.jdt.ls/test-runner/junit-platform-console-standalone.jar
org-roam.db org-roam.db
workspace workspace
elpy elpy
url/cache
mastodon.plstore
emojis
persist
elncache
*.eln

106
init.el
View File

@ -81,7 +81,7 @@
"Fira Code")) "Fira Code"))
;; default size to use when loading fonts ;; default size to use when loading fonts
(defvar my/font-size 24) (defvar my/font-size 16)
;; see if a given font exists ;; see if a given font exists
(defun my/has-font (font) (defun my/has-font (font)
@ -172,12 +172,6 @@
(setq all-the-icons-extension-icon-alist (setq all-the-icons-extension-icon-alist
(cons (cons "tal" icon) all-the-icons-extension-icon-alist)))) (cons (cons "tal" icon) all-the-icons-extension-icon-alist))))
;; install newer fonts
(use-package nerd-icons
:config (add-to-list
'nerd-icons-extension-icon-alist
'("tal" nerd-icons-faicon "nf-fa-recycle" :face nerd-icons-dcyan)))
;; show function names in modeline ;; show function names in modeline
(which-function-mode t) (which-function-mode t)
@ -216,9 +210,6 @@
;; distraction free writing ;; distraction free writing
(use-package writeroom-mode) (use-package writeroom-mode)
;; better hex editing
(use-package nhexl-mode)
;; C-c <left> restore old buffer view after popups ;; C-c <left> restore old buffer view after popups
(use-package winner (use-package winner
:config (winner-mode 1)) :config (winner-mode 1))
@ -264,7 +255,7 @@
:config (add-hook 'after-init-hook 'global-company-mode)) :config (add-hook 'after-init-hook 'global-company-mode))
(defvar use-lsp) (defvar use-lsp)
(setq use-lsp nil) (setq use-lsp (equal (system-name) "cult"))
;; when not using lsp use hippie expand ;; when not using lsp use hippie expand
(when (not use-lsp) (when (not use-lsp)
@ -285,8 +276,6 @@
try-complete-lisp-symbol-partially try-complete-lisp-symbol-partially
try-complete-lisp-symbol))) try-complete-lisp-symbol)))
(use-package eglot)
;; Posframe is a pop-up tool that must be manually installed for dap-mode ;; Posframe is a pop-up tool that must be manually installed for dap-mode
(use-package posframe (use-package posframe
:if use-lsp) :if use-lsp)
@ -438,8 +427,6 @@
;; ;; git-timemachine ;; ;; git-timemachine
;; (use-package git-timemachine) ;; (use-package git-timemachine)
(use-package haskell-mode)
;; json ;; json
(use-package json-mode) (use-package json-mode)
@ -455,25 +442,7 @@
:host github :host github
:repo "non/uxntal-mode") :repo "non/uxntal-mode")
:bind ("C-c d" . uxntal-explain-word) :bind ("C-c d" . uxntal-explain-word)
:bind ("C-c C-c" . compile) :config (setq uxntal-mode-strict-comments nil))
:config (setq uxntal-mode-strict-comments nil)
(setq compilation-read-command nil))
;; Helper for compilation. Close the compilation window if
;; there was no error at all.
(defun compilation-exit-autoclose (status code msg)
;; If M-x compile exists with a 0
(when (and (eq status 'exit) (zerop code))
;; then bury the *compilation* buffer, so that C-x b doesn't go there
(bury-buffer)
;; and delete the *compilation* window
(delete-window (get-buffer-window (get-buffer "*compilation*"))))
;; Always return the anticipated result of compilation-exit-message-function
(cons msg code))
;; Specify my function (maybe I should have done a lambda function)
(setq compilation-exit-message-function 'compilation-exit-autoclose)
;; lua ;; lua
(use-package lua-mode) (use-package lua-mode)
@ -484,6 +453,9 @@
:host github :host github
:repo "Kaali/pico8-mode")) :repo "Kaali/pico8-mode"))
;; C-c C-c for M-x compile
(global-set-key "\C-c\C-c" 'compile)
;; bazel ;; bazel
(use-package bazel (use-package bazel
:straight (bazel :type git :straight (bazel :type git
@ -542,45 +514,11 @@
:config :config
(setq elpher-default-url-type "gemini://")) (setq elpher-default-url-type "gemini://"))
(use-package gemini-mode)
;; mastodon
(use-package mastodon
:config
(setq mastodon-instance-url "https://merveilles.town"
mastodon-active-user "d6"
mastodon-tl--show-avatars t
mastodon-media--avatar-height 40
mastodon-media--enable-image-caching t))
;; read RFCs
(use-package rfc-mode
:config
(setq rfc-mode-directory (expand-file-name "~/w/rfc/")))
;; ;; pdf/latex ;; ;; pdf/latex
;; (use-package doc-view ;; (use-package doc-view
;; :custom doc-view-resolution 1600 ;; :custom doc-view-resolution 1600
;; doc-view-scale-internally nil) ;; doc-view-scale-internally nil)
;; view videos with mpv
(use-package mpv)
;; emoji support
(use-package emojify)
;; i-ching
(use-package i-ching)
;; dumb-jump?
;; (require 'dumb-jump)
;; (setq dumb-jump-force-searcher 'ag)
;; (add-hook 'xref-backend-functions #'dumb-jump-xref-activate)
;; shx
;; shell-pop
;; local copy in .emacs.d/lisp ;; local copy in .emacs.d/lisp
(require 'etags-select) (require 'etags-select)
@ -593,23 +531,15 @@
(setq whitespace-style '(newline tab-mark)) (setq whitespace-style '(newline tab-mark))
(setq-default indent-tabs-mode nil (setq-default indent-tabs-mode nil
tab-width 4 tab-width 4
c-basic-offset 4) c-basic-offset 4
(add-hook 'prog-mode-hook show-trailing-whitespace t)
(lambda () (progn
(setq show-trailing-whitespace t))))
;; handy function to toggle tabs ;; handy function to toggle tabs
(defun toggle-indent-tabs () (defun toggle-indent-tabs ()
"Toggle tabs on/off." "Toggle tabs on/off"
(interactive) (interactive)
(setq indent-tabs-mode (not indent-tabs-mode))) (setq indent-tabs-mode (not indent-tabs-mode)))
;;
(defun toggle-trailing-whitespace ()
"Toggle trailing whitespace visualization."
(interactive)
(setq show-trailing-whitespace (not show-trailing-whitespace)))
;; handy function to regenerate tags ;; handy function to regenerate tags
(defun my/regenerate-tags () (defun my/regenerate-tags ()
"Regenerate tags using ets." "Regenerate tags using ets."
@ -629,7 +559,7 @@
;; spell checking as you type in text-mode ;; spell checking as you type in text-mode
;(autoload 'flyspell-mode-on "flyspell" "On-the-fly ispell." t) ;(autoload 'flyspell-mode-on "flyspell" "On-the-fly ispell." t)
;;(add-hook 'text-mode-hook 'flyspell-mode-on) (add-hook 'text-mode-hook 'flyspell-mode-on)
;; use nicer diff colors ;; use nicer diff colors
(defun my/update-diff-colors () (defun my/update-diff-colors ()
@ -656,19 +586,3 @@
(provide 'init) (provide 'init)
;;; init.el ends here ;;; init.el ends here
(custom-set-variables
;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
)
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(gemini-heading-face-1 ((t (:inherit bold :height 1.4))))
'(gemini-heading-face-2 ((t (:inherit bold :height 1.2))))
'(gemini-heading-face-3 ((t (:inherit bold :height 1.1))))
'(markdown-code-face ((t nil))))