aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcolin <colin@cicadas.surf>2024-03-24 08:25:39 -0700
committercolin <colin@cicadas.surf>2024-03-24 08:25:39 -0700
commitaff02e7167e77b375ff5c8b804eabdb27de2ced0 (patch)
tree411b96e6fd1bb581af6c9b9f7aaec57f360ed88e
parent070a0dc88d990fed0ca56efe18d852709e0533af (diff)
cleaning; disable company; tweaks; etc
-rw-r--r--init-el.org128
1 files changed, 45 insertions, 83 deletions
diff --git a/init-el.org b/init-el.org
index da2c2e3..3ac1027 100644
--- a/init-el.org
+++ b/init-el.org
@@ -143,25 +143,25 @@ I'm using melpa and elpa package archives.
(setq imenu-auto-rescan t)
(def-my-command my-leader-command
- '((?/ "[/] search buffer" swiper)
- (?? "[?] imenu" imenu-list)
- (?q "[q]uery replace" query-replace)
+ '((?/ "[/] swiper" swiper)
+ ;(?? "[?] imenu" imenu-list)
+ (?? "[?] replace" query-replace)
(?e "[e]diting" my-special-edit-command)
(?' "['] shell" persp-shell--jump-to-persp-shell)
(?b "[b]uffers" my-buffer-command)
(?c "[c]apture" org-capture)
- (?a "[a]applications" my-utilities-command)
+ (?a "[a]pplications" my-utilities-command)
(?t "[t]hemes" my-theme-cycler)
- (?T "toggle [T]heme set" toggle-theme-set)
+ (?T "[T]heme set" toggle-theme-set)
(?l "[l]ayouts" my-perspective-command)
(?w "[w]indows" my-window-comand)
- (?p "[p]rojectile" my-projectile-command)
- (?m "[m]ajor mode" my-major-mode-command)
- (?f "[f]ind file" find-file)
+ (?p "[p]roject" my-projectile-command)
+ (?m "[m]ajor" my-major-mode-command)
+ (?f "[f]ind-file" find-file)
(?d "[d]ired" dired)
;(?d "[d]irvish" dirvish)
- (?r "[r]eading menu" my-reading-command)
- (?s "[s]lime selection" my-lisp-switch-command)
+ (?r "[r]eading" my-reading-command)
+ (?s "[s]lime" my-lisp-switch-command)
(?h "[h]elp" helpful-at-point)))
@@ -206,7 +206,8 @@ I'm using melpa and elpa package archives.
(?s "[s]ecrets" toggle-secrets)
(?p "[p]omodoro" pomidor)
(?w "[w]eb browser (eww)" eww)
- (?C "[C]RDT" my-crdt-commands)))
+ (?C "[C]RDT" my-crdt-commands)
+ (?t "[t]asks" list-cicadas-tasks)))
#+end_src
@@ -435,8 +436,8 @@ e.g. here's one for org capture
#+name: ui-fonts
#+begin_src elisp :noweb no-export
(add-to-list 'default-frame-alist
- '(font . "Comic Mono-12")
- ;'(font . "Victor Mono-10") ;; uhh
+ ;'(font . "Comic Mono-11")
+ '(font . "Victor Mono-10") ;; uhh
)
@@ -491,7 +492,8 @@ e.g. here's one for org capture
(global-unset-key (kbd "<Scroll_Lock>"))
(global-unset-key "\C-z")
(setq-default indent-tabs-mode nil)
-(global-hl-line-mode 1)
+;(global-hl-line-mode 1)
+
#+end_src
@@ -602,18 +604,6 @@ e.g. here's one for org capture
#+name: modeline-config
#+begin_src elisp :noweb no-export :results none
-;; (package-install 'diminish)
-;; (require 'diminish)
-;; ;(diminish 'company-mode)
-;; ;(diminish 'paredit-mode)
-;; ;(diminish 'projectile-mode)
-;; (diminish 'ivy-mode)
-;; (diminish 'org-src-mode)
-;; (diminish 'eldoc-mode)
-;; (diminish 'beacon-mode)
-;; (diminish 'visual-line-mode)
-;; (diminish 'org-auto-tangle-mode)
-;; (diminish 'abbrev-mode)
(package-install 'feline)
@@ -643,7 +633,13 @@ e.g. here's one for org capture
(package-install 'autothemer) ;; for custom themes
(setq my-installed-themes
- '(yoshi-theme nimbus-theme flexoki-themes poet-theme))
+ '(poet-theme
+ naga-theme
+ yoshi-theme
+ seoul256-theme
+ grandshell-theme
+ weyland-yutani-theme
+ morgentau-theme))
(dolist (package my-installed-themes)
@@ -747,10 +743,12 @@ LOAD-THEME"
#+begin_src elisp :noweb no-export :results none
(setq *coding-themes*
- (append ;'( leuven yoshi nimbus )
- (themes-in-package 'flexoki-themes)
- ;(themes-in-package 'doom)
- ))
+ '(seoul256
+ yoshi
+ morgentau
+ weyland-yutani
+ grandshell
+ naga))
(setq *writing-themes*
(themes-in-package 'poet))
@@ -1301,15 +1299,14 @@ code in emacs org blocks.
#+name: software-dev-essentials
#+begin_src elisp :noweb no-export :results none
-(package-install 'flycheck)
(package-install 'magit)
;; see https://github.com/magit/magit/issues/5011
(require 'seq-25)
-(package-install 'paredit)
+
(package-install 'ag)
-(package-install 'lice)
+
#+end_src
@@ -1333,23 +1330,6 @@ code in emacs org blocks.
(?j "[j]ump to file" projectile-find-file-dwim)))
#+end_src
-*** Company
-
-#+name: company
-#+begin_src elisp :results none
-(package-install 'company)
-(add-hook 'after-init-hook 'global-company-mode)
-
-
-
-;; (setq company-frontends
-;; '(company-pseudo-tooltip-unless-just-one-frontend
-;; company-echo-metadata-frontend
-;; company-preview-frontend)
-;; company-auto-complete t)
-
-#+end_src
-
** Shell Config
The following defines commands used by my leader key ssytem to
@@ -1387,12 +1367,6 @@ association one shell with each perspective layout
(package-install 'paredit)
(package-install 'slime)
-(package-install 'slime-company)
-
-
-
-
-
#+end_src
@@ -1489,29 +1463,17 @@ from debian contrib
#+name: common-lisp-editing-config
#+begin_src elisp :results none
-(slime-setup '(slime-fancy slime-company
- slime-fuzzy slime-asdf
- ))
-
-(setq slime-company-completion 'fuzzy
- slime-company-after-completion 'slime-company-just-one-space)
-
-(package-install 'ac-slime)
-(require 'ac-slime)
-(add-hook 'slime-mode-hook 'set-up-slime-ac)
-(add-hook 'slime-repl-mode-hook 'set-up-slime-ac)
-(eval-after-load "auto-complete"
- '(add-to-list 'ac-modes 'slime-repl-mode 'lisp-mode))
+(slime-setup '(slime-fancy slime-fuzzy slime-asdf))
-
-(autoload 'enable-paredit-mode "paredit" "Turn on pseudo-structural editing of Lisp code." t)
+(autoload 'enable-paredit-mode "paredit"
+ "Turn on pseudo-structural editing of Lisp code." t)
(add-hook 'emacs-lisp-mode-hook #'enable-paredit-mode)
(add-hook 'eval-expression-minibuffer-setup-hook #'enable-paredit-mode)
(add-hook 'lisp-mode-hook #'enable-paredit-mode)
(add-hook 'lisp-interaction-mode-hook #'enable-paredit-mode)
(add-hook 'scheme-mode-hook #'enable-paredit-mode)
-
-
+(add-hook 'lisp-mode-hook (lambda ()
+ (local-set-key (kbd "<tab>") 'completion-at-point)))
(defun space-for-delimiter-after-$-p (delimiter endp)
(not (char-equal ?$ (char-before (point)))))
@@ -1531,13 +1493,6 @@ from debian contrib
(add-hook 'lisp-mode-hook 'linum-mode)
-;; The default imenu matcher is defined in the variable
-;; lisp-imenu-generic-expression as part of lisp-mode.el. I extend
-;; that definition here to treat anything that begins with ="def"= as
-;; a match.
-
-
-
(setq +common-lisp-package-template+
"
(defpackage #:%s
@@ -1642,7 +1597,7 @@ from debian contrib
(insert
(format +coalton-package-template+ name name)))
-(message "HERE HERE HERE")
+
#+end_src
@@ -1717,6 +1672,13 @@ Saves to a temp file and puts the filename in the kill ring."
#+RESULTS: helpful
: Package ‘helpful’ installed.
+* External Loads
+
+#+name: loads
+#+begin_src elisp :noweb no-export
+(load "~/.emacs.d/cicadas-config.el")
+#+end_src
+
* Tangle
This block of code tangles the above into =~/.emacs.d/init.el= which
@@ -1827,7 +1789,6 @@ emacs loads at startup.
<<crdt-config>>
<<software-dev-essentials>>
<<projectile>>
-<<company>>
<<shell-config>>
<<common-lisp-packages>>
@@ -1851,6 +1812,7 @@ emacs loads at startup.
<<buffer-export-config>>
<<helpful>>
+<<loads>>
(message "Tools and Utils Config Loaded")
#+end_src