From 0dc52132d1e1c4a5e1a00a516291f20cc78ed2e0 Mon Sep 17 00:00:00 2001 From: DustVoice Date: Wed, 21 Sep 2022 10:16:04 +0200 Subject: [PATCH] Adjust some configs and add doom emacs --- .config/.gitignore | 1 + .config/bat/config | 25 +++++ .config/fish/conf.d/.gitignore | 7 ++ .config/fish/conf.d/env.fish | 26 +++-- .doom.d/.gitignore | 7 ++ .doom.d/config.el | 79 ++++++++++++++ .doom.d/init.el | 194 +++++++++++++++++++++++++++++++++ .doom.d/packages.el | 50 +++++++++ .emacs.d | 1 + .gitconfig | 44 ++++++-- .gitignore | 3 + .gitmodules | 3 + 12 files changed, 418 insertions(+), 22 deletions(-) create mode 100644 .config/bat/config create mode 100644 .config/fish/conf.d/.gitignore create mode 100644 .doom.d/.gitignore create mode 100644 .doom.d/config.el create mode 100644 .doom.d/init.el create mode 100644 .doom.d/packages.el create mode 160000 .emacs.d diff --git a/.config/.gitignore b/.config/.gitignore index 40a40972..0f2ac0a5 100644 --- a/.config/.gitignore +++ b/.config/.gitignore @@ -6,6 +6,7 @@ !/nvim !/alacritty/ +!/bat/ !/bspwm/ !/dmenu/ !/dmenu-wl/ diff --git a/.config/bat/config b/.config/bat/config new file mode 100644 index 00000000..f548173d --- /dev/null +++ b/.config/bat/config @@ -0,0 +1,25 @@ +# This is `bat`s configuration file. Each line either contains a comment or +# a command-line option that you want to pass to `bat` by default. You can +# run `bat --help` to get a list of all possible configuration options. + +# Specify desired highlighting theme (e.g. "TwoDark"). Run `bat --list-themes` +# for a list of all available themes +--theme="Dracula" + +# Enable this to use italic text on the terminal. This is not supported on all +# terminal emulators (like tmux, by default): +#--italic-text=always + +# Uncomment the following line to disable automatic paging: +#--paging=never + +# Uncomment the following line if you are using less version >= 551 and want to +# enable mouse scrolling support in `bat` when running inside tmux. This might +# disable text selection, unless you press shift. +#--pager="less --RAW-CONTROL-CHARS --quit-if-one-screen --mouse" + +# Syntax mappings: map a certain filename pattern to a language. +# Example 1: use the C++ syntax for Arduino .ino files +# Example 2: Use ".gitignore"-style highlighting for ".ignore" files +#--map-syntax "*.ino:C++" +#--map-syntax ".ignore:Git Ignore" diff --git a/.config/fish/conf.d/.gitignore b/.config/fish/conf.d/.gitignore new file mode 100644 index 00000000..cda0e2e3 --- /dev/null +++ b/.config/fish/conf.d/.gitignore @@ -0,0 +1,7 @@ +/* +/*/ +!/.gitignore + +!/dracula.fish +!/env.fish +!/path.fish.example diff --git a/.config/fish/conf.d/env.fish b/.config/fish/conf.d/env.fish index 4dca1110..b6204bd5 100644 --- a/.config/fish/conf.d/env.fish +++ b/.config/fish/conf.d/env.fish @@ -1,19 +1,21 @@ -set -x LANG "en_US.UTF-8" -set -x EDITOR "nvim" -set -x TERMINAL "alacritty" +set -gx LANG "en_US.UTF-8" +set -gx EDITOR "nvim" +set -gx TERMINAL "alacritty" +set -gx GIT_PAGER "delta" +set -gx DOOMPAGER "delta" -set -x SSH_AUTH_SOCK "$(gpgconf --list-dir socketdir)/S.gpg-agent.ssh" -set -x GPG_TTY $(tty) +set -gx SSH_AUTH_SOCK "$(gpgconf --list-dir socketdir)/S.gpg-agent.ssh" +set -gx GPG_TTY $(tty) -set -x CXXFLAGS "-std=c++14" +set -gx CXXFLAGS "-std=c++14" -set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH -set -x XDG_CONFIG_HOME "$HOME/.config" +set -gx LD_LIBRARY_PATH $LD_LIBRARY_PATH +set -gx XDG_CONFIG_HOME "$HOME/.config" -set -x JUCE_PATH "$HOME/JUCE" +set -gx JUCE_PATH "$HOME/JUCE" -set -x LIBGL_ALWAYS_INDIRECT 1 +set -gx LIBGL_ALWAYS_INDIRECT 1 -set -x WINIT_X11_SCALE_FACTOR 1 +set -gx WINIT_X11_SCALE_FACTOR 1 -set -x MOZ_ENABLE_WAYLAND 1 +set -gx MOZ_ENABLE_WAYLAND 1 diff --git a/.doom.d/.gitignore b/.doom.d/.gitignore new file mode 100644 index 00000000..7674f989 --- /dev/null +++ b/.doom.d/.gitignore @@ -0,0 +1,7 @@ +/* +/*/ +!/.gitignore + +!/config.el +!/init.el +!/packages.el diff --git a/.doom.d/config.el b/.doom.d/config.el new file mode 100644 index 00000000..b93a6ee5 --- /dev/null +++ b/.doom.d/config.el @@ -0,0 +1,79 @@ +;;; $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. It is optional. +(setq user-full-name "David Holland" + user-mail-address "info@dustvoice.de") + +;; Doom exposes five (optional) variables for controlling fonts in Doom: +;; +;; - `doom-font' -- the primary font to use +;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable) +;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for +;; presentations or streaming. +;; - `doom-unicode-font' -- for unicode glyphs +;; - `doom-serif-font' -- for the `fixed-pitch-serif' face +;; +;; See 'C-h v doom-font' for documentation and more examples of what they +;; accept. For example: +;; +;;(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light) +;; doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13)) +;; +;; If you or Emacs can't find your font, use 'M-x describe-font' to look them +;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to +;; refresh your font settings. If Emacs still can't find your font, it likely +;; wasn't installed correctly. Font issues are rarely Doom issues! +(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light) + doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13)) + +;; 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-one) +(setq doom-theme 'doom-dracula) + +;; 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) + +;; 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/") + + +;; Whenever you reconfigure a package, make sure to wrap your config in an +;; `after!' block, otherwise Doom's defaults may override your settings. E.g. +;; +;; (after! PACKAGE +;; (setq x y)) +;; +;; The exceptions to this rule: +;; +;; - Setting file/directory variables (like `org-directory') +;; - Setting variables which explicitly tell you to set them before their +;; package is loaded (see 'C-h v VARIABLE' to look up their documentation). +;; - Setting doom variables (which start with 'doom-' or '+'). +;; +;; Here are some additional functions/macros that will 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. +;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces, +;; etc). +;; +;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how +;; they are implemented. diff --git a/.doom.d/init.el b/.doom.d/init.el new file mode 100644 index 00000000..e7a05dd2 --- /dev/null +++ b/.doom.d/init.el @@ -0,0 +1,194 @@ +;;; 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 + ;;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) + ;;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 + ;;tree-sitter ; syntax and parsing, sitting in a tree... + ;;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 +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/.doom.d/packages.el b/.doom.d/packages.el new file mode 100644 index 00000000..839b83c5 --- /dev/null +++ b/.doom.d/packages.el @@ -0,0 +1,50 @@ +;; -*- 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) diff --git a/.emacs.d b/.emacs.d new file mode 160000 index 00000000..e9ef904e --- /dev/null +++ b/.emacs.d @@ -0,0 +1 @@ +Subproject commit e9ef904eeef28c31ca07055f0cce8c5eafeb4179 diff --git a/.gitconfig b/.gitconfig index d81b64a2..e68e6ae3 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,17 +1,41 @@ [user] - email = info@dustvoice.de - name = DustVoice - signingkey = 7A9CA430D426100E + email = info@dustvoice.de + name = DustVoice + signingkey = 7A9CA430D426100E + [core] - editor = nvim + editor = nvim + pager = delta + +[interactive] + diffFilter = delta --color-only +[add.interactive] + useBuiltin = false # required for git 2.37.0 + +[delta] + navigate = true # use n and N to move between diff sections + light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal) + side-by-side = false + line-numbers = true + [push] - default = simple - followTags = true + default = simple + followTags = true + [commit] - gpgsign = true + gpgsign = true + [gpg] - program = gpg2 + program = gpg2 + [pull] - rebase = false + rebase = false + [http] - postBuffer = 500M + postBuffer = 500M + +[merge] + conflictstyle = diff3 + +[diff] + colorMoved = default diff --git a/.gitignore b/.gitignore index d0f68fae..fb23802d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ !/.gitignore !/.bashrc +!/.doom.d +!/.emacs.d !/.gitconfig !/.nvidia-xinitrc !/.password-store @@ -25,4 +27,5 @@ !/.weechat/ !/.ssh/ !/.znap/ +!/org/ !/Wallpapers/ diff --git a/.gitmodules b/.gitmodules index f5dbe203..0c2dda84 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule ".znap/zsh-snap"] path = .znap/zsh-snap url = https://github.com/marlonrichert/zsh-snap.git +[submodule ".emacs.d"] + path = .emacs.d + url = https://github.com/doomemacs/doomemacs