From 24083dba07f089f59997a68e57e8e90a34f9101d Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Mon, 20 Dec 2021 03:36:47 +0700 Subject: [PATCH] Switch to Doom and get rid of some fish stuff, like the vterm sync --- .config/fish/config.fish | 34 +++-- .config/fish/functions/icat.fish | 3 - .config/fish/functions/n.fish | 3 - .doom.d/config.el | 96 ++++++++++++++ .doom.d/init.el | 191 +++++++++++++++++++++++++++ .doom.d/packages.el | 52 ++++++++ {.emacs.d => .emacs.vanilla}/init.el | 4 +- .gitignore | 1 + 8 files changed, 359 insertions(+), 25 deletions(-) delete mode 100644 .config/fish/functions/icat.fish delete mode 100644 .config/fish/functions/n.fish create mode 100644 .doom.d/config.el create mode 100644 .doom.d/init.el create mode 100644 .doom.d/packages.el rename {.emacs.d => .emacs.vanilla}/init.el (99%) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 546683e..1b589a4 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -16,24 +16,6 @@ if [ (uname -r | sed -n 's/.*\( *Microsoft *\).*/\1/ip') ] alias xdg-open wsl-open end -function vterm_printf; - printf "\e]%s\e\\" "$argv" -end - -function vterm_prompt_end; - vterm_printf '51;A'(whoami)'@'(hostname)':'(pwd) -end - -functions --copy fish_prompt vterm_old_fish_prompt - -function fish_prompt --description 'Write out the prompt; do not replace this. Instead, put this at end of your file.' - # Remove the trailing newline from the original prompt. This is done - # using the string builtin from fish, but to make sure any escape codes - # are correctly interpreted, use %b for printf. - printf "%b" (string join "\n" (vterm_old_fish_prompt)) - vterm_prompt_end -end - abbr -a -g gs "git status --untracked-files" abbr -a -g gl "git lop -10" abbr -a -g gll "git lol -15" @@ -76,3 +58,19 @@ abbr -a -g gd "git diff" # export NNN_PLUG='p:preview-tui' complete -f -c dotnet -a "(dotnet complete)" + +# function vterm_printf; +# printf "\e]%s\e\\" "$argv" +# end + +# function vterm_prompt_end; +# vterm_printf '51;A'(whoami)'@'(hostname)':'(pwd) +# end +# functions --copy fish_prompt vterm_old_fish_prompt +# function fish_prompt --description 'Write out the prompt; do not replace this. Instead, put this at end of your file.' +# # Remove the trailing newline from the original prompt. This is done +# # using the string builtin from fish, but to make sure any escape codes +# # are correctly interpreted, use %b for printf. +# printf "%b" (string join " \n" (vterm_old_fish_prompt)) +# vterm_prompt_end +# end diff --git a/.config/fish/functions/icat.fish b/.config/fish/functions/icat.fish deleted file mode 100644 index acdfc9b..0000000 --- a/.config/fish/functions/icat.fish +++ /dev/null @@ -1,3 +0,0 @@ -function icat --wraps='kitty +kitten icat --align=left' --description 'alias icat kitty +kitten icat --align=left' - kitty +kitten icat --align=left $argv; -end diff --git a/.config/fish/functions/n.fish b/.config/fish/functions/n.fish deleted file mode 100644 index 59a4fcb..0000000 --- a/.config/fish/functions/n.fish +++ /dev/null @@ -1,3 +0,0 @@ -function n --wraps='env NNN_FIFO="/tmp/nnn.fifo" LC_COLLATE="C" SPLIT="h" nnn -eH -Pp' --wraps='env NNN_FIFO="/tmp/nnn.fifo" LC_COLLATE="C" SPLIT="h" nnn -edH -Pp' --wraps='env NNN_FIFO="/tmp/nnn.fifo" LC_COLLATE="C" SPLIT="h" nnn -edH' --description 'alias n env NNN_FIFO="/tmp/nnn.fifo" LC_COLLATE="C" SPLIT="h" nnn -edH' - env NNN_FIFO="/tmp/nnn.fifo" LC_COLLATE="C" SPLIT="h" nnn -edH $argv; -end diff --git a/.doom.d/config.el b/.doom.d/config.el new file mode 100644 index 0000000..2cd689b --- /dev/null +++ b/.doom.d/config.el @@ -0,0 +1,96 @@ +;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- + +;; Place your private configuration here! Remember, you do not need to run 'doom +;; sync' after modifying this file! + + +;; Some functionality uses this to identify you, e.g. GPG configuration, email +;; clients, file templates and snippets. +(setq user-full-name "Joseph Ferano" + user-mail-address "joseph@ctech.com") + +;; Doom exposes five (optional) variables for controlling fonts in Doom. Here +;; are the three important ones: +;; +;; + `doom-font' +;; + `doom-variable-pitch-font' +;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for +;; presentations or streaming. +;; +;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd +;; font string. You generally only need these two: +;; (setq doom-font (font-spec :family "monospace" :size 12 :weight 'semi-light) +;; doom-variable-pitch-font (font-spec :family "sans" :size 13)) + +(setq doom-font (font-spec :family "Fira Code Nerd Font" :size 15)) + +;; There are two ways to load a theme. Both assume the theme is installed and +;; available. You can either set `doom-theme' or manually load a theme with the +;; `load-theme' function. This is the default: +(setq doom-theme 'doom-vibrant) +;; Also looks nice doom-palenight + +;; If you use `org' and don't want your org files in the default location below, +;; change `org-directory'. It must be set before org loads! +(setq org-directory "~/org/") + +;; This determines the style of line numbers in effect. If set to `nil', line +;; numbers are disabled. For relative line numbers, set this to `relative'. +(setq display-line-numbers-type 'relative) + + +;; Here are some additional functions/macros that could help you configure Doom: +;; +;; - `load!' for loading external *.el files relative to this one +;; - `use-package!' for configuring packages +;; - `after!' for running code after a package has loaded +;; - `add-load-path!' for adding directories to the `load-path', relative to +;; this file. Emacs searches the `load-path' when you load packages with +;; `require' or `use-package'. +;; - `map!' for binding new keys +;; +;; To get information about any of these functions/macros, move the cursor over +;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k'). +;; This will open documentation for it, including demos of how they are used. +;; +;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how +;; they are implemented. + +(setq default-directory "~/") + +(setq which-key-idle-delay 0.4) + +(setq dired-listing-switches "-ahlgo -v --group-directories-first") + +(setq recentf-max-saved-items 1000) + +(defun joe/dired-same-buffer () + "In Dired, visit this file or directory in another window." + (interactive) + (find-alternate-file "..")) + +(defun joe/dired-open-with-wsl-open () + "Open file under cursor with wsl-open which should launch it on the windows side" + (interactive) + (shell-command (format "wsl-open '%s'" (dired-get-filename)))) + +(map! + (:n "-" #'dired-jump) + (:n "C-h" #'dired-jump) + (:after dired + :map dired-mode-map + :n "o" #'joe/dired-open-with-wsl-open + :n "s" #'dired-sort-toggle-or-edit + :n "-" #'joe/dired-same-buffer + :n "RET" #'dired-find-alternate-file) + (:after avy + :n "q" #'avy-goto-word-0)) + +(require 'avy) +(defvar avy-map (make-sparse-keymap)) + +(use-package! avy + :init + (setq avy-keys '(?a ?s ?d ?f ?w ?e ?r ?u ?i ?o ?h ?j ?k ?l ?x ?c ?m ?z ?p ?q ?t ?y ?b ?n)) + (setq avy-all-windows nil) + (setq avy-background t)) diff --git a/.doom.d/init.el b/.doom.d/init.el new file mode 100644 index 0000000..f5ec44f --- /dev/null +++ b/.doom.d/init.el @@ -0,0 +1,191 @@ +;;; 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 "Module Index" link where you'll find +;; a comprehensive list of Doom's modules and 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 + ;;chinese + ;;japanese + ;;layout ; auie,ctsrnm is the superior home row + + :completion + company ; the ultimate code completion backend + ;;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 ; 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) + ;;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) + ;;gist ; interacting with github gists + 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 + ;;upload ; map local to remote projects via ssh/ftp + + :os + (:if IS-MAC 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 ; 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 + ;;(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 +meghanada) ; 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 ; 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/.doom.d/packages.el b/.doom.d/packages.el new file mode 100644 index 0000000..3e21dc2 --- /dev/null +++ b/.doom.d/packages.el @@ -0,0 +1,52 @@ +;; -*- 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/raxod502/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 raxod502/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! avy) diff --git a/.emacs.d/init.el b/.emacs.vanilla/init.el similarity index 99% rename from .emacs.d/init.el rename to .emacs.vanilla/init.el index 5c545c7..a6d965f 100644 --- a/.emacs.d/init.el +++ b/.emacs.vanilla/init.el @@ -26,6 +26,8 @@ (require 'server) (if (not (server-running-p)) (server-start)) +(setq default-directory "/home/joe") + ;; Visuals (scroll-bar-mode -1) (tool-bar-mode -1) @@ -50,7 +52,7 @@ (global-hl-line-mode +1) (column-number-mode +1) -(set-face-attribute 'default nil :font "FiraCode Nerd Font" :height 120) +(set-face-attribute 'default nil :font "Fira Code Nerd Font" :height 115) ;; Text Settings (setq-default c-basic-offset 4) ;; This is annoying diff --git a/.gitignore b/.gitignore index 97a9101..ebf5ab2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ .emacs.d/var .emacs.d/transient .emacs.d/recentf +/.emacs.d/auto-save-list/