From 4540ba03a69a27c48762fed8eaa8313208f9c8b4 Mon Sep 17 00:00:00 2001 From: opalvaults Date: Thu, 23 Dec 2021 09:55:44 -0800 Subject: [PATCH] Cleanup --- .config/emacs/init.el | 97 +++++++++++++++++++++++++++++++++++++------ Emacs.org | 23 +++++----- Nyxt.org | 1 - StumpWM.org | 59 ++++++++++++-------------- 4 files changed, 120 insertions(+), 60 deletions(-) diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 4c83e71..ae60534 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -157,7 +157,7 @@ "bd" #'kill-buffer ;; Terminal/Shell - "tt" #'term + "tt" #'vterm "te" #'eshell ;; Org @@ -256,8 +256,6 @@ (use-package consult :straight t :defer t - :bind - (("C-s" . consult-line)) :config (setq consult-narrow-key "<" @@ -278,6 +276,49 @@ ;; :config ;; (counsel-mode 1)) +(use-package marginalia + :straight t + :bind (("M-A" . marginalia-cycle) + :map minibuffer-local-map + ("M-A" . marginalia-cycle)) + :init + (marginalia-mode)) + +(use-package bufler :straight t) + +(use-package winner + :straight t) + +(use-package all-the-icons-dired :straight t) +(use-package dired-single :straight t) +(use-package dired-collapse :straight t) + +;; Make pretty colors! +(use-package dired-rainbow + :straight t + :after dired + :config + (dired-rainbow-define-chmod directory "#6cb2eb" "d.*") + (dired-rainbow-define html "#eb5286" ("css" "less" "sass" "scss" "htm" "html" "jhtm" "mht" "eml" "mustache" "xhtml")) + (dired-rainbow-define xml "#f2d024" ("xml" "xsd" "xsl" "xslt" "wsdl" "bib" "json" "msg" "pgn" "rss" "yaml" "yml" "rdata")) + (dired-rainbow-define document "#9561e2" ("docm" "doc" "docx" "odb" "odt" "pdb" "pdf" "ps" "rtf" "djvu" "epub" "odp" "ppt" "pptx")) + (dired-rainbow-define markdown "#ffed4a" ("org" "etx" "info" "markdown" "md" "mkd" "nfo" "pod" "rst" "tex" "textfile" "txt")) + (dired-rainbow-define database "#6574cd" ("xlsx" "xls" "csv" "accdb" "db" "mdb" "sqlite" "nc")) + (dired-rainbow-define media "#de751f" ("mp3" "mp4" "mkv" "MP3" "MP4" "avi" "mpeg" "mpg" "flv" "ogg" "mov" "mid" "midi" "wav" "aiff" "flac")) + (dired-rainbow-define image "#f66d9b" ("tiff" "tif" "cdr" "gif" "ico" "jpeg" "jpg" "png" "psd" "eps" "svg")) + (dired-rainbow-define log "#c17d11" ("log")) + (dired-rainbow-define shell "#f6993f" ("awk" "bash" "bat" "sed" "sh" "zsh" "vim")) + (dired-rainbow-define interpreted "#38c172" ("py" "ipynb" "rb" "pl" "t" "msql" "mysql" "pgsql" "sql" "r" "clj" "cljs" "scala" "js")) + (dired-rainbow-define compiled "#4dc0b5" ("asm" "cl" "lisp" "el" "c" "h" "c++" "h++" "hpp" "hxx" "m" "cc" "cs" "cp" "cpp" "go" "f" "for" "ftn" "f90" "f95" "f03" "f08" "s" "rs" "hi" "hs" "pyc" ".java")) + (dired-rainbow-define executable "#8cc4ff" ("exe" "msi")) + (dired-rainbow-define compressed "#51d88a" ("7z" "zip" "bz2" "tgz" "txz" "gz" "xz" "z" "Z" "jar" "war" "ear" "rar" "sar" "xpi" "apk" "xz" "tar")) + (dired-rainbow-define packaged "#faad63" ("deb" "rpm" "apk" "jad" "jar" "cab" "pak" "pk3" "vdf" "vpk" "bsp")) + (dired-rainbow-define encrypted "#ffed4a" ("gpg" "pgp" "asc" "bfe" "enc" "signature" "sig" "p12" "pem")) + (dired-rainbow-define fonts "#6cb2eb" ("afm" "fon" "fnt" "pfb" "pfm" "ttf" "otf")) + (dired-rainbow-define partition "#e3342f" ("dmg" "iso" "bin" "nrg" "qcow" "toast" "vcd" "vmdk" "bak")) + (dired-rainbow-define vc "#0074d9" ("git" "gitignore" "gitattributes" "gitmodules")) + (dired-rainbow-define-chmod executable-unix "#38c172" "-.*x.*")) + ;; Set org agenda dir (setq org-directory "~/Org/") @@ -473,6 +514,46 @@ (use-package magit :straight t) +(use-package eshell-git-prompt :straight t) + +(use-package eshell + :hook (eshell-first-time-mode . eshell-config) + :config + ;; Save command history when commands are entered + (add-hook 'eshell-pre-command-hook 'eshell-save-some-history) + ;; Truncate buffer for performance + (add-to-list 'eshell-output-filter-functions 'eshell-truncate-buffer) + + ;; Evil keybinds + (evil-define-key '(normal insert visual) eshell-mode-map (kbd "C-r") 'counsel-esh-history) + (evil-define-key '(normal insert visual) eshell-mode-map (kbd "") 'eshell-bol) + (evil-normalize-keymaps) + + (setq eshell-history-size 10000 + eshell-buffer-maximum-lines 10000 + eshell-hist-ignoredups t + eshell-scroll-to-bottom-on-input t) + + (with-eval-after-load 'esh-opt + (setq eshell-destroy-buffer-when-process-dies t) + (setq eshell-visual-commands '("htop" "zsh" "vim"))) + + (eshell-git-prompt-use-theme 'powerline)) + +(use-package vterm + :straight t + :commands vterm + :config + (setq term-prompt-regexp "^[^#$%>\n]*[#$%>] *") ;; Terminal prompt + (setq vterm-shell "zsh") + (setq vterm-max-scrollback 10000)) + +(use-package pdf-tools + :straight t + :ensure t + :config + (pdf-tools-install)) + ;; (use-package mu4e ;; :straight t ;; :config @@ -522,14 +603,4 @@ ;; erc-rename-buffers t ;; erc-track-exclude-server-buffer t)) -(use-package openwith - :straight t - :config - (setq openwith-associations - (list - (openwith-make-extension-regexp - '("pdf")) - "zathura" - '(file)))) - diff --git a/Emacs.org b/Emacs.org index f8659eb..8b75482 100644 --- a/Emacs.org +++ b/Emacs.org @@ -241,12 +241,9 @@ I really enjoy having a leader key and eschewing the Control and Alt keys entire "dv" #'describe-variable "ds" #'describe-symbol "dk" #'describe-key - "dp" #'describe-package + "dp" #'describe-package)) - ;; Windows - "wu" #'winner-undo - "wr" #'winner-redo)) -#+end_src + #+end_src *** Evil #+begin_src emacs-lisp @@ -684,6 +681,14 @@ Sets HTML strings to have the background of the color they represent. (setq vterm-shell "zsh") (setq vterm-max-scrollback 10000)) #+end_src +** PDF +#+begin_src emacs-lisp +(use-package pdf-tools + :straight t + :ensure t + :config + (pdf-tools-install)) +#+end_src ** E-Mail I've been using IceDove/Thunderbird for e-mail until I get around to making this a comparable solutions. @@ -742,11 +747,3 @@ Right now I'm pretty happy with Matrix bridging into IRC rooms so this will stay ;; erc-rename-buffers t ;; erc-track-exclude-server-buffer t)) #+end_src -* EXWM Configuration - -I basically live in Emacs so might as well let it handle my browsers. - -#+begin_src emacs-lisp - -#+end_src -:w diff --git a/Nyxt.org b/Nyxt.org index ee71e1e..ef5ecf0 100644 --- a/Nyxt.org +++ b/Nyxt.org @@ -138,7 +138,6 @@ Password managers are an essential feature and thankfully Nyxt allows me to inte ((password-interface (make-instance 'password:user-keepassxc-interface)))) #+end_src -* Ad Blocking * Misc ** Redirection I would like to keep expanding on these redirection functions so I can have native redirection away from sites that don't respect user privacy. diff --git a/StumpWM.org b/StumpWM.org index 8114b99..15a5e52 100644 --- a/StumpWM.org +++ b/StumpWM.org @@ -10,10 +10,10 @@ In my quest to make my computer a Lisp machine in its own right, I am using Stum ;; (defvar *sbcl-path* "~/.guix-home/profile/share/common-lisp/sbcl/") ;; StumpWM Modules -;; (stumpwm:add-to-load-path "~/.guix-home/profile/share/common-lisp/sbcl/stumpwm-swm-gaps") -;; (stumpwm:add-to-load-path "~/.guix-home/profile/share/common-lisp/sbcl/stumpwm-ttf-fonts") -;; (stumpwm:add-to-load-path "~/.guix-home/profile/share/common-lisp/sbcl/stumpwm-stumptray") -;; (stumpwm:add-to-load-path "~/.guix-home/profile/share/common-lisp/sbcl/stumpwm-kbd-layouts") +(stumpwm:add-to-load-path "~/.guix-home/profile/share/common-lisp/sbcl/stumpwm-swm-gaps") +(stumpwm:add-to-load-path "~/.guix-home/profile/share/common-lisp/sbcl/stumpwm-ttf-fonts") +(stumpwm:add-to-load-path "~/.guix-home/profile/share/common-lisp/sbcl/stumpwm-stumptray") +(stumpwm:add-to-load-path "~/.guix-home/profile/share/common-lisp/sbcl/stumpwm-kbd-layouts") #+end_src * Environment @@ -58,15 +58,15 @@ In my quest to make my computer a Lisp machine in its own right, I am using Stum * Keyboard ** Load Keyboard Layout Module #+begin_src lisp -;; (load-module "kbd-layouts") +(load-module "kbd-layouts") #+end_src ** Remap Caps Lock #+begin_src lisp :tangle yes -;; (setf kbd-layouts:*caps-lock-behavior* :esc) +(setf kbd-layouts:*caps-lock-behavior* :esc) #+end_src ** Xmodmap #+begin_src lisp -;; (run-shell-command "xmodmap ~/Dotfiles/.config/Xmodmap") +(run-shell-command "xmodmap ~/Dotfiles/.config/Xmodmap") #+end_src ** Keybinds @@ -106,11 +106,11 @@ In my quest to make my computer a Lisp machine in its own right, I am using Stum (define-key *top-map* (kbd "s-%") "gmove V") ;; Brightness and volume -;; (define-key *top-map* (kbd "XF86MonBrightnessDown") "run-shell-command brightnessctl set 5%-") -;; (define-key *top-map* (kbd "XF86MonBrightnessUp") "run-shell-command brightnessctl set +5%") -;; (define-key *top-map* (kbd "XF86AudioLowerVolume") "run-shell-command amixer set Master 3%- unmute") -;; (define-key *top-map* (kbd "XF86AudioRaiseVolume") "run-shell-command amixer set Master 3%+ unmute") -;; (define-key *top-map* (kbd "XF86AudioMute") "run-shell-command amixer set Master toggle") +(define-key *top-map* (kbd "XF86MonBrightnessDown") "run-shell-command brightnessctl set 5%-") +(define-key *top-map* (kbd "XF86MonBrightnessUp") "run-shell-command brightnessctl set +5%") +(define-key *top-map* (kbd "XF86AudioLowerVolume") "run-shell-command amixer set Master 3%- unmute") +(define-key *top-map* (kbd "XF86AudioRaiseVolume") "run-shell-command amixer set Master 3%+ unmute") +(define-key *top-map* (kbd "XF86AudioMute") "run-shell-command amixer set Master toggle") #+end_src * UI @@ -135,20 +135,17 @@ In my quest to make my computer a Lisp machine in its own right, I am using Stum #+end_src ** Gaps #+begin_src lisp - ;; (load-module "swm-gaps") - ;; (setf swm-gaps:*inner-gaps-size* 3) - ;; (run-commands "toggle-gaps-on") +(load-module "swm-gaps") +(setf swm-gaps:*inner-gaps-size* 3) +(run-commands "toggle-gaps-on") #+end_src ** Fonts #+begin_src lisp -;; Enable TTF fonts -;; (load-module "ttf-fonts") -;; (setf xft:*font-dirs* '("/home/opal/.guix-home/profile/share/fonts/")) -;; (setf clx-truetype:+font-cache-filename+ "/home/daviwil/.local/share/fonts/font-cache.sexp") -;; (xft:cache-fonts) - -;; (set-font (make-instance 'xft:font :family "Fira Mono" :subfamily "Regular" :size 16)) - +Enable TTF fonts +(load-module "ttf-fonts") +(setf xft:*font-dirs* '("/home/opal/.guix-home/profile/share/fonts/")) +(xft:cache-fonts) +(set-font (make-instance 'xft:font :family "Fira Mono" :subfamily "Regular" :size 16)) #+end_src ** Mode-Line #+begin_src lisp @@ -159,25 +156,21 @@ In my quest to make my computer a Lisp machine in its own right, I am using Stum ** System tray #+begin_src lisp - ;; ;; Add the system tray module - ;; (load-module "stumptray") - ;; (stumptray:stumptray) +;; Add the system tray module +(load-module "stumptray") + +(stumptray:stumptray) #+end_src * Applications #+begin_src lisp -;; (run-shell-command "feh --bg-scale ~/.dotfiles/backgrounds/samuel-ferrara-uOi3lg8fGl4-unsplash.jpg") -;; (run-shell-command "dunst") -;; (run-shell-command "nm-applet") -;; (run-shell-command "syncthing-gtk --minimized") -;; (run-shell-command "redshift -l 37.983810:23.727539 -t 6500:3500") (run-shell-command "emacs") #+end_src * Repl Start #+begin_src lisp -;; (require :slynk) -;; (slynk:create-server :dont-close t) +(require :slynk) +(slynk:create-server :dont-close t) #+end_src * Reference