diff --git a/dot_config/doom/config.el b/dot_config/doom/config.el index 19b4cd9..7a535f8 100644 --- a/dot_config/doom/config.el +++ b/dot_config/doom/config.el @@ -1,17 +1,14 @@ ;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- -(setq user-full-name "liv" - user-mail-address "shadows@with.al") +(setq user-full-name "pelsh" + user-mail-address "mail@liv.nrw") ;; Set fonts and window sizes (add-to-list 'default-frame-alist '(fullscreen . maximized)) (if (string= (system-name) "enoko") - (setq doom-font (font-spec :family "RecMonoCasual Nerd Font" :size 25 :weight 'semi-light)) - (setq doom-font (font-spec :family "RecMonoCasual Nerd Font" :size 17 :weight 'semi-light))) - - - + (setq doom-font (font-spec :family "Recursive Mono Casual Static" :size 25 :weight 'semi-light)) + (setq doom-font (font-spec :family "Recursive Mono Casual Static" :size 17 :weight 'semi-light))) ;; Load our cute color scheme (setq catppuccin-flavor 'mocha) @@ -28,15 +25,6 @@ ;; Set our tab-width (setq-default tab-width 2) -;; Configure exercism -(use-package! exercism - :config - (map! :map global-map :nv "SPC o e" #'exercism)) - -;; Increase Nix LSP memory limit -(after! lsp-mode - (setq lsp-nix-nil-max-mem 15000)) - (map! :leader :desc "Find in Chezmoi dotfiles" :n "f ." #'chezmoi-find) (map! :leader :desc "Save a Chezmoi dotfile" :n "f ," #'chezmoi-write) diff --git a/dot_config/doom/init.el b/dot_config/doom/init.el index f9ece12..61f91d3 100644 --- a/dot_config/doom/init.el +++ b/dot_config/doom/init.el @@ -22,7 +22,7 @@ :completion ;;company ; the ultimate code completion backend - (corfu +icons +orderless) ; complete with cap(f), cape and a flying feather! + (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 @@ -33,18 +33,18 @@ 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) ; 🙂 + (emoji +unicode) ; 🙂 hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW 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 + ;;ligatures ; ligatures and symbols to make your code pretty again + ;;minimap ; show a map of the code on the side (modeline +light) ; snazzy, Atom-inspired modeline, plus API - ;;nav-flash ; blink cursor line after big motions - ;; neotree ; a project drawer, like NERDTree for vim + 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 + ;;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 @@ -58,20 +58,20 @@ 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 + ;;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 + ;;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 + ;;snippets ; my elves. They type so I don't have to + ;;word-wrap ; soft wrapping with language-aware indent :emacs - (dired +dirvish) ; making dired pretty [functional] + dired ; making dired pretty [functional] electric ; smarter, keyword-based electric-indent eww ; the internet is gross ibuffer ; interactive buffer management - (undo +tree) ; persistent, smarter undo for your inevitable mistakes + undo ; persistent, smarter undo for your inevitable mistakes vc ; version-control and Emacs, sitting in a tree :term @@ -90,13 +90,13 @@ ;;biblio ; Writes a PhD for you (citation needed) ;;collab ; buffers with friends ;;debugger ; FIXME stepping through code, to help you add bugs - direnv + ;;direnv ;;docker - editorconfig ; let someone else argue about tabs vs spaces + ;;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 +peek) ; M-x vscode + (lsp +eglot) ; M-x vscode magit ; a git porcelain for Emacs ;;make ; run make tasks from Emacs ;;pass ; password manager for nerds @@ -115,7 +115,7 @@ ;;agda ; types of types of types of types... ;;beancount ; mind the GAAP ;;(cc +lsp) ; C > C++ == 1 - (clojure +tree-sitter +lsp) ; java with a lisp + ;;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 @@ -123,7 +123,7 @@ ;;data ; config/data formats ;;(dart +flutter) ; paint ui and not much else ;;dhall - ;; (elixir +lsp +tree-sitter) ; erlang done right + ;;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 @@ -139,9 +139,9 @@ ;;(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 +tree-sitter) ; the poster child for carpal tunnel syndrome - (javascript +lsp +tree-sitter) ; all(hope(abandon(ye(who(enter(here)))))) + ;;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 @@ -150,29 +150,29 @@ ;;lua ; one-based indices? one-based indices markdown ; writing docs for people to ignore ;;nim ; python + lisp at the speed of c - (nix +lsp +tree-sitter) ; I hereby declare "nix geht mehr!" + ;;nix ; I hereby declare "nix geht mehr!" ;;ocaml ; an objective camel org ; organize your plain life in plain text - ;; (php +lsp +tree-sitter) ; perl's insecure younger brother + ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;graphviz ; diagrams for confusing yourself even more ;;purescript ; javascript, but functional - ;; (python +lsp +pyright +tree-sitter) ; beautiful is better than ugly + ;;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 +tree-sitter +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + (rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;scala ; java, but good ;;(scheme +guile) ; a fully conniving family of lisps - (sh +fish) ; she sells {ba,z,fi}sh shells on the C xor + 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 +tree-sitter +lsp) ; the tubes + ;;web ; the tubes ;;yaml ; JSON, but readable ;;zig ; C, but simpler @@ -191,4 +191,3 @@ :config ;;literate (default +bindings +smartparens)) - diff --git a/dot_config/doom/packages.el b/dot_config/doom/packages.el index 32d12e1..d2f38d6 100644 --- a/dot_config/doom/packages.el +++ b/dot_config/doom/packages.el @@ -8,9 +8,6 @@ ;; Catppucin! (package! catppuccin-theme) -;; Exercism integration, very useful -(package! exercism) - ;; Chezmoi integration (package! chezmoi)