From aeefb0cced6633980e50ef3fc2b00b8e668590d3 Mon Sep 17 00:00:00 2001 From: Thomas Ruoff Date: Thu, 26 Sep 2019 20:32:37 +0200 Subject: [PATCH] from sratch --- emacs/.doom.d/config.el | 24 ----- emacs/.doom.d/init.el | 178 -------------------------------------- emacs/.doom.d/packages.el | 10 --- emacs/.emacs.d/.gitignore | 3 + emacs/.emacs.d/init.el | 130 ++++++++++++++++++++++++++++ emacs/.gitignore | 4 - 6 files changed, 133 insertions(+), 216 deletions(-) delete mode 100644 emacs/.doom.d/config.el delete mode 100644 emacs/.doom.d/init.el delete mode 100644 emacs/.doom.d/packages.el create mode 100644 emacs/.emacs.d/.gitignore create mode 100644 emacs/.emacs.d/init.el delete mode 100644 emacs/.gitignore diff --git a/emacs/.doom.d/config.el b/emacs/.doom.d/config.el deleted file mode 100644 index 8c053b9..0000000 --- a/emacs/.doom.d/config.el +++ /dev/null @@ -1,24 +0,0 @@ -;;; .dotfiles/emacs/.doom.d/config.el -*- lexical-binding: t; -*- - -;; Place your private configuration here - -(setq user-full-name "Thomas Ruoff") -(setq user-mail-address "thomasruoff@gmail.com") - -(eval-after-load 'js-mode - '(add-hook 'js-mode-hook #'add-node-modules-path)) - -(eval-after-load 'js2-mode - '(add-hook 'js2-mode-hook #'add-node-modules-path)) - -;; org-mode -(after! org - (setq org-directory "~/documents/org/") - (setq org-default-notes-file (concat org-directory "/notes.org")) - (setq org-clock-persist 'history) - (setq org-log-done 'time) - (setq org-todo-keywords '((sequence "TODO(t)" "WAIT(w)" "|" "DONE(d)"))) - (org-clock-persistence-insinuate)) - - -(setq doom-font (font-spec :family "Fira Code" :size 18)) diff --git a/emacs/.doom.d/init.el b/emacs/.doom.d/init.el deleted file mode 100644 index b87a990..0000000 --- a/emacs/.doom.d/init.el +++ /dev/null @@ -1,178 +0,0 @@ -;;; init.el -*- lexical-binding: t; -*- - -;; Copy this file to ~/.doom.d/init.el or ~/.config/doom/init.el ('doom install' -;; will do this for you). The `doom!' block below controls what modules are -;; enabled and in what order they will be loaded. Remember to run 'doom refresh' -;; after modifying it. -;; -;; More information about these modules (and what flags they support) can be -;; found in modules/README.org. - -(doom! :input - ;;chinese - ;;japanese - - :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 - - :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 - fill-column ; a `fill-column' indicator - hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW - ;;hydra - ;;indent-guides ; highlighted indent columns - modeline ; snazzy, Atom-inspired modeline, plus API - nav-flash ; blink the current line after jumping - ;;neotree ; a project drawer, like NERDTree for vim - ophints ; highlight the region an operation acts on - (popup ; tame sudden yet inevitable temporary windows - +all ; catch all popups that start with an asterix - +defaults) ; default popup rules - ;;pretty-code ; replace bits of code with pretty symbols - ;;tabs ; an 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 - - :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 - ;;lispy ; vim for lisp, for people who dont 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 +ranger) ; making dired pretty [functional] - ;;electric ; smarter, keyword-based electric-indent - ;;vc ; version-control and Emacs, sitting in a tree - - :term - ;;eshell ; a consistent, cross-platform shell (WIP) - ;;shell ; a terminal REPL for Emacs - ;;term ; terminals in Emacs - ;;vterm ; another terminals in Emacs - - :tools - ;;ansible - ;;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 ; run code, run (also, repls) - flycheck ; tasing you for every semicolon you forget - flyspell ; tasing you for misspelling mispelling - ;;gist ; interacting with github gists - (lookup ; helps you navigate your code and documentation - +docsets) ; ...or in Dash docsets locally - lsp - (:if IS-MAC - macos) ; MacOS-specific commands - 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 - ;;terraform ; infrastructure as code - ;;tmux ; an API for interacting with tmux - ;;upload ; map local to remote projects via ssh/ftp - ;;wakatime - - :lang - ;;agda ; types of types of types of types... - ;;assembly ; assembly for fun or debugging - ;;cc ; C/C++/Obj-C madness - ;;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 - ;;erlang ; an elegant language for a more civilized age - ;;elixir ; erlang done right - ;;elm ; care for a cup of TEA? - emacs-lisp ; drown in parentheses - ;;ess ; emacs speaks statistics - ;;fsharp ; ML stands for Microsoft's Language - ;;go ; the hipster dialect - ;;(haskell +intero) ; a language that's lazier than I am - ;;hy ; readability of scheme w/ speed of python - ;;idris ; - ;;(java +meghanada) ; 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 - ;;ledger ; an accounting system in Emacs - ;;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 - +dragndrop ; file drag & drop support - +ipython ; ipython support for babel - +pandoc ; pandoc integration into org's exporter - +gnuplot - +present) ; using Emacs for presentations - ;;perl ; write code no one else can comprehend - ;;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 - ;;rest ; Emacs as a REST client - ;;ruby ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - ;;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() - ;;scala ; java, but good - ;;scheme ; a fully conniving family of lisps - sh ; she sells {ba,z,fi}sh shells on the C xor - ;;solidity ; do you need a blockchain? No. - ;;swift ; who asked for emoji variables? - ;;terra ; Earth and Moon in alignment for performance. - web ; the tubes - ;;vala ; GObjective-C - - :email - ;;(mu4e +gmail) ; WIP - ;;notmuch ; WIP - ;;(wanderlust +gmail) ; WIP - - ;; Applications are complex and opinionated modules that transform Emacs - ;; toward a specific purpose. They may have additional dependencies and - ;; should be loaded late. - :app - ;;calendar - ;;irc ; how neckbeards socialize - ;;(rss +org) ; emacs as an RSS reader - ;;twitter ; twitter client https://twitter.com/vnought - ;;(write ; emacs for writers (fiction, notes, papers, etc.) - ;; +wordnut ; wordnet (wn) search - ;; +langtool) ; a proofreader (grammar/style check) for Emacs - - :config - ;; For literate config users. This will tangle+compile a config.org - ;; literate config in your `doom-private-dir' whenever it changes. - ;;literate - - ;; The default module sets reasonable defaults for Emacs. It also - ;; provides a Spacemacs-inspired keybinding scheme and a smartparens - ;; config. Use it as a reference for your own modules. - (default +bindings +smartparens)) diff --git a/emacs/.doom.d/packages.el b/emacs/.doom.d/packages.el deleted file mode 100644 index 662f9f3..0000000 --- a/emacs/.doom.d/packages.el +++ /dev/null @@ -1,10 +0,0 @@ -;; -*- no-byte-compile: t; -*- -;;; .dotfiles/emacs/.doom.d/packages.el - -;;; Examples: -;; (package! some-package) -;; (package! another-package :recipe (:host github :repo "username/repo")) -;; (package! builtin-package :disable t) - -(package! add-node-modules-path) -(package! exec-path-from-shell) diff --git a/emacs/.emacs.d/.gitignore b/emacs/.emacs.d/.gitignore new file mode 100644 index 0000000..87ea254 --- /dev/null +++ b/emacs/.emacs.d/.gitignore @@ -0,0 +1,3 @@ +elpa +forge-database.sqlite +transient diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el new file mode 100644 index 0000000..1e601fd --- /dev/null +++ b/emacs/.emacs.d/init.el @@ -0,0 +1,130 @@ +(add-hook 'emacs-startup-hook + (lambda () + (message "Emacs ready in %s with %d garbage collections." + (format "%.2f seconds" + (float-time + (time-subtract after-init-time before-init-time))) + gcs-done))) + +(require 'package) +(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) +(add-to-list 'package-archives '("org" . "http://orgmode.org/elpa/") t) +(package-initialize) + +(setq tls-checktrust t) +(setq gnutls-verify-error t) + +(mapc + (lambda (package) + (if (not (package-installed-p package)) + (progn + (package-refresh-contents) + (package-install package)))) + '(use-package diminish bind-key)) + +(eval-when-compile + (require 'use-package)) +(require 'diminish) +(require 'bind-key) +(setq use-package-always-ensure t) + +(use-package flx) +(use-package helm-flx) +(use-package helm + :demand + :diminish helm-mode + :bind (("M-x" . helm-M-x) + ("M-y" . helm-show-kill-ring) + ("C-x b" . helm-mini) + ("C-x C-f" . helm-find-files) + ("C-x r l" . helm-bookmarks) + ("C-c s" . helm-occur) + :map helm-find-files-map ;; I like these from Ido + ("C-" . helm-execute-persistent-action) + ("C-" . helm-find-files-up-one-level)) + :config + (helm-mode 1) + (helm-flx-mode +1) + (setq helm-M-x-fuzzy-match t) + (setq helm-locate-fuzzy-match t) + (setq helm-lisp-fuzzy-completion t) + (setq helm-bookmark-show-location t) + (setq helm-buffer-max-length 30)) +(add-hook 'emacs-startup-hook + (lambda () + (message "Emacs ready in %s with %d garbage collections." + (format "%.2f seconds" + (float-time + (time-subtract after-init-time before-init-time))) + gcs-done))) + +(require 'package) +(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) +(add-to-list 'package-archives '("org" . "http://orgmode.org/elpa/") t) +(package-initialize) + +(setq tls-checktrust t) +(setq gnutls-verify-error t) + +(mapc + (lambda (package) + (if (not (package-installed-p package)) + (progn + (package-refresh-contents) + (package-install package)))) + '(use-package diminish bind-key)) + +(eval-when-compile + (require 'use-package)) +(require 'diminish) +(require 'bind-key) +(setq use-package-always-ensure t) + +(use-package flx) +(use-package helm-flx) +(use-package helm + :demand + :diminish helm-mode + :bind (("M-x" . helm-M-x) + ("M-y" . helm-show-kill-ring) + ("C-x b" . helm-mini) + ("C-x C-f" . helm-find-files) + ("C-x r l" . helm-bookmarks) + ("C-c s" . helm-occur) + :map helm-find-files-map ;; I like these from Ido + ("C-" . helm-execute-persistent-action) + ("C-" . helm-find-files-up-one-level)) + :config + (helm-mode 1) + (helm-flx-mode +1) + (setq helm-M-x-fuzzy-match t) + (setq helm-locate-fuzzy-match t) + (setq helm-lisp-fuzzy-completion t) + (setq helm-bookmark-show-location t) + (setq helm-buffer-max-length 30)) + +(use-package magit + :bind ("C-x g" . magit-status)) + +(use-package forge) + +(setq user-full-name "Thomas Ruoff" + calendar-latitude 48.286993 + calendar-longitude 8.726407 + calendar-location-name "Rosenfeld, Germany") + + +(use-package f) +(use-package org) +(setq org-directory "~/org/") +(setq org-agenda-files '("~/org")) + +(use-package org-bullets + :config (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))) + +; fullscreen +(toggle-frame-maximized) + + +(add-hook 'org-mode-hook 'flyspell-mode) +(add-hook 'text-mode-hook 'flyspell-mode) diff --git a/emacs/.gitignore b/emacs/.gitignore deleted file mode 100644 index c7a9c57..0000000 --- a/emacs/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -elpa -games -transient -projectile-bookmarks.eld