diff --git a/.chezmoiignore b/.chezmoiignore index 7385967..db94874 100644 --- a/.chezmoiignore +++ b/.chezmoiignore @@ -1,4 +1,3 @@ LICENSE -cool_cli_tools.md -packer_compiled.lua -plugin/ +misc/ +.gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e43b0f9 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.DS_Store diff --git a/cool_cli_tools.md b/cool_cli_tools.md deleted file mode 100644 index 6e5ebfd..0000000 --- a/cool_cli_tools.md +++ /dev/null @@ -1,6 +0,0 @@ -- [zoxide](https://github.com/ajeetdsouza/zoxide) -- [bat](https://github.com/sharkdp/bat) -- [tokei](https://github.com/XAMPPRocky/tokei) -- rg of course -- hexyl (https://github.com/sharkdp/hexyl) -- exa diff --git a/dot_config/fish/executable_config.fish b/dot_config/fish/executable_config.fish index b7a5883..2960dae 100644 --- a/dot_config/fish/executable_config.fish +++ b/dot_config/fish/executable_config.fish @@ -40,6 +40,7 @@ setpath ~/.radicle/bin setpath ~/.edgedb/bin setpath ~/.fly/bin setpath ~/.nimble/bin +setpath ~/Projects/go/bin # zoxide setup zoxide init fish | source @@ -70,6 +71,7 @@ set -x TZ_LIST "Europe/Berlin;Berlin,America/New_York;US East,America/Los_Angele # General Aliases alias editconfig "chezmoi edit ~/.config/fish/config.fish; and chezmoi apply; and source ~/.config/fish/config.fish" alias getsshkey "cat ~/.ssh/id_ed25519.pub -p --color never" +alias doco "docker-compose" alias j "z" alias cat "bat" alias c "cargo" diff --git a/dot_config/fish/fish_plugins b/dot_config/fish/fish_plugins index 74ded65..8438ce7 100644 --- a/dot_config/fish/fish_plugins +++ b/dot_config/fish/fish_plugins @@ -1,5 +1,4 @@ jorgebucaran/fisher -jorgebucaran/fish-nvm franciscolourenco/done laughedelic/pisces oh-my-fish/plugin-foreign-env diff --git a/dot_doom.d/config.el b/dot_doom.d/config.el index 245d4f5..5f27ef9 100644 --- a/dot_doom.d/config.el +++ b/dot_doom.d/config.el @@ -1,169 +1,44 @@ -;;; ~/.doom.d/config.el -*- lexical-binding: t; -*- +;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- -(load-theme 'doom-solarized-dark-high-contrast t) -(setq doom-solarized-dark-high-contrast-brighter-comments t) +;; Place your private configuration here! Remember, you do not need to run 'doom +;; sync' after modifying this file! -;; Set to 2 spaces -(setq default-tab-width 2) -(setq tab-width 2) -(setq web-mode-markup-indent-offset 2) -(setq web-mode-css-indent-offset 2) -(setq web-mode-code-indent-offset 2) -(setq js2-mode-hook - '(lambda () (progn - (set-variable 'js2-basic-offset 2)))) -(setq css-mode-hook - '(lambda () (progn - (set-variable 'css-indent-offset 2)))) -(setq typescript-mode-hook - '(lambda () (progn - (set-variable 'typescript-indent-level 2)))) -;; Maximize the window upon startup +;; Some functionality uses this to identify you, e.g. GPG configuration, email +;; clients, file templates and snippets. It is optional. +(setq user-full-name "mokou" + user-mail-address "mokou@fastmail.com") + +;; Maximize the window after startup (add-to-list 'default-frame-alist '(fullscreen . maximized)) -(setq doom-font (font-spec :family "Fantasque Sans Mono" :size 17)) +(setq doom-font (font-spec :family "JetBrains Mono" :size 14)) -(when (memq window-system '(mac ns x)) - (exec-path-from-shell-initialize)) +;; 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 'tango) -;; Configure some lsp-mode stuff -(after! lsp-mode - (setq lsp-ui-sideline-show-code-actions nil)) +;; 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 t) -;; Enable prettier in RJSX-mode -(add-hook 'rjsx-mode-hook 'prettier-js-mode) -(add-hook 'typescript-mode-hook 'prettier-js-mode) -(add-hook 'typescript-tsx-mode-hook 'prettier-js-mode) +;; 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/") -;; Add prolog support for .dl files -(add-to-list 'auto-mode-alist '("\\.dl\\'" . prolog-mode)) +;; Set default tab width to 2 +(setq tab-width 2) -;; Enable Mercurial support for git-gutter -(setq git-gutter:handled-backends '(git hg)) +;; Set a custom splash screen +(setq fancy-splash-image "~/.local/share/chezmoi/misc/emacs-splash.png") -;; Load auth keys from .authinfo -(setq auth-sources '("~/.authinfo")) - -;; Enable editorconfig -(editorconfig-mode 1) - -;; mu4e config -(set-email-account! "posteo" - '((mu4e-sent-folder . "/Sent") - (mu4e-drafts-folder . "/Drafts") - (mu4e-trash-folder . "/Trash") - (mu4e-refile-folder . "/INBOX") - (smtpmail-smtp-user . "mokou@posteo.net") - (user-mail-address . "mokou@posteo.de")) +;; Configure email account +(set-email-account! "fastmail.com" + '((mu4e-sent-folder . "/fastmail/Sent") + (mu4e-drafts-folder . "/fastmail/Drafts") + (mu4e-trash-folder . "/fastmail/Trash") + (mu4e-refile-folder . "/fastmail/Archive") + (smtpmail-smtp-user . "mokou@fastmail.com") + (user-mail-address . "mokou@fastmail.com")) t) -(map! :map global-map :leader "M" 'mu4e) -;; use https://github.com/grobian/html2text -(setq mu4e-html2text-command "html2text") - -(setq rustic-lsp-server 'rls) - -;; Org configuration -(after! org - (add-to-list 'org-modules 'org-habit) - (setq-default org-directory "~/code/personal/org") - (setq-default org-default-notes-file "~/code/personal/org/inbox.org") - (setq-default org-todo-keywords - (quote ((sequence "TODO(t)" "DONE(d)" "WAITING(w@/!)")))) - (setq-default org-todo-keyword-faces - (quote (("TODO" :foreground "tomato" :weight bold) - ("DONE" :foreground "forest green" :weight bold) - ("WAITING" :foreground "chocolate" :weight bold)))) - (setq org-capture-templates - (quote (("t" "todo" entry (file "~/code/personal/org/inbox.org") - "* TODO %?\n%U\n" :clock-in t :clock-resume t) - ("n" "note" entry (file "~/code/personal/org/inbox.org") - "* %? :NOTE:\n%U\n%a\n" :clock-in t :clock-resume t)))) - (setq org-refile-targets '((nil :maxlevel . 9) - (org-agenda-files :maxlevel . 9))) - (org-clock-persistence-insinuate) - (setq org-clock-in-switch-to-state 'cf/clock-in-to-next) - (setq org-clock-into-drawer t) - (setq org-clock-out-remove-zero-time-clocks t) - (setq org-clock-out-when-done t) - (setq org-clock-persist t) - (setq org-clock-auto-clock-resolution (quote when-no-clock-is-running)) - (setq org-clock-report-include-clocking-task t) - (setq org-agenda-dim-blocked-tasks nil) - (setq org-agenda-compact-blocks t) - (setq org-archive-location "~/code/personal/org/_archive.org::") - (setq org-agenda-custom-commands - (quote ((" " "Agenda" - ((agenda "" nil) - (tags "REFILE" - ((org-agenda-overriding-header "Tasks to Refile") - (org-tags-match-list-sublevels nil))) - (tags-todo "-CANCELLED+WAITING|HOLD/!" - ((org-agenda-overriding-header (concat "Waiting Tasks")) - (org-agenda-skip-function 'cf/skip-non-tasks) - (org-tags-match-list-sublevels nil) - (org-agenda-todo-ignore-scheduled cf/hide-scheduled-and-waiting-next-tasks) - (org-agenda-todo-ignore-deadlines cf/hide-scheduled-and-waiting-next-tasks)))) - nil))))) - -(map! :map global-map :leader "a" 'org-agenda) -(map! :map org-mode-map :leader "m c p" 'org-pomodoro) - -(defvar cf/hide-scheduled-and-waiting-next-tasks t) - -(defun cf/clock-in-to-next (kw) - (when (not (and (boundp 'org-capture-mode) org-capture-mode)) - (cond - ((and (member (org-get-todo-state) (list "WAITING")) - (cf/is-task-p)) - "TODO")))) - -(defun cf/find-project-task () - (save-restriction - (widen) - (let ((parent-task (save-excursion (org-back-to-heading 'invisible-ok) (point)))) - (while (org-up-heading-safe) - (when (member (nth 2 (org-heading-components)) org-todo-keywords-1) - (setq parent-task (point)))) - (goto-char parent-task) - parent-task))) - -(defun cf/is-project-p () - (save-restriction - (widen) - (let ((has-subtask) - (subtree-end (save-excursion (org-end-of-subtree t))) - (is-a-task (member (nth 2 (org-heading-components)) org-todo-keywords-1))) - (save-excursion - (forward-line 1) - (while (and (not has-subtask) - (< (point) subtree-end) - (re-search-forward "^\*+ " subtree-end t)) - (when (member (org-get-todo-state) org-todo-keywords-1) - (setq has-subtask t)))) - (and is-a-task has-subtask)))) - -(defun cf/is-task-p () - (save-restriction - (widen) - (let ((has-subtask) - (subtree-end (save-excursion (org-end-of-subtree t))) - (is-a-task (member (nth 2 (org-heading-components)) org-todo-keywords-1))) - (save-excursion - (forward-line 1) - (while (and (not has-subtask) - (< (point) subtree-end) - (re-search-forward "^\*+ " subtree-end t)) - (when (member (org-get-todo-state) org-todo-keywords-1) - (setq has-subtask t)))) - (and is-a-task (not has-subtask))))) - -(defun cf/skip-non-tasks () - (save-restriction - (widen) - (let ((next-headline (save-excursion (or (outline-next-heading) (point-max))))) - (cond - ((cf/is-task-p) - nil) - (t - next-headline))))) diff --git a/dot_doom.d/init.el b/dot_doom.d/init.el index 1e6d47e..dcee444 100644 --- a/dot_doom.d/init.el +++ b/dot_doom.d/init.el @@ -4,8 +4,8 @@ ;; 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. +;; 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 @@ -15,6 +15,7 @@ ;; 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 @@ -30,15 +31,15 @@ ;;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) ; 🙂 + ;;doom-quit ; DOOM quit-message prompts when you quit Emacs + (emoji +unicode +github) ; 🙂 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 +light) ; snazzy, Atom-inspired modeline, plus API - nav-flash ; blink cursor line after big motions + ;;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 @@ -49,7 +50,7 @@ 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 + zen ; distraction-free coding or writing :editor (evil +everywhere); come to the dark side, we have cookies @@ -61,12 +62,12 @@ ;;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 + ;;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 + word-wrap ; soft wrapping with language-aware indent :emacs - (dired +icons) ; making dired pretty [functional] + (dired +ranger +icons) ; making dired pretty [functional] electric ; smarter, keyword-based electric-indent ;;ibuffer ; interactive buffer management undo ; persistent, smarter undo for your inevitable mistakes @@ -85,22 +86,23 @@ :tools ;;ansible + ;;biblio ; Writes a PhD for you (citation needed) ;;debugger ; FIXME stepping through code, to help you add bugs ;;direnv - docker + ;;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 +peek) ; M-x vscode - magit ; a git porcelain for Emacs - make ; run make tasks from Emacs + lsp ; M-x vscode + (magit +forge) ; 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 + 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 @@ -112,43 +114,45 @@ :lang ;;agda ; types of types of types of types... ;;beancount ; mind the GAAP - ;;cc ; C > C++ == 1 + (cc +lsp) ; C > C++ == 1 ;;clojure ; java with a lisp - common-lisp ; if you've seen one lisp, you've seen them all + ;;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 +lsp) ; 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 ;;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 +meghanada) ; the poster child for carpal tunnel syndrome - javascript ; all(hope(abandon(ye(who(enter(here)))))) + ;;(java +lsp) ; the poster child for carpal tunnel syndrome + (javascript +lsp) ; 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 + 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 + (org +roam2) ; organize your plain life in plain text ;;php ; perl's insecure younger brother ;;plantuml ; diagrams for confusing people more ;;purescript ; javascript, but functional @@ -158,21 +162,21 @@ ;;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'}"} + (ruby +lsp +rbenv) ; 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 + (sh +lsp +fish) ; 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 + (web +lsp) ; the tubes yaml ; JSON, but readable ;;zig ; C, but simpler :email - ;;(mu4e +org +gmail) + (mu4e +org +gmail) ;;notmuch ;;(wanderlust +gmail) @@ -187,4 +191,3 @@ :config ;;literate (default +bindings +smartparens)) - diff --git a/dot_doom.d/packages.el b/dot_doom.d/packages.el index 4af73bb..b80e9cc 100644 --- a/dot_doom.d/packages.el +++ b/dot_doom.d/packages.el @@ -1,14 +1,50 @@ ;; -*- no-byte-compile: t; -*- -;;; ~/.doom.d/packages.el +;;; $DOOMDIR/packages.el -;;; Examples: -;; (package! some-package) -;; (package! another-package :recipe (:fetcher github :repo "username/repo")) -;; (package! builtin-package :disable t) -(package! monky) -(package! exec-path-from-shell) -(package! editorconfig) -(package! gruvbox-theme) -(package! org-pomodoro) -(package! doom-themes) -(package! prettier-js) +;; 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) diff --git a/misc/emacs-disable-alchemist.patch b/misc/emacs-disable-alchemist.patch new file mode 100644 index 0000000..e69de29 diff --git a/misc/emacs-splash.png b/misc/emacs-splash.png new file mode 100644 index 0000000..a121693 Binary files /dev/null and b/misc/emacs-splash.png differ