From 625e7273f0b6a9ee0de6443f58e848390da6c68d Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Fri, 25 Dec 2020 17:22:30 +0100 Subject: [PATCH] Remove doom emacs, add vanilla emacs --- Makefile | 7 +- doom/config.el | 56 --------------- doom/init.el | 180 ----------------------------------------------- doom/packages.el | 69 ------------------ emacs.el | 156 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 162 insertions(+), 306 deletions(-) delete mode 100644 doom/config.el delete mode 100644 doom/init.el delete mode 100644 doom/packages.el create mode 100644 emacs.el diff --git a/Makefile b/Makefile index 26e95d2..5855210 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,9 @@ alacritty: $(DESTDIR)$(PREFIX)/alacritty.yml sway: $(DESTDIR)$(PREFIX)/sway/config -.PHONY: fish i3 i3status vis Xresources fontconfig srcfile st gitconfig zls alacritty sway +emacs: $(DESTDIR)/.emacs + +.PHONY: fish i3 i3status vis Xresources fontconfig srcfile st gitconfig zls alacritty sway emacs ## Actual file operations @@ -61,3 +63,6 @@ $(DESTDIR)$(PREFIX)/alacritty.yml: $(PWD)/alacritty.yml $(DESTDIR)$(PREFIX)/sway/config: $(PWD)/sway/config ln -sf $^ $@ + +$(DESTDIR)/.emacs: $(PWD)/emacs.el + ln -sf $^ $@ diff --git a/doom/config.el b/doom/config.el deleted file mode 100644 index a139a1c..0000000 --- a/doom/config.el +++ /dev/null @@ -1,56 +0,0 @@ -;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- - -;; Place your private configuration here! Remember, you do not need to run 'doom -;; refresh' 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 "Joachim Schmidt" - user-mail-address "joachim.schmidt557@outlook.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' -;; -;; 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 "Fira Code" :size 16)) - -;; 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. These are the defaults. -(setq doom-theme 'doom-one) - -;; If you intend to use org, it is recommended you change this! -(setq org-directory "~/org/") - -;; If you want to change the style of line numbers, change this to `relative' or -;; `nil' to disable it: -(setq display-line-numbers-type t) - - -;; 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', where Emacs -;; looks 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 g k'). -;; This will open documentation for it, including demos of how they are used. -;; -;; You can also try 'gd' (or 'C-c g d') to jump to their definition and see how -;; they are implemented. - -;; ERC settings -;; Use IRC password from ~/.authinfo.gpg -(setq erc-prompt-for-password nil) - -(setq erc-nick "josch557") diff --git a/doom/init.el b/doom/init.el deleted file mode 100644 index 662282f..0000000 --- a/doom/init.el +++ /dev/null @@ -1,180 +0,0 @@ -;;; 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 information about all 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 g 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 g d') on a module to browse its -;; directory (for easy access to its source code). - -(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 - ;;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 - 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 - - :checkers - syntax ; tasing you for every semicolon you forget - ;;spell ; tasing you for misspelling mispelling - ;;grammar ; tasing grammar mistake every you make - - :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 +overlay) ; run code, run (also, repls) - ;;gist ; interacting with github gists - (lookup ; helps you navigate your code and documentation - +docsets) ; ...or in Dash docsets locally - ;;lsp - ;;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 - - :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 - ;;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 - ;;faust ; dsp, but you get to keep your soul - ;;fsharp ; ML stands for Microsoft's Language - ;;go ; the hipster dialect - (haskell +dante) ; 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 ; 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 - ;;factor - ;;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 ; drag & drop files/images into org buffers - ;;+hugo ; use Emacs for hugo blogging - ;;+jupyter ; ipython/jupyter support for babel - ;;+pandoc ; export-with-pandoc support - ;;+pomodoro ; be fruitful with the tomato technique - +present) ; using org-mode 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 - ;;rst ; ReST in peace - ;;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 - - :email - ;;(mu4e +gmail) - ;;notmuch - (wanderlust +gmail) - - :app - ;;calendar - ;;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/packages.el b/doom/packages.el deleted file mode 100644 index 7891828..0000000 --- a/doom/packages.el +++ /dev/null @@ -1,69 +0,0 @@ -;; -*- no-byte-compile: t; -*- -;;; $DOOMDIR/packages.el - -;; This is where you install packages, by declaring them with the `package!' -;; macro, then running 'doom refresh' on the command line. You'll need to -;; restart Emacs for your changes to take effect! Or at least, run M-x -;; `doom/reload'. -;; -;; WARNING: Don't disable core packages listed in ~/.emacs.d/core/packages.el. -;; Doom requires these, and disabling them may have terrible side effects. -;; -;; Here are a couple examples: - - -;; All of Doom's packages are pinned to a specific commit, and updated from -;; release to release. To un-pin all packages and live on the edge, do: -;(setq doom-pinned-packages nil) - -;; ...but to unpin a single package: -;(package! pinned-package :pin nil) - - -;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: -;(package! some-package) - -;; To install a package directly from a particular repo, you'll need to 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, for whatever reason, -;; 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")) - -(package! zig-mode) - -(package! speed-type) - -(package! mingus - :recipe (:host github :repo "pft/mingus")) - -(package! cuda-mode - :recipe (:host github :repo "chachi/cuda-mode")) - -(package! bsv-mode - :recipe (:host github :repo "joachimschmidt557/bsv-mode")) - -;; (package! bsv-mode -;; :recipe (:host github :repo "B-Lang-org/bsc" -;; :files ("util/emacs/bsv-mode/*.el" "util/emacs/*.el"))) diff --git a/emacs.el b/emacs.el new file mode 100644 index 0000000..abebbb5 --- /dev/null +++ b/emacs.el @@ -0,0 +1,156 @@ +;; .emacs + +;; Initialize straight.el +(defvar bootstrap-version) +(let ((bootstrap-file + (expand-file-name "straight/repos/straight.el/bootstrap.el" user-emacs-directory)) + (bootstrap-version 5)) + (unless (file-exists-p bootstrap-file) + (with-current-buffer + (url-retrieve-synchronously + "https://raw.githubusercontent.com/raxod502/straight.el/develop/install.el" + 'silent 'inhibit-cookies) + (goto-char (point-max)) + (eval-print-last-sexp))) + (load bootstrap-file nil 'nomessage)) + +;; GCMH - Do this at the beginning so we can maybe start up a bit +;; faster +(straight-use-package 'gcmh) +(gcmh-mode 1) + +;; use-package +(straight-use-package 'use-package) + +;; Packages +;; Major modes +(straight-use-package 'zig-mode) +(straight-use-package 'markdown-mode) +(straight-use-package 'nix-mode) +(straight-use-package 'nim-mode) +(straight-use-package 'racket-mode) +(straight-use-package 'rust-mode) +(straight-use-package 'haskell-mode) +(straight-use-package 'go-mode) + +;; (straight-use-package '(promela-mode +;; :type git +;; :host github +;; :repo "rudi/promela-mode")) + +(straight-use-package '(llvm-mode + :type git + :host github + :repo "duzy/llvm-mode")) + +(define-minor-mode remove-trailing-whitespace-mode + "Minor mode to remove trailing whitespace on every save" + :lighter " rmtws" + + (add-hook 'before-save-hook 'delete-trailing-whitespace)) + +(add-hook 'prog-mode-hook 'remove-trailing-whitespace-mode) + +;; Other stuff +(straight-use-package 'better-defaults) +(straight-use-package 'doom-themes) +(straight-use-package 'undo-tree) +(straight-use-package 'multiple-cursors) +(straight-use-package 'which-key) +(straight-use-package 'smartparens) +(straight-use-package 'rainbow-delimiters) +(straight-use-package 'hl-todo) +(straight-use-package 'counsel) +(straight-use-package 'company) +;; (straight-use-package 'eglot) +(straight-use-package 'lsp-mode) +(straight-use-package 'speed-type) +(straight-use-package 'magit) +(straight-use-package 'restart-emacs) +(straight-use-package 'elpher) + +;; Emacs Configuration +(setq inhibit-splash-screen t) +(setq scroll-step 1) +(recentf-mode 1) +(global-auto-revert-mode 1) +(put 'narrow-to-region 'disabled nil) +(global-unset-key (kbd "C-z")) +;; (set-face-attribute 'default nil :height 140) + +(use-package display-line-numbers-mode + :hook (prog-mode text-mode conf-mode)) + +(use-package hl-line-mode + :hook (prog-mode text-mode conf-mode)) + +;; Personal configuration +(setq user-full-name "Joachim Schmidt" + user-mail-address "joachim.schmidt557@outlook.com") + +;; Package Configuration +(use-package nix-mode + :mode "\\.nix\\'") + +;; (use-package promela-mode +;; :mode "\\.pml\\'") + +(use-package undo-tree + :config + (global-undo-tree-mode)) + +(use-package which-key + :config + (which-key-mode)) + +(use-package doom-themes + :config + (load-theme 'doom-one t)) + +(use-package better-defaults) + +(use-package multiple-cursors + :bind (("C-x C-l" . mc/edit-lines) + ("C-x C-n" . mc/mark-next-like-this) + ("C-x C-p" . mc/mark-previous-like-this))) + +(use-package smartparens-config + :init + (smartparens-global-strict-mode 1) + :hook (prog-mode . smartparens-mode)) + +(use-package rainbow-delimiters-mode + :hook prog-mode) + +(use-package hl-todo-mode + :hook prog-mode) + +(use-package ivy + :init + (ivy-mode 1) + ;; (setq ivy-use-virtual-buffers t) + (counsel-mode 1) + :bind (("C-c i" . counsel-imenu) + ("C-c r" . counsel-rg) + ("C-c f" . counsel-fzf) + ("C-x C-r" . counsel-recentf) + ("C-c C-r" . ivy-resume))) + +(use-package company + :config + (global-company-mode) + :bind (("C-." . company-complete))) + +;; (use-package eglot +;; :commands (eglot) +;; :config +;; (add-to-list 'eglot-server-programs '(zig-mode . ("~/src/zls/zig-cache/bin/zls")))) + +(use-package lsp + :config + (add-to-list 'lsp-language-id-configuration '(zig-mode . "zig")) + (lsp-register-client + (make-lsp-client + :new-connection (lsp-stdio-connection "~/src/zls/zig-cache/bin/zls") + :major-modes '(zig-mode) + :server-id 'zls)))