diff --git a/config/.bash_profile b/config/.bash_profile index 847ba35d4..2ace670b6 100644 --- a/config/.bash_profile +++ b/config/.bash_profile @@ -6,9 +6,7 @@ export XDG_CACHE_HOME="$HOME/.cache" export XDG_CONFIG_HOME="$HOME/.config" # X11 -export X11CFGDIR="$XDG_CONFIG_HOME/X11" -export X11LOGDIR="$XDG_CACHE_HOME/X11Logs" -export XINITRC="$X11CFGDIR/xinitrc" +export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc" # Sanely export XDG Base dir variables eval "$(sed 's/^[^#].*/export &/g;t;d' ~/.config/user-dirs.dirs)" @@ -27,21 +25,24 @@ export BASHRC="$HOME/.bashrc" export TERMINAL="st" export EDITOR="$HOME/.local/bin/lvim" export VISUAL="st -e $EDITOR" -export BROWSER="flatpak run org.mozilla.firefox" +export BROWSER="flatpak run com.brave.Browser" export VIEWER="zathura" # Bashrc source "$BASHRC" # Create config directories if they don't exist -if [ ! -d "$WGETDIR" ] || [ ! -d "$GNUPGHOME" ] || [ ! -d "$X11LOGDIR" ]; then - mkdir -p "$WGETDIR" "$GNUPGHOME" "$X11LOGDIR" +if [ ! -d "$WGETDIR" ] || [ ! -d "$GNUPGHOME" ]; then + mkdir -p "$WGETDIR" "$GNUPGHOME" +fi + +if [ ! -f "$WGETRC" ]; then + touch "$WGETRC" fi # Starting xsession -export X11LOGFILE=$(mktemp --tmpdir="$X11LOGDIR" X11LOG.XXXXXX) if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then - startx "$XINITRC" -- vt1 -keeptty &>> "$X11LOGFILE" + startx "$XINITRC" -- vt1 -keeptty &>> /dev/null logout fi diff --git a/config/.bashrc b/config/.bashrc index 1f462a8d0..ce2488c69 100644 --- a/config/.bashrc +++ b/config/.bashrc @@ -147,10 +147,10 @@ fi # function to detect os and assign aliases to package managers alias \ - pkg-update="sudo dnf update" \ - pkg-install="sudo dnf install" \ - pkg-remove="sudo dnf remove" \ - pkg-search="sudo dnf search" \ + pkg-update="sudo pacman -Syyu" \ + pkg-install="sudo pacman -S" \ + pkg-remove="sudo pacman -Rcns" \ + pkg-search="sudo pacman -Ss" \ # colorize grep output (good for log files) alias \ @@ -187,9 +187,9 @@ alias \ # audio alias \ mx="pulsemixer" \ - mk="musikcube" \ - ms="musikcube" \ - music="musikcube" + mk="cmus" \ + ms="cmus" \ + music="cmus" # power management alias \ diff --git a/config/.config/doom/config.el b/config/.config/doom/config.el new file mode 100644 index 000000000..189f71dcf --- /dev/null +++ b/config/.config/doom/config.el @@ -0,0 +1,310 @@ +(beacon-mode 1) + +(map! :leader + (:prefix ("b". "buffer") + :desc "List bookmarks" "L" #'list-bookmarks + :desc "Save current bookmarks to bookmark file" "w" #'bookmark-save)) + +(global-auto-revert-mode 1) +(setq global-auto-revert-non-file-buffers t) + +(evil-define-key 'normal ibuffer-mode-map + (kbd "f c") 'ibuffer-filter-by-content + (kbd "f d") 'ibuffer-filter-by-directory + (kbd "f f") 'ibuffer-filter-by-filename + (kbd "f m") 'ibuffer-filter-by-mode + (kbd "f n") 'ibuffer-filter-by-name + (kbd "f x") 'ibuffer-filter-disable + (kbd "g h") 'ibuffer-do-kill-lines + (kbd "g H") 'ibuffer-update) + +;; https://stackoverflow.com/questions/9547912/emacs-calendar-show-more-than-3-months +(defun drk/year-calendar (&optional year) + (interactive) + (require 'calendar) + (let* ( + (current-year (number-to-string (nth 5 (decode-time (current-time))))) + (month 0) + (year (if year year (string-to-number (format-time-string "%Y" (current-time)))))) + (switch-to-buffer (get-buffer-create calendar-buffer)) + (when (not (eq major-mode 'calendar-mode)) + (calendar-mode)) + (setq displayed-month month) + (setq displayed-year year) + (setq buffer-read-only nil) + (erase-buffer) + ;; horizontal rows + (dotimes (j 4) + ;; vertical columns + (dotimes (i 3) + (calendar-generate-month + (setq month (+ month 1)) + year + ;; indentation / spacing between months + (+ 5 (* 25 i)))) + (goto-char (point-max)) + (insert (make-string (- 10 (count-lines (point-min) (point-max))) ?\n)) + (widen) + (goto-char (point-max)) + (narrow-to-region (point-max) (point-max))) + (widen) + (goto-char (point-min)) + (setq buffer-read-only t))) + +(defun drk/scroll-year-calendar-forward (&optional arg event) + "Scroll the yearly calendar by year in a forward direction." + (interactive (list (prefix-numeric-value current-prefix-arg) + last-nonmenu-event)) + (unless arg (setq arg 0)) + (save-selected-window + (if (setq event (event-start event)) (select-window (posn-window event))) + (unless (zerop arg) + (let* ( + (year (+ displayed-year arg))) + (drk/year-calendar year))) + (goto-char (point-min)) + (run-hooks 'calendar-move-hook))) + +(defun drk/scroll-year-calendar-backward (&optional arg event) + "Scroll the yearly calendar by year in a backward direction." + (interactive (list (prefix-numeric-value current-prefix-arg) + last-nonmenu-event)) + (drk/scroll-year-calendar-forward (- (or arg 1)) event)) + +(map! :leader + :desc "Scroll year calendar backward" "" #'drk/scroll-year-calendar-backward + :desc "Scroll year calendar forward" "" #'drk/scroll-year-calendar-forward) + +(defalias 'year-calendar 'drk/year-calendar) + +(map! :leader + (:prefix ("c h" . "Help info from Clippy") + :desc "Clippy describes function under point" "f" #'clippy-describe-function + :desc "Clippy describes variable under point" "v" #'clippy-describe-variable)) + +;; With dired-open plugin, you can launch external programs for certain +;; extensions For example, I set all .png files to open in 'vimiv' and all .mp4 +;; files to open in 'mpv' +(setq dired-open-extensions '(("gif" . "vimiv") + ("jpg" . "vimiv") + ("png" . "vimiv") + ("mkv" . "mpv") + ("mp4" . "mpv"))) + +(evil-define-key 'normal peep-dired-mode-map + (kbd "j") 'peep-dired-next-file + (kbd "k") 'peep-dired-prev-file) +(add-hook 'peep-dired-hook 'evil-normalize-keymaps) + +(setq delete-by-moving-to-trash t + trash-directory "~/.local/share/Trash/files/") + +(setq doom-theme 'doom-gruvbox) +(map! :leader + :desc "Load new theme" "h t" #'load-theme) + +(use-package emojify + :hook (after-init . global-emojify-mode)) + +(setq doom-font (font-spec :family "Mononoki Nerd Font" :size 18) + doom-variable-pitch-font (font-spec :family "Mononoki Nerd Font" :size 18) + doom-big-font (font-spec :family "Mononoki Nerd Font" :size 24)) +(after! doom-themes + (setq doom-themes-enable-bold t + doom-themes-enable-italic t)) +(custom-set-faces! + '(font-lock-comment-face :slant italic) + '(font-lock-keyword-face :slant italic)) + +(defun drk/insert-todays-date (prefix) + (interactive "P") + (let ((format (cond + ((not prefix) "%A, %B %d, %Y") + ((equal prefix '(4)) "%m-%d-%Y") + ((equal prefix '(16)) "%Y-%m-%d")))) + (insert (format-time-string format)))) + +(require 'calendar) +(defun drk/insert-any-date (date) + "Insert DATE using the current locale." + (interactive (list (calendar-read-date))) + (insert (calendar-date-string date))) + +(map! :leader + (:prefix ("i d" . "Insert date") + :desc "Insert any date" "a" #'drk/insert-any-date + :desc "Insert todays date" "t" #'drk/insert-todays-date)) + +(setq ivy-posframe-display-functions-alist + '((swiper . ivy-posframe-display-at-point) + (complete-symbol . ivy-posframe-display-at-point) + (counsel-M-x . ivy-display-function-fallback) + (counsel-esh-history . ivy-posframe-display-at-window-center) + (counsel-describe-function . ivy-display-function-fallback) + (counsel-describe-variable . ivy-display-function-fallback) + (counsel-find-file . ivy-display-function-fallback) + (counsel-recentf . ivy-display-function-fallback) + (counsel-register . ivy-posframe-display-at-frame-bottom-window-center) + (dmenu . ivy-posframe-display-at-frame-top-center) + (nil . ivy-posframe-display)) + ivy-posframe-height-alist + '((swiper . 20) + (dmenu . 20) + (t . 10))) +(ivy-posframe-mode 1) ; 1 enables posframe-mode, 0 disables it. + +(map! :leader + (:prefix ("v" . "Ivy") + :desc "Ivy push view" "v p" #'ivy-push-view + :desc "Ivy switch view" "v s" #'ivy-switch-view)) + +(setq display-line-numbers-type t) +(map! :leader + :desc "Comment or uncomment lines" "TAB TAB" #'comment-line + (:prefix ("t" . "toggle") + :desc "Toggle line numbers" "l" #'doom/toggle-line-numbers + :desc "Toggle line highlight in frame" "h" #'hl-line-mode + :desc "Toggle line highlight globally" "H" #'global-hl-line-mode + :desc "Toggle truncate lines" "t" #'toggle-truncate-lines)) + +(custom-set-faces + '(markdown-header-face ((t (:inherit font-lock-function-name-face :weight bold :family "Mononoki Nerd Font")))) + '(markdown-header-face-1 ((t (:inherit markdown-header-face :height 1.7)))) + '(markdown-header-face-2 ((t (:inherit markdown-header-face :height 1.6)))) + '(markdown-header-face-3 ((t (:inherit markdown-header-face :height 1.5)))) + '(markdown-header-face-4 ((t (:inherit markdown-header-face :height 1.4)))) + '(markdown-header-face-5 ((t (:inherit markdown-header-face :height 1.3)))) + '(markdown-header-face-6 ((t (:inherit markdown-header-face :height 1.2))))) + +(set-face-attribute 'mode-line nil :font "Mononoki Nerd Font-14") +(setq doom-modeline-height 30 ;; sets modeline height + doom-modeline-bar-width 5 ;; sets right bar width + doom-modeline-persp-name t ;; adds perspective name to modeline + doom-modeline-persp-icon t) ;; adds folder icon next to persp name + +(xterm-mouse-mode 1) + +(map! :leader + :desc "Toggle neotree" "e" #'neotree-toggle) +(setq neo-theme 'nerd) +(setq neo-smart-open t) +(setq projectile-switch-project-action 'neotree-projectile-action) + +(map! :leader + (:prefix ("=" . "open file") + :desc "Edit agenda file" "a" #'(lambda () (interactive) (find-file "~/org/agenda.org")) + :desc "Edit doom config.org" "c" #'(lambda () (interactive) (find-file "~/.config/doom/config.org")) + :desc "Edit doom init.el" "i" #'(lambda () (interactive) (find-file "~/.config/doom/init.el")) + :desc "Edit doom packages.el" "p" #'(lambda () (interactive) (find-file "~/.config/doom/packages.el")))) + +(map! :leader + :desc "Org babel tangle" "m B" #'org-babel-tangle) +(after! org + (setq org-directory "~/org/" + org-agenda-files '("~/org/agenda.org") + org-default-notes-file (expand-file-name "notes.org" org-directory) + org-ellipsis " ▼ " + org-superstar-headline-bullets-list '("◉" "●" "○" "◆" "●" "○" "◆") + org-superstar-item-bullet-alist '((?+ . ?➤) (?- . ?✦)) ; changes +/- symbols in item lists + org-log-done 'time + org-hide-emphasis-markers t + ;; ex. of org-link-abbrev-alist in action + ;; [[arch-wiki:Name_of_Page][Description]] + org-link-abbrev-alist ; This overwrites the default Doom org-link-abbrev-list + '(("google" . "http://www.google.com/search?q=") + ("arch-wiki" . "https://wiki.archlinux.org/index.php/") + ("ddg" . "https://duckduckgo.com/?q=") + ("wiki" . "https://en.wikipedia.org/wiki/")) + org-todo-keywords ; This overwrites the default Doom org-todo-keywords + '((sequence + "TODO(t)" ; A task that is ready to be tackled + "BLOG(b)" ; Blog writing assignments + "GYM(g)" ; Things to accomplish at the gym + "GAME(j)" ; Things to accomplish at the gym + "PROJ(p)" ; A project that contains other tasks + "VIDEO(v)" ; Video assignments + "WAIT(w)" ; Something is holding up this task + "|" ; The pipe necessary to separate "active" states and "inactive" states + "DONE(d)" ; Task has been completed + "CANCELLED(c)" )))) ; Task has been cancelled + (setq org-agenda-custom-commands + '(("p" "Priority view" + ((tags "PRIORITY=\"A\"" + ((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done)) + (org-agenda-overriding-header "High priority unfinished tasks:"))) + (tags "PRIORITY=\"B\"" + ((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done)) + (org-agenda-overriding-header "Medium priority unfinished tasks:"))) + (tags "PRIORITY=\"C\"" + ((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done)) + (org-agenda-overriding-header "Low priority unfinished tasks:"))))) + ("i" "INTEC view" + ((tags "homeworks" + ((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done)) + (org-agenda-overriding-header "Pending homeworks:"))) + (tags "studies" + ((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done)) + (org-agenda-overriding-header "Pending studies:"))) + (tags "exam" + ((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done)) + (org-agenda-overriding-header "Pending exams:"))))) + )) + + (setq + org-agenda-block-separator 985827 + org-fancy-priorities-list '("󰈼" "󰈻" "󰈽") + org-priority-faces + '((?A :foreground "#fb4934" :weight bold) + (?B :foreground "#fabd2f" :weight bold) + (?C :foreground "#83a598" :weight bold))) + +(setq org-publish-use-timestamps-flag nil) +(setq org-export-with-broken-links t) + +(use-package! org-auto-tangle + :defer t + :hook (org-mode . org-auto-tangle-mode) + :config + (setq org-auto-tangle-default t)) + +(define-globalized-minor-mode global-rainbow-mode rainbow-mode + (lambda () (rainbow-mode 1))) +(global-rainbow-mode 1 ) + +(map! :leader + (:prefix ("r" . "registers") + :desc "Copy to register" "c" #'copy-to-register + :desc "Frameset to register" "f" #'frameset-to-register + :desc "Insert contents of register" "i" #'insert-register + :desc "Jump to register" "j" #'jump-to-register + :desc "List registers" "l" #'list-registers + :desc "Number to register" "n" #'number-to-register + :desc "Interactively choose a register" "r" #'counsel-register + :desc "View a register" "v" #'view-register + :desc "Window configuration to register" "w" #'window-configuration-to-register + :desc "Increment register" "+" #'increment-register + :desc "Point to register" "SPC" #'point-to-register)) + +(setq shell-file-name "/bin/bash" + vterm-max-scrollback 5000) +(map! :leader + :desc "Vterm popup toggle" "v t" #'+vterm/toggle) + +(defun prefer-horizontal-split () + (set-variable 'split-height-threshold nil t) + (set-variable 'split-width-threshold 40 t)) ; make this as low as needed +(add-hook 'markdown-mode-hook 'prefer-horizontal-split) +(map! :leader + :desc "Clone indirect buffer other window" "b c" #'clone-indirect-buffer-other-window) + +(map! :leader + (:prefix ("w" . "window") + :desc "Winner redo" "" #'winner-redo + :desc "Winner undo" "" #'winner-undo)) + +(map! :leader + :desc "Zap to char" "z" #'zap-to-char + :desc "Zap up to char" "Z" #'zap-up-to-char) + +(set-frame-parameter nil 'alpha-background 98) ; For current frame +(add-to-list 'default-frame-alist '(alpha-background . 98)) ; For all new frames henceforth diff --git a/config/.config/doom/config.org b/config/.config/doom/config.org new file mode 100644 index 000000000..965e5107f --- /dev/null +++ b/config/.config/doom/config.org @@ -0,0 +1,710 @@ +#+TITLE: DRK's Doom Emacs Config +#+AUTHOR: Clay Gomera (Drake) +#+DESCRIPTION: DRK's personal Doom Emacs config. +#+STARTUP: showeverything +#+PROPERTY: header-args :tangle config.el + +* TABLE OF CONTENTS :toc: +- [[#about-this-config][ABOUT THIS CONFIG]] +- [[#beacon][BEACON]] +- [[#bookmarks-and-buffers][BOOKMARKS AND BUFFERS]] + - [[#bookmarks][Bookmarks]] + - [[#buffers][Buffers]] + - [[#global-auto-revert][Global Auto Revert]] + - [[#keybindings-within-ibuffer-mode][Keybindings within ibuffer mode]] +- [[#calendar][CALENDAR]] +- [[#clippy][CLIPPY]] +- [[#dired][DIRED]] + - [[#keybindings-within-dired-with-peep-dired-mode-enabled][Keybindings Within Dired With Peep-Dired-Mode Enabled]] + - [[#making-deleted-files-go-to-trash-can][Making deleted files go to trash can]] +- [[#doom-theme][DOOM THEME]] +- [[#emojis][EMOJIS]] +- [[#fonts][FONTS]] +- [[#insert-date][INSERT DATE]] +- [[#ivy][IVY]] + - [[#ivy-posframe][IVY-POSFRAME]] + - [[#ivy-keybindings][IVY KEYBINDINGS]] +- [[#line-settings][LINE SETTINGS]] +- [[#markdown][MARKDOWN]] +- [[#modeline][MODELINE]] +- [[#mouse-support][MOUSE SUPPORT]] +- [[#neotree][NEOTREE]] +- [[#open-specific-files][OPEN SPECIFIC FILES]] +- [[#org-mode][ORG MODE]] + - [[#org-publish][Org-publish]] + - [[#org-auto-tangle][Org-auto-tangle]] +- [[#rainbow-mode][RAINBOW MODE]] +- [[#registers][REGISTERS]] +- [[#shells][SHELLS]] +- [[#splits][SPLITS]] +- [[#winner-mode][WINNER MODE]] +- [[#zap-to-char][ZAP TO CHAR]] +- [[#transparent][TRANSPARENT]] + +* ABOUT THIS CONFIG +This is my personal Doom Emacs config. Doom Emacs is a distribution of Emacs +that uses the "evil" keybindings (Vim keybindings) and includes a number of nice +extensions and a bit of configuration out of the box. I am maintaining this +config not just for myself, but also for those that want to explore some of what +is possible with Emacs. I will add a lot of examples of plugins and settings, +some of them I may not even use personally. I do this because many people +following me on YouTube look at my configs as "documentation". This config is +based on DistroTube's config. + +* BEACON +Never lose your cursor. When you scroll, your cursor will shine! This is a +global minor-mode. Turn it on everywhere with: + +#+begin_src emacs-lisp +(beacon-mode 1) +#+end_src + +* BOOKMARKS AND BUFFERS +Doom Emacs uses 'SPC b' for keybindings related to bookmarks and buffers. + +** Bookmarks +Bookmarks are somewhat like registers in that they record positions you can jump +to. Unlike registers, they have long names, and they persist automatically from +one Emacs session to the next. The prototypical use of bookmarks is to record +where you were reading in various files. + +#+BEGIN_SRC emacs-lisp +(map! :leader + (:prefix ("b". "buffer") + :desc "List bookmarks" "L" #'list-bookmarks + :desc "Save current bookmarks to bookmark file" "w" #'bookmark-save)) +#+END_SRC + +** Buffers +Regarding /buffers/, the text you are editing in Emacs resides in an object called +a /buffer/. Each time you visit a file, a buffer is used to hold the file’s text. +Each time you invoke Dired, a buffer is used to hold the directory listing. +/Ibuffer/ is a program that lists all of your Emacs /buffers/, allowing you to +navigate between them and filter them. + +| COMMAND | DESCRIPTION | KEYBINDING | +|-----------------+----------------------+------------| +| ibuffer | Launch ibuffer | SPC b i | +| kill-buffer | Kill current buffer | SPC b k | +| next-buffer | Goto next buffer | SPC b n | +| previous-buffer | Goto previous buffer | SPC b p | +| save-buffer | Save current buffer | SPC b s | + +** Global Auto Revert +A buffer can get out of sync with respect to its visited file on disk if that +file is changed by another program. To keep it up to date, you can enable Auto +Revert mode by typing M-x auto-revert-mode, or you can set it to be turned on +globally with 'global-auto-revert-mode'. I have also turned on Global Auto +Revert on non-file buffers, which is especially useful for 'dired' buffers. + +#+begin_src emacs-lisp +(global-auto-revert-mode 1) +(setq global-auto-revert-non-file-buffers t) +#+end_src + +** Keybindings within ibuffer mode + +| COMMAND | DESCRIPTION | KEYBINDING | +|-----------------------------------+----------------------------------------+------------| +| ibuffer-mark-forward | Mark the buffer | m | +| ibuffer-unmark-forward | Unmark the buffer | u | +| ibuffer-do-kill-on-deletion-marks | Kill the marked buffers | x | +| ibuffer-filter-by-content | Ibuffer filter by content | f c | +| ibuffer-filter-by-directory | Ibuffer filter by directory | f d | +| ibuffer-filter-by-filename | Ibuffer filter by filename (full path) | f f | +| ibuffer-filter-by-mode | Ibuffer filter by mode | f m | +| ibuffer-filter-by-name | Ibuffer filter by name | f n | +| ibuffer-filter-disable | Disable ibuffer filter | f x | +| ibuffer-do-kill-lines | Hide marked buffers | g h | +| ibuffer-update | Restore hidden buffers | g H | + +#+begin_src emacs-lisp +(evil-define-key 'normal ibuffer-mode-map + (kbd "f c") 'ibuffer-filter-by-content + (kbd "f d") 'ibuffer-filter-by-directory + (kbd "f f") 'ibuffer-filter-by-filename + (kbd "f m") 'ibuffer-filter-by-mode + (kbd "f n") 'ibuffer-filter-by-name + (kbd "f x") 'ibuffer-filter-disable + (kbd "g h") 'ibuffer-do-kill-lines + (kbd "g H") 'ibuffer-update) +#+end_src + +* CALENDAR +Let's make a 12-month calendar available so we can have a calendar app that, +when we click on time/date in xmobar, we get a nice 12-month calendar to view. + +#+begin_src emacs-lisp +;; https://stackoverflow.com/questions/9547912/emacs-calendar-show-more-than-3-months +(defun drk/year-calendar (&optional year) + (interactive) + (require 'calendar) + (let* ( + (current-year (number-to-string (nth 5 (decode-time (current-time))))) + (month 0) + (year (if year year (string-to-number (format-time-string "%Y" (current-time)))))) + (switch-to-buffer (get-buffer-create calendar-buffer)) + (when (not (eq major-mode 'calendar-mode)) + (calendar-mode)) + (setq displayed-month month) + (setq displayed-year year) + (setq buffer-read-only nil) + (erase-buffer) + ;; horizontal rows + (dotimes (j 4) + ;; vertical columns + (dotimes (i 3) + (calendar-generate-month + (setq month (+ month 1)) + year + ;; indentation / spacing between months + (+ 5 (* 25 i)))) + (goto-char (point-max)) + (insert (make-string (- 10 (count-lines (point-min) (point-max))) ?\n)) + (widen) + (goto-char (point-max)) + (narrow-to-region (point-max) (point-max))) + (widen) + (goto-char (point-min)) + (setq buffer-read-only t))) + +(defun drk/scroll-year-calendar-forward (&optional arg event) + "Scroll the yearly calendar by year in a forward direction." + (interactive (list (prefix-numeric-value current-prefix-arg) + last-nonmenu-event)) + (unless arg (setq arg 0)) + (save-selected-window + (if (setq event (event-start event)) (select-window (posn-window event))) + (unless (zerop arg) + (let* ( + (year (+ displayed-year arg))) + (drk/year-calendar year))) + (goto-char (point-min)) + (run-hooks 'calendar-move-hook))) + +(defun drk/scroll-year-calendar-backward (&optional arg event) + "Scroll the yearly calendar by year in a backward direction." + (interactive (list (prefix-numeric-value current-prefix-arg) + last-nonmenu-event)) + (drk/scroll-year-calendar-forward (- (or arg 1)) event)) + +(map! :leader + :desc "Scroll year calendar backward" "" #'drk/scroll-year-calendar-backward + :desc "Scroll year calendar forward" "" #'drk/scroll-year-calendar-forward) + +(defalias 'year-calendar 'drk/year-calendar) +#+end_src + +* CLIPPY +Gives us a popup box with "Clippy, the paper clip". You can make him say various +things by calling 'clippy-say' function. But the more useful functions of +clippy are the two describe functions provided: 'clippy-describe-function' and +'clippy-describe-variable'. Hit the appropriate keybinding while the point is +over a function/variable to call it. A popup with helpful clippy will appear, +telling you about the function/variable (using describe-function and +describe-variable respectively). + +| COMMAND | DESCRIPTION | KEYBINDING | +|--------------------------+---------------------------------------+------------| +| clippy-describe-function | /Clippy describes function under point/ | SPC c h f | +| clippy-describe-variable | /Clippy describes variable under point/ | SPC c h v | + +#+begin_src emacs-lisp +(map! :leader + (:prefix ("c h" . "Help info from Clippy") + :desc "Clippy describes function under point" "f" #'clippy-describe-function + :desc "Clippy describes variable under point" "v" #'clippy-describe-variable)) +#+end_src + +* DIRED +Dired is the file manager within Emacs. + +#+begin_src emacs-lisp +;; With dired-open plugin, you can launch external programs for certain +;; extensions For example, I set all .png files to open in 'vimiv' and all .mp4 +;; files to open in 'mpv' +(setq dired-open-extensions '(("gif" . "vimiv") + ("jpg" . "vimiv") + ("png" . "vimiv") + ("mkv" . "mpv") + ("mp4" . "mpv"))) +#+end_src + +** Keybindings Within Dired With Peep-Dired-Mode Enabled +If peep-dired is enabled, you will get image previews as you go up/down with 'j' +and 'k' + +| COMMAND | DESCRIPTION | KEYBINDING | +|----------------------+------------------------------------------+------------| +| peep-dired | /Toggle previews within dired/ | SPC d p | +| peep-dired-next-file | /Move to next file in peep-dired-mode/ | j | +| peep-dired-prev-file | /Move to previous file in peep-dired-mode/ | k | + +#+BEGIN_SRC emacs-lisp +(evil-define-key 'normal peep-dired-mode-map + (kbd "j") 'peep-dired-next-file + (kbd "k") 'peep-dired-prev-file) +(add-hook 'peep-dired-hook 'evil-normalize-keymaps) +#+END_SRC + +** Making deleted files go to trash can +#+begin_src emacs-lisp +(setq delete-by-moving-to-trash t + trash-directory "~/.local/share/Trash/files/") +#+end_src + +* DOOM THEME +Setting the theme to doom-one. To try out new themes, I set a keybinding for +counsel-load-theme with 'SPC h t'. + +#+BEGIN_SRC emacs-lisp +(setq doom-theme 'doom-gruvbox) +(map! :leader + :desc "Load new theme" "h t" #'load-theme) +#+END_SRC + +* EMOJIS +Emojify is an Emacs extension to display emojis. It can display github style +emojis like :smile: or plain ascii ones like :). + +#+begin_src emacs-lisp +(use-package emojify + :hook (after-init . global-emojify-mode)) +#+end_src + +* FONTS +Settings related to fonts within Doom Emacs: ++ 'doom-font' -- standard monospace font that is used for most things in Emacs. ++ 'doom-variable-pitch-font' -- variable font which is useful in some Emacs plugins. ++ 'doom-big-font' -- used in doom-big-font-mode; useful for presentations. ++ 'font-lock-comment-face' -- for comments. ++ 'font-lock-keyword-face' -- for keywords with special significanclike 'setq' in elisp. + +#+BEGIN_SRC emacs-lisp +(setq doom-font (font-spec :family "Mononoki Nerd Font" :size 18) + doom-variable-pitch-font (font-spec :family "Mononoki Nerd Font" :size 18) + doom-big-font (font-spec :family "Mononoki Nerd Font" :size 24)) +(after! doom-themes + (setq doom-themes-enable-bold t + doom-themes-enable-italic t)) +(custom-set-faces! + '(font-lock-comment-face :slant italic) + '(font-lock-keyword-face :slant italic)) +#+END_SRC + +* INSERT DATE +Some custom functions to insert the date. The function 'insert-todays-date' can +be used one of three different ways: (1) just the keybinding without the +universal argument prefix, (2) with one universal argument prefix, or (3) with +two universal argument prefixes. The universal argument prefix is 'SPC-u' in +Doom Emacs (C-u in standard GNU Emacs). The function 'insert-any-date' only +outputs to one format, which is the same format as 'insert-todays-date' without +a prefix. + +| COMMAND | EXAMPLE OUTPUT | KEYBINDING | +|------------------------+---------------------------+-----------------------| +| drk/insert-todays-date | Friday, November 19, 2021 | SPC i d t | +| drk/insert-todays-date | 11-19-2021 | SPC u SPC i d t | +| drk/insert-todays-date | 2021-11-19 | SPC u SPC u SPC i d t | +| drk/insert-any-date | Friday, November 19, 2021 | SPC i d a | + +#+begin_src emacs-lisp +(defun drk/insert-todays-date (prefix) + (interactive "P") + (let ((format (cond + ((not prefix) "%A, %B %d, %Y") + ((equal prefix '(4)) "%m-%d-%Y") + ((equal prefix '(16)) "%Y-%m-%d")))) + (insert (format-time-string format)))) + +(require 'calendar) +(defun drk/insert-any-date (date) + "Insert DATE using the current locale." + (interactive (list (calendar-read-date))) + (insert (calendar-date-string date))) + +(map! :leader + (:prefix ("i d" . "Insert date") + :desc "Insert any date" "a" #'drk/insert-any-date + :desc "Insert todays date" "t" #'drk/insert-todays-date)) +#+end_src + +* IVY +Ivy is a generic completion mechanism for Emacs. + +** IVY-POSFRAME +Ivy-posframe is an ivy extension, which lets ivy use posframe to show its +candidate menu. Some of the settings below involve: ++ ivy-posframe-display-functions-alist -- sets the display position for specific + programs ++ ivy-posframe-height-alist -- sets the height of the list displayed for + specific programs + +Available functions (positions) for 'ivy-posframe-display-functions-alist' ++ ivy-posframe-display-at-frame-center ++ ivy-posframe-display-at-window-center ++ ivy-posframe-display-at-frame-bottom-left ++ ivy-posframe-display-at-window-bottom-left ++ ivy-posframe-display-at-frame-bottom-window-center ++ ivy-posframe-display-at-point ++ ivy-posframe-display-at-frame-top-center + +=NOTE:= If the setting for 'ivy-posframe-display' is set to 'nil' (false), +anything that is set to 'ivy-display-function-fallback' will just default to +their normal position in Doom Emacs (usually a bottom split). However, if this +is set to 't' (true), then the fallback position will be centered in the window. + +#+BEGIN_SRC emacs-lisp +(setq ivy-posframe-display-functions-alist + '((swiper . ivy-posframe-display-at-point) + (complete-symbol . ivy-posframe-display-at-point) + (counsel-M-x . ivy-display-function-fallback) + (counsel-esh-history . ivy-posframe-display-at-window-center) + (counsel-describe-function . ivy-display-function-fallback) + (counsel-describe-variable . ivy-display-function-fallback) + (counsel-find-file . ivy-display-function-fallback) + (counsel-recentf . ivy-display-function-fallback) + (counsel-register . ivy-posframe-display-at-frame-bottom-window-center) + (dmenu . ivy-posframe-display-at-frame-top-center) + (nil . ivy-posframe-display)) + ivy-posframe-height-alist + '((swiper . 20) + (dmenu . 20) + (t . 10))) +(ivy-posframe-mode 1) ; 1 enables posframe-mode, 0 disables it. +#+END_SRC + +** IVY KEYBINDINGS +By default, Doom Emacs does not use 'SPC v', so the format I use for these +bindings is 'SPC v' plus 'key'. + +#+BEGIN_SRC emacs-lisp +(map! :leader + (:prefix ("v" . "Ivy") + :desc "Ivy push view" "v p" #'ivy-push-view + :desc "Ivy switch view" "v s" #'ivy-switch-view)) +#+END_SRC + +* LINE SETTINGS +I set comment-line to 'SPC TAB TAB' which is a rather comfortable keybinding for +me on my ZSA Moonlander keyboard. The standard Emacs keybinding for +comment-line is 'C-x C-;'. The other keybindings are for commands that toggle +on/off various line-related settings. Doom Emacs uses 'SPC t' for "toggle" +commands, so I choose 'SPC t' plus 'key' for those bindings. + +| COMMAND | DESCRIPTION | KEYBINDING | +|--------------------------+-------------------------------------------+-------------| +| comment-line | /Comment or uncomment lines/ | SPC TAB TAB | +| hl-line-mode | /Toggle line highlighting in current frame/ | SPC t h | +| global-hl-line-mode | /Toggle line highlighting globally/ | SPC t H | +| doom/toggle-line-numbers | /Toggle line numbers/ | SPC t l | +| toggle-truncate-lines | /Toggle truncate lines/ | SPC t t | + +#+BEGIN_SRC emacs-lisp +(setq display-line-numbers-type t) +(map! :leader + :desc "Comment or uncomment lines" "TAB TAB" #'comment-line + (:prefix ("t" . "toggle") + :desc "Toggle line numbers" "l" #'doom/toggle-line-numbers + :desc "Toggle line highlight in frame" "h" #'hl-line-mode + :desc "Toggle line highlight globally" "H" #'global-hl-line-mode + :desc "Toggle truncate lines" "t" #'toggle-truncate-lines)) +#+END_SRC + +* MARKDOWN + +#+begin_src emacs-lisp +(custom-set-faces + '(markdown-header-face ((t (:inherit font-lock-function-name-face :weight bold :family "Mononoki Nerd Font")))) + '(markdown-header-face-1 ((t (:inherit markdown-header-face :height 1.7)))) + '(markdown-header-face-2 ((t (:inherit markdown-header-face :height 1.6)))) + '(markdown-header-face-3 ((t (:inherit markdown-header-face :height 1.5)))) + '(markdown-header-face-4 ((t (:inherit markdown-header-face :height 1.4)))) + '(markdown-header-face-5 ((t (:inherit markdown-header-face :height 1.3)))) + '(markdown-header-face-6 ((t (:inherit markdown-header-face :height 1.2))))) +#+end_src + +* MODELINE +The modeline is the bottom status bar that appears in Emacs windows. For more +information on what is available to configure in the Doom modeline, check out: +https://github.com/seagle0128/doom-modeline + +#+begin_src emacs-lisp +(set-face-attribute 'mode-line nil :font "Mononoki Nerd Font-14") +(setq doom-modeline-height 30 ;; sets modeline height + doom-modeline-bar-width 5 ;; sets right bar width + doom-modeline-persp-name t ;; adds perspective name to modeline + doom-modeline-persp-icon t) ;; adds folder icon next to persp name +#+end_src + +* MOUSE SUPPORT +Adding mouse support in the terminal version of Emacs. + +#+begin_src emacs-lisp +(xterm-mouse-mode 1) +#+end_src + +* NEOTREE +1. SPC + e to toggle neotree +2. Make neotree prettier +3. Every time when the neotree window is opened, let it find current file and jump to node. +4. When running ‘projectile-switch-project’ (SPC p p), ‘neotree’ will change root automatically. + +#+begin_src emacs-lisp +(map! :leader + :desc "Toggle neotree" "e" #'neotree-toggle) +(setq neo-theme 'nerd) +(setq neo-smart-open t) +(setq projectile-switch-project-action 'neotree-projectile-action) +#+end_src + +* OPEN SPECIFIC FILES +Keybindings to open files that I work with all the time using the find-file +command, which is the interactive file search that opens with 'C-x C-f' in GNU +Emacs or 'SPC f f' in Doom Emacs. These keybindings use find-file +non-interactively since we specify exactly what file to open. The format I use +for these bindings is 'SPC =' plus 'key' since Doom Emacs does not use 'SPC ='. + +| PATH TO FILE | DESCRIPTION | KEYBINDING | +|--------------------------------+-----------------------+------------| +| ~/org/agenda.org | /Edit agenda file/ | SPC = a | +| ~/.config/doom/config.org" | /Edit doom config.org/ | SPC = c | +| ~/.config/doom/init.el" | /Edit doom init.el/ | SPC = i | +| ~/.config/doom/packages.el" | /Edit doom packages.el/ | SPC = p | + +#+BEGIN_SRC emacs-lisp +(map! :leader + (:prefix ("=" . "open file") + :desc "Edit agenda file" "a" #'(lambda () (interactive) (find-file "~/org/agenda.org")) + :desc "Edit doom config.org" "c" #'(lambda () (interactive) (find-file "~/.config/doom/config.org")) + :desc "Edit doom init.el" "i" #'(lambda () (interactive) (find-file "~/.config/doom/init.el")) + :desc "Edit doom packages.el" "p" #'(lambda () (interactive) (find-file "~/.config/doom/packages.el")))) +#+END_SRC + +* ORG MODE +I wrapped most of this block in (after! org). Without this, my settings might +be evaluated too early, which will result in my settings being overwritten by +Doom's defaults. I have also enabled org-journal, org-superstar and org-roam by +adding (+journal +pretty +roam2) to the org section of my Doom Emacs init.el. + +#+BEGIN_SRC emacs-lisp +(map! :leader + :desc "Org babel tangle" "m B" #'org-babel-tangle) +(after! org + (setq org-directory "~/org/" + org-agenda-files '("~/org/agenda.org") + org-default-notes-file (expand-file-name "notes.org" org-directory) + org-ellipsis " ▼ " + org-superstar-headline-bullets-list '("◉" "●" "○" "◆" "●" "○" "◆") + org-superstar-item-bullet-alist '((?+ . ?➤) (?- . ?✦)) ; changes +/- symbols in item lists + org-log-done 'time + org-hide-emphasis-markers t + ;; ex. of org-link-abbrev-alist in action + ;; [[arch-wiki:Name_of_Page][Description]] + org-link-abbrev-alist ; This overwrites the default Doom org-link-abbrev-list + '(("google" . "http://www.google.com/search?q=") + ("arch-wiki" . "https://wiki.archlinux.org/index.php/") + ("ddg" . "https://duckduckgo.com/?q=") + ("wiki" . "https://en.wikipedia.org/wiki/")) + org-todo-keywords ; This overwrites the default Doom org-todo-keywords + '((sequence + "TODO(t)" ; A task that is ready to be tackled + "BLOG(b)" ; Blog writing assignments + "GYM(g)" ; Things to accomplish at the gym + "GAME(j)" ; Things to accomplish at the gym + "PROJ(p)" ; A project that contains other tasks + "VIDEO(v)" ; Video assignments + "WAIT(w)" ; Something is holding up this task + "|" ; The pipe necessary to separate "active" states and "inactive" states + "DONE(d)" ; Task has been completed + "CANCELLED(c)" )))) ; Task has been cancelled + (setq org-agenda-custom-commands + '(("p" "Priority view" + ((tags "PRIORITY=\"A\"" + ((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done)) + (org-agenda-overriding-header "High priority unfinished tasks:"))) + (tags "PRIORITY=\"B\"" + ((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done)) + (org-agenda-overriding-header "Medium priority unfinished tasks:"))) + (tags "PRIORITY=\"C\"" + ((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done)) + (org-agenda-overriding-header "Low priority unfinished tasks:"))))) + ("i" "INTEC view" + ((tags "homeworks" + ((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done)) + (org-agenda-overriding-header "Pending homeworks:"))) + (tags "studies" + ((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done)) + (org-agenda-overriding-header "Pending studies:"))) + (tags "exam" + ((org-agenda-skip-function '(org-agenda-skip-entry-if 'todo 'done)) + (org-agenda-overriding-header "Pending exams:"))))) + )) + + (setq + org-agenda-block-separator 985827 + org-fancy-priorities-list '("󰈼" "󰈻" "󰈽") + org-priority-faces + '((?A :foreground "#fb4934" :weight bold) + (?B :foreground "#fabd2f" :weight bold) + (?C :foreground "#83a598" :weight bold))) +#+END_SRC + +** Org-publish +#+begin_src emacs-lisp +(setq org-publish-use-timestamps-flag nil) +(setq org-export-with-broken-links t) +#+end_src + +** Org-auto-tangle +=org-auto-tangle= allows you to add the option =#+auto_tangle: t= in your Org file +so that it automatically tangles when you save the document. + +#+begin_src emacs-lisp +(use-package! org-auto-tangle + :defer t + :hook (org-mode . org-auto-tangle-mode) + :config + (setq org-auto-tangle-default t)) +#+end_src + +* RAINBOW MODE +Rainbox mode displays the actual color for any hex value color. It's such a +nice feature that I wanted it turned on all the time, regardless of what mode I +am in. The following creates a global minor mode for rainbow-mode and enables +it. + +#+begin_src emacs-lisp +(define-globalized-minor-mode global-rainbow-mode rainbow-mode + (lambda () (rainbow-mode 1))) +(global-rainbow-mode 1 ) +#+end_src + +* REGISTERS +Emacs registers are compartments where you can save text, rectangles and +positions for later use. Once you save text or a rectangle in a register, you +can copy it into the buffer once or many times; once you save a position in a +register, you can jump back to that position once or many times. The default +GNU Emacs keybindings for these commands (with the exception of +counsel-register) involves 'C-x r' followed by one or more other keys. I wanted +to make this a little more user friendly, and since I am using Doom Emacs, I +choose to replace the 'C-x r' part of the key chords with 'SPC r'. + +| COMMAND | DESCRIPTION | KEYBINDING | +|----------------------------------+----------------------------------+------------| +| copy-to-register | /Copy to register/ | SPC r c | +| frameset-to-register | /Frameset to register/ | SPC r f | +| insert-register | /Insert contents of register/ | SPC r i | +| jump-to-register | /Jump to register/ | SPC r j | +| list-registers | /List registers/ | SPC r l | +| number-to-register | /Number to register/ | SPC r n | +| counsel-register | /Interactively choose a register/ | SPC r r | +| view-register | /View a register/ | SPC r v | +| window-configuration-to-register | /Window configuration to register/ | SPC r w | +| increment-register | /Increment register/ | SPC r + | +| point-to-register | /Point to register/ | SPC r SPC | + +#+BEGIN_SRC emacs-lisp +(map! :leader + (:prefix ("r" . "registers") + :desc "Copy to register" "c" #'copy-to-register + :desc "Frameset to register" "f" #'frameset-to-register + :desc "Insert contents of register" "i" #'insert-register + :desc "Jump to register" "j" #'jump-to-register + :desc "List registers" "l" #'list-registers + :desc "Number to register" "n" #'number-to-register + :desc "Interactively choose a register" "r" #'counsel-register + :desc "View a register" "v" #'view-register + :desc "Window configuration to register" "w" #'window-configuration-to-register + :desc "Increment register" "+" #'increment-register + :desc "Point to register" "SPC" #'point-to-register)) +#+END_SRC + +* SHELLS +Settings for the various shells and terminal emulators within Emacs. ++ 'shell-file-name' -- sets the shell to be used in M-x shell, M-x term, M-x + ansi-term and M-x vterm. + +#+BEGIN_SRC emacs-lisp +(setq shell-file-name "/bin/bash" + vterm-max-scrollback 5000) +(map! :leader + :desc "Vterm popup toggle" "v t" #'+vterm/toggle) +#+END_SRC + +* SPLITS +I set splits to default to opening on the right using 'prefer-horizontal-split'. +I set a keybinding for 'clone-indirect-buffer-other-window' for when I want to +have the same document in two splits. The text of the indirect buffer is always +identical to the text of its base buffer; changes made by editing either one are +visible immediately in the other. But in all other respects, the indirect +buffer and its base buffer are completely separate. For example, I can fold one +split but other will be unfolded. + +#+BEGIN_SRC emacs-lisp +(defun prefer-horizontal-split () + (set-variable 'split-height-threshold nil t) + (set-variable 'split-width-threshold 40 t)) ; make this as low as needed +(add-hook 'markdown-mode-hook 'prefer-horizontal-split) +(map! :leader + :desc "Clone indirect buffer other window" "b c" #'clone-indirect-buffer-other-window) +#+END_SRC + +* WINNER MODE +Winner mode has been included with GNU Emacs since version 20. This is a global +minor mode and, when activated, it allows you to “undo” (and “redo”) changes in +the window configuration with the key commands 'SCP w ' and 'SPC w +'. + +#+BEGIN_SRC emacs-lisp +(map! :leader + (:prefix ("w" . "window") + :desc "Winner redo" "" #'winner-redo + :desc "Winner undo" "" #'winner-undo)) +#+END_SRC + +* ZAP TO CHAR +Emacs provides a 'zap-to-char' command that kills from the current point to a +character. It is bound to 'M-z' in standard GNU Emacs but since Doom Emacs uses +'SPC' as its leader key and does not have 'SPC z' binded to anything, it just +makes since to use it for 'zap-to-char'. Note that 'zap-to-char' can be used +with the universal argument 'SPC u' to modify its behavior. Examples of +'zap-to-char' usage are listed in the table below: + +| KEYBINDING | WHAT IS DOES | +|---------------------------+------------------------------------------------------------| +| SPC z e | deletes all chars to the next occurrence of 'e' | +| SPC u 2 SPC z e | deletes all chars to the second occurrence of 'e' | +| SPC u - SPC z e | deletes all chars to the previous occurrence of 'e' | +| SPC u -2 SPC z e | deletes all chars to the fourth previous occurrence of 'e' | +| SPC u 1 0 0 SPC u SPC z e | deletes all chars to the 100th occurrence of 'e' | + +=TIP:= The universal argument (SPC u) can only take a single integer by default. +If you need to use a multi-digit number (like 100 in the last example in the +table above), then you must terminate the universal argument with another 'SPC +u' after typing the number. + +'zap-up-to-char' is an alternative command that does not zap the char specified. +It is binded to 'SPC Z'. It can also be used in conjunction with the universal +argument 'SPC u' in similar fashion to the the 'zap-to-char' examples above. + +=NOTE:= Vim (evil mode) has similar functionality builtin. You can delete to the +next occurrence of 'e' by using 'dte' in normal. To delete to the next +occurrence of 'e' including the 'e', then you would use 'dfe'. And you can +modify 'dt' and 'df' by prefixing them with numbers, so '2dte' would delete to +the second occurrence of 'e'. + +#+BEGIN_SRC emacs-lisp +(map! :leader + :desc "Zap to char" "z" #'zap-to-char + :desc "Zap up to char" "Z" #'zap-up-to-char) +#+END_SRC + + +* TRANSPARENT +Transparent window + +#+BEGIN_SRC emacs-lisp +(set-frame-parameter nil 'alpha-background 98) ; For current frame +(add-to-list 'default-frame-alist '(alpha-background . 98)) ; For all new frames henceforth +#+END_SRC diff --git a/config/.config/doom/init.el b/config/.config/doom/init.el new file mode 100644 index 000000000..46432e030 --- /dev/null +++ b/config/.config/doom/init.el @@ -0,0 +1,195 @@ +;;; init.el -*- lexical-binding: t; -*- + +;; This file controls what Doom modules are enabled and what order they load +;; in. Remember to run 'doom sync' after modifying it! + +;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's +;; documentation. There you'll find a link to Doom's Module Index where all +;; of our modules are listed, including what flags they support. + +;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or +;; 'C-c c k' for non-vim users) to view its documentation. This works on +;; flags as well (those symbols that start with a plus). +;; +;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its +;; directory (for easy access to its source code). + +(doom! :input + ;;bidi ; (tfel ot) thgir etirw uoy gnipleh + ;;chinese + ;;japanese + ;;layout ; auie,ctsrnm is the superior home row + + :completion + company ; the ultimate code completion backend + ;;(corfu +orderless) ; complete with cap(f), cape and a flying feather! + ;;helm ; the *other* search engine for love and life + ;;ido ; the other *other* search engine... + ;;ivy ; a search engine for love and life + vertico ; the search engine of the future + + :ui + ;;deft ; notational velocity for Emacs + doom ; what makes DOOM look the way it does + doom-dashboard ; a nifty splash screen for Emacs + doom-quit ; DOOM quit-message prompts when you quit Emacs + (emoji +unicode) ; 🙂 + hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW + ;;hydra + indent-guides ; highlighted indent columns + ligatures ; ligatures and symbols to make your code pretty again + ;;minimap ; show a map of the code on the side + modeline ; snazzy, Atom-inspired modeline, plus API + ;;nav-flash ; blink cursor line after big motions + neotree ; a project drawer, like NERDTree for vim + ophints ; highlight the region an operation acts on + (popup +defaults) ; tame sudden yet inevitable temporary windows + ;;tabs ; a tab bar for Emacs + ;;treemacs ; a project drawer, like neotree but cooler + unicode ; extended unicode support for various languages + (vc-gutter +pretty) ; vcs diff in the fringe + vi-tilde-fringe ; fringe tildes to mark beyond EOB + ;;window-select ; visually switch windows + workspaces ; tab emulation, persistence & separate workspaces + ;;zen ; distraction-free coding or writing + + :editor + (evil +everywhere) ; come to the dark side, we have cookies + file-templates ; auto-snippets for empty files + fold ; (nigh) universal code folding + ;;(format +onsave) ; automated prettiness + ;;god ; run Emacs commands without modifier keys + ;;lispy ; vim for lisp, for people who don't like vim + ;;multiple-cursors ; editing in many places at once + ;;objed ; text object editing for the innocent + ;;parinfer ; turn lisp into python, sort of + ;;rotate-text ; cycle region at point between text candidates + snippets ; my elves. They type so I don't have to + word-wrap ; soft wrapping with language-aware indent + + :emacs + dired ; making dired pretty [functional] + electric ; smarter, keyword-based electric-indent + ibuffer ; interactive buffer management + undo ; persistent, smarter undo for your inevitable mistakes + vc ; version-control and Emacs, sitting in a tree + + :term + ;;eshell ; the elisp shell that works everywhere + ;;shell ; simple shell REPL for Emacs + ;;term ; basic terminal emulator for Emacs + vterm ; the best terminal emulation in Emacs + + :checkers + syntax ; tasing you for every semicolon you forget + ;;(spell +flyspell) ; tasing you for misspelling mispelling + ;;grammar ; tasing grammar mistake every you make + + :tools + ;;ansible + biblio ; Writes a PhD for you (citation needed) + ;;collab ; buffers with friends + debugger ; FIXME stepping through code, to help you add bugs + ;;direnv + docker + ;;editorconfig ; let someone else argue about tabs vs spaces + ;;ein ; tame Jupyter notebooks with emacs + (eval +overlay) ; run code, run (also, repls) + lookup ; navigate your code and its documentation + lsp ; M-x vscode + magit ; a git porcelain for Emacs + ;;make ; run make tasks from Emacs + ;;pass ; password manager for nerds + pdf ; pdf enhancements + ;;prodigy ; FIXME managing external services & code builders + ;;rgb ; creating color strings + ;;taskrunner ; taskrunner for all your projects + ;;terraform ; infrastructure as code + ;;tmux ; an API for interacting with tmux + tree-sitter ; syntax and parsing, sitting in a tree... + ;;upload ; map local to remote projects via ssh/ftp + + :os + (:if (featurep :system 'macos) macos) ; improve compatibility with macOS + tty ; improve the terminal Emacs experience + + :lang + ;;agda ; types of types of types of types... + ;;beancount ; mind the GAAP + (cc +lsp) ; C > C++ == 1 + ;;clojure ; java with a lisp + ;;common-lisp ; if you've seen one lisp, you've seen them all + ;;coq ; proofs-as-programs + ;;crystal ; ruby at the speed of c + csharp ; unity, .NET, and mono shenanigans + data ; config/data formats + (dart +flutter) ; paint ui and not much else + ;;dhall + ;;elixir ; erlang done right + ;;elm ; care for a cup of TEA? + emacs-lisp ; drown in parentheses + ;;erlang ; an elegant language for a more civilized age + ;;ess ; emacs speaks statistics + ;;factor + ;;faust ; dsp, but you get to keep your soul + ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) + ;;fsharp ; ML stands for Microsoft's Language + ;;fstar ; (dependent) types and (monadic) effects and Z3 + gdscript ; the language you waited for + (go +lsp) ; the hipster dialect + ;;(graphql +lsp) ; Give queries a REST + ;;(haskell +lsp) ; a language that's lazier than I am + ;;hy ; readability of scheme w/ speed of python + ;;idris ; a language you can depend on + json ; At least it ain't XML + ;;(java +lsp) ; the poster child for carpal tunnel syndrome + javascript ; all(hope(abandon(ye(who(enter(here)))))) + ;;julia ; a better, faster MATLAB + ;;kotlin ; a better, slicker Java(Script) + latex ; writing papers in Emacs has never been so fun + ;;lean ; for folks with too much to prove + ;;ledger ; be audit you can be + lua ; one-based indices? one-based indices + markdown ; writing docs for people to ignore + ;;nim ; python + lisp at the speed of c + ;;nix ; I hereby declare "nix geht mehr!" + ;;ocaml ; an objective camel + org ; organize your plain life in plain text + ;;php ; perl's insecure younger brother + ;;plantuml ; diagrams for confusing people more + ;;purescript ; javascript, but functional + python ; beautiful is better than ugly + ;;qt ; the 'cutest' gui framework ever + ;;racket ; a DSL for DSLs + ;;raku ; the artist formerly known as perl6 + rest ; Emacs as a REST client + ;;rst ; ReST in peace + ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} + (rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + ;;scala ; java, but good + ;;(scheme +guile) ; a fully conniving family of lisps + sh ; she sells {ba,z,fi}sh shells on the C xor + ;;sml + ;;solidity ; do you need a blockchain? No. + ;;swift ; who asked for emoji variables? + ;;terra ; Earth and Moon in alignment for performance. + web ; the tubes + yaml ; JSON, but readable + zig ; C, but simpler + + :email + ;;(mu4e +org +gmail) + ;;notmuch + ;;(wanderlust +gmail) + + :app + calendar + ;;emms + ;;everywhere ; *leave* Emacs!? You must be joking + ;;irc ; how neckbeards socialize + (rss +org) ; emacs as an RSS reader + ;;twitter ; twitter client https://twitter.com/vnought + + :config + literate + (default +bindings +smartparens)) diff --git a/config/.config/doom/packages.el b/config/.config/doom/packages.el new file mode 100644 index 000000000..cc5de0ef7 --- /dev/null +++ b/config/.config/doom/packages.el @@ -0,0 +1,82 @@ +;; -*- no-byte-compile: t; -*- +;;; $DOOMDIR/packages.el + +;; To install a package with Doom you must declare them here and run 'doom sync' +;; on the command line, then restart Emacs for the changes to take effect -- or +;; use 'M-x doom/reload'. + + +;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: +;; (package! some-package) + +;; To install a package directly from a remote git repo, you must specify a +;; `:recipe'. You'll find documentation on what `:recipe' accepts here: +;; https://github.com/radian-software/straight.el#the-recipe-format +;; (package! another-package +;; :recipe (:host github :repo "username/repo")) + +;; If the package you are trying to install does not contain a PACKAGENAME.el +;; file, or is located in a subdirectory of the repo, you'll need to specify +;; `:files' in the `:recipe': +;; (package! this-package +;; :recipe (:host github :repo "username/repo" +;; :files ("some-file.el" "src/lisp/*.el"))) + +;; If you'd like to disable a package included with Doom, you can do so here +;; with the `:disable' property: +;; (package! builtin-package :disable t) + +;; You can override the recipe of a built in package without having to specify +;; all the properties for `:recipe'. These will inherit the rest of its recipe +;; from Doom or MELPA/ELPA/Emacsmirror: +;; (package! builtin-package :recipe (:nonrecursive t)) +;; (package! builtin-package-2 :recipe (:repo "myfork/package")) + +;; Specify a `:branch' to install a package from a particular branch or tag. +;; This is required for some packages whose default branch isn't 'master' (which +;; our package manager can't deal with; see radian-software/straight.el#279) +;; (package! builtin-package :recipe (:branch "develop")) + +;; Use `:pin' to specify a particular commit to install. +;; (package! builtin-package :pin "1a2b3c4d5e") + + +;; Doom's packages are pinned to a specific commit and updated from release to +;; release. The `unpin!' macro allows you to unpin single packages... +;; (unpin! pinned-package) +;; ...or multiple packages +;; (unpin! pinned-package another-pinned-package) +;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) +;; (unpin! t) + +(package! gitconfig-mode + :recipe (:host github :repo "magit/git-modes" + :files ("gitconfig-mode.el"))) +(package! gitignore-mode + :recipe (:host github :repo "magit/git-modes" + :files ("gitignore-mode.el"))) +(package! flycheck-aspell) +(package! async) +(package! dired-open) +(package! dired-subtree) +(package! esxml) +(package! evil-tutor) +(package! imenu-list) +(package! ivy-posframe) +(package! mw-thesaurus) +(package! org-board) +(package! org-web-tools) +(package! org-auto-tangle) +(package! peep-dired) +(package! rainbow-mode) +(package! request) +(package! resize-window) +(package! s) +(package! tldr) +(package! wc-mode) +(package! beacon) +(package! olivetti) +(package! sharper) +(package! csproj-mode) +(package! dap-mode) +(package! vimrc-mode) diff --git a/config/.config/gtk-2.0/gtkfilechooser.ini b/config/.config/gtk-2.0/gtkfilechooser.ini deleted file mode 100644 index 3de31bfd5..000000000 --- a/config/.config/gtk-2.0/gtkfilechooser.ini +++ /dev/null @@ -1,11 +0,0 @@ -[Filechooser Settings] -LocationMode=path-bar -ShowHidden=false -ShowSizeColumn=true -GeometryX=0 -GeometryY=0 -GeometryWidth=780 -GeometryHeight=585 -SortColumn=name -SortOrder=ascending -StartupMode=recent diff --git a/config/.config/gtk-2.0/gtkrc-2.0 b/config/.config/gtk-2.0/gtkrc-2.0 index 53282842f..aa7263f62 100644 --- a/config/.config/gtk-2.0/gtkrc-2.0 +++ b/config/.config/gtk-2.0/gtkrc-2.0 @@ -1,4 +1,4 @@ -gtk-theme-name="Gruvbox-Dark-BL" +gtk-theme-name="Gruvbox-Dark-BL-LB" gtk-icon-theme-name="Papirus-Dark" gtk-font-name="Cantarell 10" gtk-cursor-theme-name="Simp1e-Gruvbox-Dark" diff --git a/config/.config/gtk-3.0/bookmarks b/config/.config/gtk-3.0/bookmarks deleted file mode 100644 index e69de29bb..000000000 diff --git a/config/.config/gtk-3.0/settings.ini b/config/.config/gtk-3.0/settings.ini index d5d8adb9b..c42829b76 100644 --- a/config/.config/gtk-3.0/settings.ini +++ b/config/.config/gtk-3.0/settings.ini @@ -1,5 +1,5 @@ [Settings] -gtk-theme-name=Gruvbox-Dark-BL +gtk-theme-name=Gruvbox-Dark-BL-LB gtk-icon-theme-name=Papirus-Dark gtk-font-name=Cantarell 10 gtk-cursor-theme-name=Simp1e-Gruvbox-Dark diff --git a/config/.config/lvim/config.lua b/config/.config/lvim/config.lua index a7b10c2d2..d3d365ca9 100644 --- a/config/.config/lvim/config.lua +++ b/config/.config/lvim/config.lua @@ -1,5 +1,5 @@ -- neovide options -vim.o.guifont = "mononoki Nerd Font:h14" +vim.o.guifont = "mononoki Nerd Font:h12" vim.g.neovide_hide_mouse_when_typing = true vim.g.neovide_no_idle = true vim.g.neovide_confirm_quit = true diff --git a/config/etc/bash.bash_logout b/config/etc/bash.bash_logout deleted file mode 100644 index 5aad3995d..000000000 --- a/config/etc/bash.bash_logout +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -# ~/.bash_logout: executed by bash(1) when login shell exits. - -if [ "$SHLVL" = 1 ]; then - [ -x /usr/bin/clear ] && /usr/bin/clear -q -fi diff --git a/config/etc/default/grub b/config/etc/default/grub new file mode 100644 index 000000000..f5d7630a0 --- /dev/null +++ b/config/etc/default/grub @@ -0,0 +1,64 @@ +# GRUB boot loader configuration + +GRUB_DEFAULT=0 +GRUB_TIMEOUT=0 +GRUB_DISTRIBUTOR="Arch" +GRUB_CMDLINE_LINUX_DEFAULT="rd.luks.name=41091a77-695d-4b2e-b60e-439b00504c77=thklvm rd.luks.key=41091a77-695d-4b2e-b60e-439b00504c77=/boot/volume.key loglevel=3 quiet systemd.show_status=auto rd.udev.log_level=3" +GRUB_CMDLINE_LINUX="" + +# Preload both GPT and MBR modules so that they are not missed +GRUB_PRELOAD_MODULES="part_gpt part_msdos" + +# Uncomment to enable booting from LUKS encrypted devices +GRUB_ENABLE_CRYPTODISK=y + +# Set to 'countdown' or 'hidden' to change timeout behavior, +# press ESC key to display menu. +GRUB_TIMEOUT_STYLE=menu + +# Uncomment to use basic console +GRUB_TERMINAL_INPUT=console + +# Uncomment to disable graphical terminal +#GRUB_TERMINAL_OUTPUT=console + +# The resolution used on graphical terminal +# note that you can use only modes which your graphic card supports via VBE +# you can see them in real GRUB with the command `videoinfo' +GRUB_GFXMODE=auto + +# Uncomment to allow the kernel use the same resolution used by grub +GRUB_GFXPAYLOAD_LINUX=keep + +# Uncomment if you want GRUB to pass to the Linux kernel the old parameter +# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" +#GRUB_DISABLE_LINUX_UUID=true + +# Uncomment to disable generation of recovery mode menu entries +GRUB_DISABLE_RECOVERY=true + +# Uncomment and set to the desired menu colors. Used by normal and wallpaper +# modes only. Entries specified as foreground/background. +#GRUB_COLOR_NORMAL="light-blue/black" +#GRUB_COLOR_HIGHLIGHT="light-cyan/blue" + +# Uncomment one of them for the gfx desired, a image background or a gfxtheme +#GRUB_BACKGROUND="/path/to/wallpaper" +#GRUB_THEME="/path/to/gfxtheme" + +# Uncomment to get a beep at GRUB start +#GRUB_INIT_TUNE="480 440 1" + +# Uncomment to make GRUB remember the last selection. This requires +# setting 'GRUB_DEFAULT=saved' above. +#GRUB_SAVEDEFAULT=true + +# Uncomment to disable submenus in boot menu +#GRUB_DISABLE_SUBMENU=y + +# Probing for other operating systems is disabled for security reasons. Read +# documentation on GRUB_DISABLE_OS_PROBER, if still want to enable this +# functionality install os-prober and uncomment to detect and include other +# operating systems. +#GRUB_DISABLE_OS_PROBER=false + diff --git a/config/etc/dracut.conf b/config/etc/dracut.conf deleted file mode 100644 index 76d652c7b..000000000 --- a/config/etc/dracut.conf +++ /dev/null @@ -1,4 +0,0 @@ -# PUT YOUR CONFIG IN separate files -# in /etc/dracut.conf.d named ".conf" -# SEE man dracut.conf(5) for options -add_drivers+=" i915 " diff --git a/config/etc/issue b/config/etc/issue index 7dd60c086..96a033257 100644 --- a/config/etc/issue +++ b/config/etc/issue @@ -1,14 +1,13 @@ - -\e[H\e[2J -\e[0;32m - _______ - \\_____ `- ____ ____ .__ .___ .____ .__ - /\\ ___ `- \\ \\ \\ / /___ |__| __| _/ | | |__| ____ __ _____ ___ - | | / \\ | | \\ Y / _ \\| |/ __ | | | | |/ \\| | \\ \\/ / - | | \\___/ | | \\ ( <_> ) / /_/ | | |___| | | \\ | /> < - \\ `-_____ \\/ \\___/ \\____/|__\\____ | |_______ \\__|___| /____//__/\\_ \\ - `-______\\ \\/ \\/ \\/ \\/ - -\e[0m -Welcome Back! Linux Version: \r (\n) (\l) +  +       ### ### ## +     ## ## + ┌ #### ### ###   ####   ## ### ## ### ### ### ### ###  ### ### + │  ##  ### ##  ##   ###  ## ## ## ### ## ## ##   ## ## + │ #####  ##   ##   ## ## ## ## ## ## ## ##   ### + │ ## ##  ##   ##   ## ## ## ## ## ## ##  ##   ## ##  + │ ######  ##   ####  ### ### #### #### ### ### ######  ###   ### + └─────────────────────────────────────────── A simple, lightweight distribution. +  + OS: Arch\s Kernel: \r Processor: \m TTY: \l + diff --git a/config/etc/mkinitcpio.conf b/config/etc/mkinitcpio.conf new file mode 100644 index 000000000..6feb6169c --- /dev/null +++ b/config/etc/mkinitcpio.conf @@ -0,0 +1,81 @@ +# vim:set ft=sh +# MODULES +# The following modules are loaded before any boot hooks are +# run. Advanced users may wish to specify all system modules +# in this array. For instance: +# MODULES=(usbhid xhci_hcd) +MODULES=(i915) + +# BINARIES +# This setting includes any additional binaries a given user may +# wish into the CPIO image. This is run last, so it may be used to +# override the actual binaries included by a given hook +# BINARIES are dependency parsed, so you may safely ignore libraries +BINARIES=() + +# FILES +# This setting is similar to BINARIES above, however, files are added +# as-is and are not parsed in any way. This is useful for config files. +FILES=(/boot/volume.key) + +# HOOKS +# This is the most important setting in this file. The HOOKS control the +# modules and scripts added to the image, and what happens at boot time. +# Order is important, and it is recommended that you do not change the +# order in which HOOKS are added. Run 'mkinitcpio -H ' for +# help on a given hook. +# 'base' is _required_ unless you know precisely what you are doing. +# 'udev' is _required_ in order to automatically load modules +# 'filesystems' is _required_ unless you specify your fs modules in MODULES +# Examples: +## This setup specifies all modules in the MODULES setting above. +## No RAID, lvm2, or encrypted root is needed. +# HOOKS=(base) +# +## This setup will autodetect all modules for your system and should +## work as a sane default +# HOOKS=(base udev autodetect modconf block filesystems fsck) +# +## This setup will generate a 'full' image which supports most systems. +## No autodetection is done. +# HOOKS=(base udev modconf block filesystems fsck) +# +## This setup assembles a mdadm array with an encrypted root file system. +## Note: See 'mkinitcpio -H mdadm_udev' for more information on RAID devices. +# HOOKS=(base udev modconf keyboard keymap consolefont block mdadm_udev encrypt filesystems fsck) +# +## This setup loads an lvm2 volume group. +# HOOKS=(base udev modconf block lvm2 filesystems fsck) +# +## This will create a systemd based initramfs which loads an encrypted root filesystem. +# HOOKS=(base systemd autodetect modconf kms keyboard sd-vconsole sd-encrypt block filesystems fsck) +# +## NOTE: If you have /usr on a separate partition, you MUST include the +# usr and fsck hooks. +HOOKS=(base systemd autodetect microcode modconf kms keyboard keymap sd-vconsole block sd-encrypt lvm2 filesystems fsck) + +# COMPRESSION +# Use this to compress the initramfs image. By default, zstd compression +# is used for Linux ≥ 5.9 and gzip compression is used for Linux < 5.9. +# Use 'cat' to create an uncompressed image. +#COMPRESSION="zstd" +#COMPRESSION="gzip" +#COMPRESSION="bzip2" +#COMPRESSION="lzma" +#COMPRESSION="xz" +#COMPRESSION="lzop" +#COMPRESSION="lz4" + +# COMPRESSION_OPTIONS +# Additional options for the compressor +#COMPRESSION_OPTIONS=() + +# MODULES_DECOMPRESS +# Decompress loadable kernel modules and their firmware during initramfs +# creation. Switch (yes/no). +# Enable to allow further decreasing image size when using high compression +# (e.g. xz -9e or zstd --long --ultra -22) at the expense of increased RAM usage +# at early boot. +# Note that any compressed files will be placed in the uncompressed early CPIO +# to avoid double compression. +#MODULES_DECOMPRESS="no" diff --git a/config/etc/pacman.conf b/config/etc/pacman.conf new file mode 100644 index 000000000..6923e83b9 --- /dev/null +++ b/config/etc/pacman.conf @@ -0,0 +1,98 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ +HoldPkg = pacman glibc +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +Color +#NoProgressBar +CheckSpace +#VerbosePkgLists +ParallelDownloads = 5 +ILoveCandy + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +#RemoteFileSigLevel = Required + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[core-testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +#[extra-testing] +#Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +[multilib] +Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#SigLevel = Optional TrustAll +#Server = file:///home/custompkgs diff --git a/config/etc/sv/runsvdir-drk/run b/config/etc/sv/runsvdir-drk/run deleted file mode 100755 index ffd45de53..000000000 --- a/config/etc/sv/runsvdir-drk/run +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -export USER="drk" -export HOME="/home/$USER" -export XDG_RUNTIME_DIR="/run/user/$(id -u $USER)" -mkdir $XDG_RUNTIME_DIR -chown $USER:$USER $XDG_RUNTIME_DIR - -groups="$(id -Gn "$USER" | tr ' ' ':')" -svdir="$HOME/.config/services" -mkdir -p "$svdir" -chown $USER:$USER "$svdir" - -exec chpst -u "$USER:$groups" runsvdir "$svdir" diff --git a/source/dwm/autostart b/source/dwm/autostart index c323c2e59..dfb212da1 100755 --- a/source/dwm/autostart +++ b/source/dwm/autostart @@ -5,10 +5,11 @@ ## / /_/ / / / /_/ / ,< / __/ Clay Gomera (Drake) ## ## /_____/_/ \__,_/_/|_|\___/ My custom dwm build ## -/usr/libexec/polkit-gnome-authentication-agent-1 & +lxpolkit & dwmblocks & sh "$HOME"/.fehbg & unclutter --hide-on-touch & herbed & picom & dbus-update-activation-environment DISPLAY XAUTHORITY & +/usr/bin/emacs --daemon & diff --git a/source/dwm/config.h b/source/dwm/config.h index fa5c05dad..b03dbebb1 100644 --- a/source/dwm/config.h +++ b/source/dwm/config.h @@ -70,7 +70,7 @@ static Sp scratchpads[] = { /* Tag Definitions */ static const char *tags[] = { - "", /* EDITOR */ + "", /* nDITOR */ "󰙨", /* TESTING */ "󰖟", /* WEB */ "󰭹", /* CHAT */ @@ -229,7 +229,7 @@ static const Layout layouts[] = { /* Main commands */ static const char *dmenucmd[] = { "dmenu_run", "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; static const char *termcmd[] = { "st", NULL }; -static const char *editor[] = { "neovide", "--neovim-bin", ".local/bin/lvim", NULL}; +static const char *editor[] = { "emacsclient", "-c", "-a", "emacs", NULL}; static const char *browser[] = { "flatpak", "run", "com.brave.Browser", NULL }; static const char *chat[] = { "flatpak", "run", "org.signal.Signal", NULL }; static const char *vm[] = { "virt-manager", NULL }; diff --git a/source/dwm/dwm.c b/source/dwm/dwm.c index 7a736cde9..abbb7a5cc 100644 --- a/source/dwm/dwm.c +++ b/source/dwm/dwm.c @@ -2283,7 +2283,6 @@ void togglemaster(const Arg *arg) { arrange(selmon); } - void togglescratch(const Arg *arg) { Client *c; unsigned int found = 0; diff --git a/source/dwmblocks/blocks.h b/source/dwmblocks/blocks.h index 904b610a2..a17b874e8 100644 --- a/source/dwmblocks/blocks.h +++ b/source/dwmblocks/blocks.h @@ -2,11 +2,11 @@ static char delim = '|'; /* sets delimeter between status commands. NULL charact static const Block blocks[] = { /* Command */ /* Update Interval */ /* Update Signal */ + {"", "$HOME/.config/suckless/dwmblocks/scripts/block_clock", 60, 1}, + {"", "$HOME/.config/suckless/dwmblocks/scripts/block_wifi", 20, 1}, {"", "$HOME/.config/suckless/dwmblocks/scripts/block_layout", 0, 10}, {"", "$HOME/.config/suckless/dwmblocks/scripts/block_battery", 10, 1}, {"", "$HOME/.config/suckless/dwmblocks/scripts/block_brightness", 0, 10}, {"", "$HOME/.config/suckless/dwmblocks/scripts/block_volume", 0, 10}, - {"", "$HOME/.config/suckless/dwmblocks/scripts/block_clock", 60, 1}, - {"", "$HOME/.config/suckless/dwmblocks/scripts/block_wifi", 20, 1}, }; diff --git a/source/dwmblocks/scripts/block_battery b/source/dwmblocks/scripts/block_battery index c62349e43..f8c60039d 100755 --- a/source/dwmblocks/scripts/block_battery +++ b/source/dwmblocks/scripts/block_battery @@ -7,101 +7,103 @@ # this variable will store the current power profile currntpwr=$(powerprofilesctl get) if [ "${currntpwr}" = "performance" ]; then - pwr=" | 󰓅 Performance " + pwr=" | 󰓅 " elif [ "${currntpwr}" = "balanced" ]; then - pwr=" | 󰾅 Balanced " + pwr=" | 󰾅 " elif [ "${currntpwr}" = "power-saver" ]; then - pwr=" | 󰾆 PowerSaver " + pwr=" | 󰾆 " fi -# loop through all the available batteries and get it's current capacity +# loop through all the available batteries and get its current capacity for battery in /sys/class/power_supply/BAT?*; do - # if non-first battery, print a space separator. - [ -n "${capacity+x}" ] && printf " " - percentage="$(cat "$battery/capacity" 2>&1)" + # if non-first battery, print a space separator. + [ -n "${capacity+x}" ] && printf " " + percentage="$(cat "$battery/capacity" 2>&1)" - # sets up the status and capacity - case "$(cat "$battery/status" 2>&1)" in - "Full") - status=" 󰁹" - ;; - "Discharging") - # updates the status icon based on the battery percentage - if [ "$percentage" -le 20 ]; then - status=" 󰁻" - elif [ "$percentage" -le 30 ]; then - status=" 󰁼" - elif [ "$percentage" -le 40 ]; then - status=" 󰁽" - elif [ "$percentage" -le 50 ]; then - status=" 󰁾" - elif [ "$percentage" -le 60 ]; then - status=" 󰁿" - elif [ "$percentage" -le 70 ]; then - status=" 󰂀" - elif [ "$percentage" -le 80 ]; then - status=" 󰂁" - elif [ "$percentage" -le 90 ]; then - status=" 󰂂" - else - status=" 󰁹" - fi - ;; - "Charging") - # updates the status icon based on the battery percentage while charging - if [ "$percentage" -le 10 ]; then - status=" 󰢜" - elif [ "$percentage" -le 20 ]; then - status=" 󰂆" - elif [ "$percentage" -le 30 ]; then - status=" 󰂇" - elif [ "$percentage" -le 40 ]; then - status=" 󰂈" - elif [ "$percentage" -le 50 ]; then - status=" 󰢝" - elif [ "$percentage" -le 60 ]; then - status=" 󰂉" - elif [ "$percentage" -le 70 ]; then - status=" 󰢞" - elif [ "$percentage" -le 80 ]; then - status=" 󰂊" - elif [ "$percentage" -le 90 ]; then - status=" 󰂋" - else - status=" 󰂅" - fi - ;; - "Not charging") - # updates the status icon based on the battery percentage - if [ "$percentage" -le 20 ]; then - status=" 󰁻" - elif [ "$percentage" -le 30 ]; then - status=" 󰁼" - elif [ "$percentage" -le 40 ]; then - status=" 󰁽" - elif [ "$percentage" -le 50 ]; then - status=" 󰁾" - elif [ "$percentage" -le 60 ]; then - status=" 󰁿" - elif [ "$percentage" -le 70 ]; then - status=" 󰂀" - elif [ "$percentage" -le 80 ]; then - status=" 󰂁" - elif [ "$percentage" -le 90 ]; then - status=" 󰂂" - else - status=" 󰁹" - fi - ;; - "Unknown") - echo " 󰂃 " && exit 0 # just in case - ;; - *) exit 1 ;; # just exit if there isn't a battery on the system - esac + # sets up the status and capacity + case "$(cat "$battery/status" 2>&1)" in + "Full") + status=" 󰁹" + ;; + "Discharging") + # updates the status icon based on the battery percentage + if [ "$percentage" -le 20 ]; then + status=" 󰁻" + elif [ "$percentage" -le 30 ]; then + status=" 󰁼" + elif [ "$percentage" -le 40 ]; then + status=" 󰁽" + elif [ "$percentage" -le 50 ]; then + status=" 󰁾" + elif [ "$percentage" -le 60 ]; then + status=" 󰁿" + elif [ "$percentage" -le 70 ]; then + status=" 󰂀" + elif [ "$percentage" -le 80 ]; then + status=" 󰂁" + elif [ "$percentage" -le 90 ]; then + status=" 󰂂" + else + status=" 󰁹" + fi + ;; + "Charging") + # updates the status icon based on the battery percentage while charging + if [ "$percentage" -le 10 ]; then + status=" 󰢜" + elif [ "$percentage" -le 20 ]; then + status=" 󰂆" + elif [ "$percentage" -le 30 ]; then + status=" 󰂇" + elif [ "$percentage" -le 40 ]; then + status=" 󰂈" + elif [ "$percentage" -le 50 ]; then + status=" 󰢝" + elif [ "$percentage" -le 60 ]; then + status=" 󰂉" + elif [ "$percentage" -le 70 ]; then + status=" 󰢞" + elif [ "$percentage" -le 80 ]; then + status=" 󰂊" + elif [ "$percentage" -le 90 ]; then + status=" 󰂋" + else + status=" 󰂅" + fi + ;; + "Not charging") + # updates the status icon based on the battery percentage + if [ "$percentage" -le 20 ]; then + status=" 󰁻" + elif [ "$percentage" -le 30 ]; then + status=" 󰁼" + elif [ "$percentage" -le 40 ]; then + status=" 󰁽" + elif [ "$percentage" -le 50 ]; then + status=" 󰁾" + elif [ "$percentage" -le 60 ]; then + status=" 󰁿" + elif [ "$percentage" -le 70 ]; then + status=" 󰂀" + elif [ "$percentage" -le 80 ]; then + status=" 󰂁" + elif [ "$percentage" -le 90 ]; then + status=" 󰂂" + else + status=" 󰁹" + fi + ;; + "Unknown") + echo " 󰂃" && exit 0 # just in case + ;; + *) exit 1 ;; # just exit if there isn't a battery on the system + esac - # will make a warning variable if discharging and low - [ "$status" = " 󰁺" ] && [ "$percentage" -le 10 ] && warn="󱈸" + # will make a warning variable if percentage is low + if [ "$status" = " 󰁻" ] && [ "$percentage" -le 10 ]; then + warn="󱈸" + fi - # print everything - printf "%s%s%d%%" "$status" "$warn " "$percentage"; unset warn + # print everything + printf "%s%s%d%%" "$status" "${warn:- }" "$percentage"; unset warn done && printf "$pwr\\n" diff --git a/source/dwmblocks/scripts/block_brightness b/source/dwmblocks/scripts/block_brightness index 4ff3c8988..34cc064c1 100755 --- a/source/dwmblocks/scripts/block_brightness +++ b/source/dwmblocks/scripts/block_brightness @@ -27,4 +27,4 @@ elif [ "${brt%.*}" -ge 20 ]; then else icon="󱩎" fi -echo " $icon ${brt%.*}% " # print the icon and brightness level +echo " $icon " # print the icon and brightness level diff --git a/source/dwmblocks/scripts/block_clock b/source/dwmblocks/scripts/block_clock index a87192c14..abbec789b 100755 --- a/source/dwmblocks/scripts/block_clock +++ b/source/dwmblocks/scripts/block_clock @@ -25,7 +25,5 @@ esac # this variable will store the clock in the desired format clock="$(date +%I:%M%p | sed 's/^0//')" -# this variable will store the date in the desired format -ddate="$(date +%d/%m/%y)" -echo " $clock_icon $clock | 󰸗 $ddate " # print the clock icon, the current time and then date +echo "$clock_icon $clock " # print the clock icon, the current time and then date diff --git a/source/dwmblocks/scripts/block_layout b/source/dwmblocks/scripts/block_layout index ab657de9c..214e42b25 100755 --- a/source/dwmblocks/scripts/block_layout +++ b/source/dwmblocks/scripts/block_layout @@ -8,4 +8,4 @@ layout=$(setxkbmap -query | grep -oP 'layout:\s*\K\w+'); # print the current keyboard layout in all caps -echo "󰥻 $layout " | tr '[:lower:]' '[:upper:]'; +echo " 󰥻 $layout " | tr '[:lower:]' '[:upper:]'; diff --git a/source/dwmblocks/scripts/block_volume b/source/dwmblocks/scripts/block_volume index 9d705ed91..5fb4fea35 100755 --- a/source/dwmblocks/scripts/block_volume +++ b/source/dwmblocks/scripts/block_volume @@ -16,4 +16,4 @@ elif [ "$vol" -gt "0" ]; then else echo " 󰖁 " && exit # just in case if pamixer or the audio isn't available fi -echo -e " $icon $vol% " # print the volume icon and level +echo -e " $icon " # print the volume icon and level diff --git a/source/dwmblocks/scripts/block_wifi b/source/dwmblocks/scripts/block_wifi index b380a1bc2..245b97250 100755 --- a/source/dwmblocks/scripts/block_wifi +++ b/source/dwmblocks/scripts/block_wifi @@ -1,7 +1,7 @@ #!/usr/bin/env bash # ***This script was made by Clay Gomera (Drake)*** -# - Description: A dwmblocks script to print the network status +# - Description: A dwmblocks script to print the wifi status # - Dependencies: dwm, dwmblocks, nmcli ##### @@ -23,14 +23,17 @@ get_wifi_strength() { fi } +# this variable will store the current state of the connection (connected or +# disconnected) +constate=$(nmcli dev | grep wifi | sed 's/ \{2,\}/|/g' | cut -d '|' -f3 | head -1) + +# this variable will store the name of the wifi network that the computer is +# currently connected to +currentwfi=$(nmcli dev | grep wifi | sed 's/ \{2,\}/|/g' | cut -d '|' -f4 | head -1) + # Check Ethernet connection ethernet_state=$(nmcli dev | grep ethernet | awk '{print $3}') -# Check Wi-Fi connection -wifi_info=$(nmcli -t -f DEVICE,TYPE,STATE,CONNECTION dev | grep wifi) -constate=$(echo "$wifi_info" | awk -F: '{print $3}') -currentwfi=$(echo "$wifi_info" | awk -F: '{print $4}') - if [ "$ethernet_state" = "connected" ]; then echo " 󰈀 Ethernet " elif [ "$constate" = "disconnected" ]; then # if the computer is disconnected @@ -43,7 +46,7 @@ elif [ "$constate" = "connected" ]; then # if it's connected "3") icon=" 󰤥 " ;; "4") icon=" 󰤨 " ;; esac - echo "$icon$currentwfi" + echo "$icon$currentwfi " else echo " 󰤮 " # just in case if nmcli isn't available or something weird is happening fi