mirror of
https://github.com/tomru/DotfilesOld.git
synced 2026-03-03 06:27:21 +01:00
literal progress
This commit is contained in:
Thomas Ruoff
4
emacs/.emacs.d/.gitignore
vendored
4
emacs/.emacs.d/.gitignore
vendored
@@ -1,3 +1,7 @@
|
|||||||
elpa
|
elpa
|
||||||
forge-database.sqlite
|
forge-database.sqlite
|
||||||
transient
|
transient
|
||||||
|
auto-save-list
|
||||||
|
elpa*
|
||||||
|
emacs.el
|
||||||
|
projectile-bookmarks.eld
|
||||||
|
|||||||
14
emacs/.emacs.d/custom.el
Normal file
14
emacs/.emacs.d/custom.el
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
(custom-set-variables
|
||||||
|
;; custom-set-variables was added by Custom.
|
||||||
|
;; If you edit it by hand, you could mess it up, so be careful.
|
||||||
|
;; Your init file should contain only one such instance.
|
||||||
|
;; If there is more than one, they won't work right.
|
||||||
|
'(package-selected-packages
|
||||||
|
(quote
|
||||||
|
(company which-key use-package org-bullets ivy-rich git-gutter general forge evil-magit evil-collection doom-themes doom-modeline diminish counsel-projectile))))
|
||||||
|
(custom-set-faces
|
||||||
|
;; custom-set-faces was added by Custom.
|
||||||
|
;; If you edit it by hand, you could mess it up, so be careful.
|
||||||
|
;; Your init file should contain only one such instance.
|
||||||
|
;; If there is more than one, they won't work right.
|
||||||
|
)
|
||||||
238
emacs/.emacs.d/emacs.org
Normal file
238
emacs/.emacs.d/emacs.org
Normal file
@@ -0,0 +1,238 @@
|
|||||||
|
#+TITLE: My Emacs Config
|
||||||
|
|
||||||
|
* bootstrapping
|
||||||
|
I've manly been following the [[https://github.com/danielmai/.emacs.d][Daniel Mai's approach]] to bootstrap the config.
|
||||||
|
|
||||||
|
* Private Settings
|
||||||
|
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(setq user-full-name "Thomas Ruoff"
|
||||||
|
user-mail-address "thomasruoff@gmail.com"
|
||||||
|
calendar-latitude 48.286993
|
||||||
|
calendar-longitude 8.726407
|
||||||
|
calendar-location-name "Rosenfeld, Germany")
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
* Customize settings
|
||||||
|
Set up the customize file to its own separate file, instead of saving customize settings in init.el.
|
||||||
|
|
||||||
|
- [ ] TODO do not load when file is missing
|
||||||
|
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(setq custom-file (expand-file-name "custom.el" user-emacs-directory))
|
||||||
|
(load custom-file)
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
* looks
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(use-package doom-themes
|
||||||
|
:ensure t
|
||||||
|
:config (load-theme 'doom-one t))
|
||||||
|
|
||||||
|
(use-package all-the-icons)
|
||||||
|
(use-package doom-modeline
|
||||||
|
:ensure t
|
||||||
|
:hook (after-init . doom-modeline-mode))
|
||||||
|
#+END_SRC
|
||||||
|
* Functions
|
||||||
|
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(defun find-user-init-file ()
|
||||||
|
"Edit the `user-init-file', in another window."
|
||||||
|
(interactive)
|
||||||
|
(find-file "~/.dotfiles/emacs/.emacs.d/emacs.org"))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
* backups
|
||||||
|
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(setq make-backup-files nil)
|
||||||
|
(setq auto-save-default nil)
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
* Splash Screen
|
||||||
|
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(setq inhibit-startup-screen t)
|
||||||
|
(setq initial-scratch-message "* Now, go wild!")
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
* editor
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(setq-default tab-width 4
|
||||||
|
tab-always-indent t
|
||||||
|
indent-tabs-mode nil
|
||||||
|
fill-column 80)
|
||||||
|
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
* Word wrapping
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(setq-default word-wrap t
|
||||||
|
truncate-lines t
|
||||||
|
truncate-partial-width-windows nil)
|
||||||
|
|
||||||
|
(setq sentence-end-double-space nil
|
||||||
|
delete-trailing-lines nil
|
||||||
|
require-final-newline t
|
||||||
|
tabify-regexp "^\t* [ \t]+") ; for :retab
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
* keybindings
|
||||||
|
- [ ] figure out how to define mode keybindings with general
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(use-package general
|
||||||
|
:ensure t
|
||||||
|
:config
|
||||||
|
(general-define-key
|
||||||
|
:states '(normal visual insert emacs)
|
||||||
|
:prefix "SPC"
|
||||||
|
:non-normal-prefix "M-SPC"
|
||||||
|
"/" '(counsel-rg :wich-key "rg")
|
||||||
|
"TAB" '(ivy-switch-buffer :which-key "prev buffer")
|
||||||
|
"SPC" '(counsel-M-x :which-key "M-x")
|
||||||
|
"w" '(hydra-window/body :which-key "Window")
|
||||||
|
|
||||||
|
"g" '(:ignore t :which-key "Git")
|
||||||
|
"gg" '(magit :which-key "Magit Status")
|
||||||
|
|
||||||
|
"h" '(:ignore t :which-key "Help")
|
||||||
|
"hc" '(apropos-command :which-key "Command")
|
||||||
|
"hv" '(apropos-variable :which-key "Variable")
|
||||||
|
|
||||||
|
"f" '(:ignore t :which-key "Files")
|
||||||
|
"ff" '(counsel-git :which-key "find in git dir")
|
||||||
|
"fd" '(find-user-init-file :which-key "open init file")
|
||||||
|
|
||||||
|
"m" '(:ignore t :which-key "Mode")
|
||||||
|
;"m'" '(:major-modes org-mode :which-key "Edit code block")
|
||||||
|
))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
* evil
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(use-package evil
|
||||||
|
:ensure t
|
||||||
|
:init
|
||||||
|
(setq evil-want-keybinding nil)
|
||||||
|
:config
|
||||||
|
(evil-mode 1)
|
||||||
|
(define-key evil-insert-state-map "jk" 'evil-normal-state))
|
||||||
|
|
||||||
|
(use-package evil-magit
|
||||||
|
:ensure t)
|
||||||
|
|
||||||
|
(use-package evil-collection
|
||||||
|
:after evil
|
||||||
|
:ensure t
|
||||||
|
:config
|
||||||
|
(evil-collection-init))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
* which key
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(use-package which-key
|
||||||
|
:ensure t
|
||||||
|
:init
|
||||||
|
(setq which-key-separator " ")
|
||||||
|
(setq which-key-prefix-prefix "+")
|
||||||
|
:config
|
||||||
|
(which-key-mode 1))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
* completion
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(use-package company
|
||||||
|
:ensure t
|
||||||
|
:init (add-hook 'after-init-hook 'global-company-mode))
|
||||||
|
#+END_SRC
|
||||||
|
* ivy
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(use-package ivy
|
||||||
|
:ensure t
|
||||||
|
:defer 1
|
||||||
|
:init
|
||||||
|
(setq ivy-re-builders-alist
|
||||||
|
'((counsel-ag . ivy--regex-plus)
|
||||||
|
(counsel-rg . ivy--regex-plus)
|
||||||
|
(counsel-grep . ivy--regex-plus)
|
||||||
|
(swiper . ivy--regex-plus)
|
||||||
|
(swiper-isearch . ivy--regex-plus)
|
||||||
|
; Ignore order for non-fuzzy searches by default
|
||||||
|
;(t . ivy--regex-ignore-order)
|
||||||
|
))
|
||||||
|
:config
|
||||||
|
(setq ivy-height 15
|
||||||
|
ivy-wrap t
|
||||||
|
ivy-fixed-height-minibuffer t
|
||||||
|
projectile-completion-system 'ivy
|
||||||
|
; Don't use ^ as initial input
|
||||||
|
ivy-initial-inputs-alist nil
|
||||||
|
; disable magic slash on non-match
|
||||||
|
ivy-magic-slash-non-match-action nil
|
||||||
|
; don't show recent files in switch-buffer
|
||||||
|
ivy-use-virtual-buffers nil
|
||||||
|
; ...but if that ever changes, show their full path
|
||||||
|
ivy-virtual-abbreviate 'full
|
||||||
|
; don't quit minibuffer on delete-error
|
||||||
|
ivy-on-del-error-function nil
|
||||||
|
; enable ability to select prompt (alternative to `ivy-immediate-done')
|
||||||
|
ivy-use-selectable-prompt t)
|
||||||
|
(ivy-mode +1))
|
||||||
|
|
||||||
|
(use-package ivy-rich
|
||||||
|
:after ivy
|
||||||
|
:ensure t
|
||||||
|
:config
|
||||||
|
(ivy-rich-mode +1))
|
||||||
|
|
||||||
|
;(use-package flx
|
||||||
|
; :defer t ; is loaded by ivy
|
||||||
|
; :init
|
||||||
|
; (setf (alist-get 't ivy-re-builders-alist) #'ivy--regex-fuzzy)
|
||||||
|
; (setq ivy-initial-inputs-alist nil
|
||||||
|
; ivy-flx-limit 10000))
|
||||||
|
|
||||||
|
(use-package counsel
|
||||||
|
:ensure t)
|
||||||
|
|
||||||
|
(use-package counsel-projectile
|
||||||
|
:ensure t
|
||||||
|
:defer t)
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
* Projectile
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(use-package projectile
|
||||||
|
:ensure t
|
||||||
|
:init
|
||||||
|
(setq projectile-require-project-root nil))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
* git
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(use-package magit
|
||||||
|
:ensure t
|
||||||
|
:bind ("C-x g" . magit-status))
|
||||||
|
|
||||||
|
(use-package forge
|
||||||
|
:ensure t)
|
||||||
|
|
||||||
|
(use-package git-gutter
|
||||||
|
:ensure t)
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
* org
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(use-package f
|
||||||
|
:ensure t)
|
||||||
|
(use-package org
|
||||||
|
:ensure t
|
||||||
|
:config
|
||||||
|
(setq org-directory "~/org/"))
|
||||||
|
|
||||||
|
(use-package org-bullets
|
||||||
|
:ensure t
|
||||||
|
:config (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
@@ -1,223 +1,44 @@
|
|||||||
;; debugging startup
|
;;; Begin initialization
|
||||||
(add-hook 'emacs-startup-hook
|
;; Turn off mouse interface early in startup to avoid momentary display
|
||||||
(lambda ()
|
(when window-system
|
||||||
(message "Emacs ready in %s with %d garbage collections."
|
(menu-bar-mode -1)
|
||||||
(format "%.2f seconds"
|
(tool-bar-mode -1)
|
||||||
(float-time
|
(scroll-bar-mode -1)
|
||||||
(time-subtract after-init-time before-init-time)))
|
(tooltip-mode -1))
|
||||||
gcs-done)))
|
|
||||||
|
|
||||||
;; some private settings
|
(setq inhibit-startup-message t)
|
||||||
(setq user-full-name "Thomas Ruoff"
|
(setq initial-scratch-message "")
|
||||||
calendar-latitude 48.286993
|
|
||||||
calendar-longitude 8.726407
|
|
||||||
calendar-location-name "Rosenfeld, Germany")
|
|
||||||
|
|
||||||
;; my functions
|
;;; Set up package
|
||||||
(defun find-user-init-file ()
|
|
||||||
"Edit the `user-init-file', in another window."
|
|
||||||
(interactive)
|
|
||||||
(find-file user-init-file))
|
|
||||||
|
|
||||||
|
|
||||||
;; ui
|
|
||||||
(toggle-frame-maximized)
|
|
||||||
|
|
||||||
(scroll-bar-mode -1)
|
|
||||||
(tool-bar-mode -1)
|
|
||||||
(tooltip-mode -1)
|
|
||||||
(menu-bar-mode -1)
|
|
||||||
|
|
||||||
;; no backups
|
|
||||||
(setq make-backup-files nil) ; stop creating backup~ files
|
|
||||||
(setq auto-save-default nil) ; stop creating #autosave# files
|
|
||||||
|
|
||||||
;; Splash Screen
|
|
||||||
(setq inhibit-startup-screen t)
|
|
||||||
(setq initial-scratch-message ";; Now, go wild!")
|
|
||||||
|
|
||||||
;; editor
|
|
||||||
(setq-default tab-width 4
|
|
||||||
tab-always-indent t
|
|
||||||
indent-tabs-mode nil
|
|
||||||
fill-column 80)
|
|
||||||
|
|
||||||
;; Word wrapping
|
|
||||||
(setq-default word-wrap t
|
|
||||||
truncate-lines t
|
|
||||||
truncate-partial-width-windows nil)
|
|
||||||
|
|
||||||
(setq sentence-end-double-space nil
|
|
||||||
delete-trailing-lines nil
|
|
||||||
require-final-newline t
|
|
||||||
tabify-regexp "^\t* [ \t]+") ; for :retab
|
|
||||||
|
|
||||||
;; package
|
|
||||||
(require 'package)
|
(require 'package)
|
||||||
|
|
||||||
;; Install into separate package dirs for each Emacs version, to prevent bytecode incompatibility
|
;; Install into separate package dirs for each Emacs version, to prevent bytecode incompatibility
|
||||||
(let ((versioned-package-dir
|
(let ((versioned-package-dir
|
||||||
(expand-file-name (format "elpa-%s.%s" emacs-major-version emacs-minor-version)
|
(expand-file-name (format "elpa-%s.%s" emacs-major-version emacs-minor-version)
|
||||||
user-emacs-directory)))
|
user-emacs-directory)))
|
||||||
(setq package-user-dir versioned-package-dir))
|
(setq package-user-dir versioned-package-dir))
|
||||||
|
|
||||||
;; Use Melpa-Stable
|
|
||||||
(add-to-list 'package-archives
|
(add-to-list 'package-archives
|
||||||
'("melpa" . "https://melpa.org/packages/")
|
'("melpa" . "http://melpa.org/packages/") t)
|
||||||
'("org" . "http://orgmode.org/elpa/"))
|
(add-to-list 'package-archives '("org" . "http://orgmode.org/elpa/") t)
|
||||||
|
(when (boundp 'package-pinned-packages)
|
||||||
|
(setq package-pinned-packages
|
||||||
|
'((org-plus-contrib . "org"))))
|
||||||
(package-initialize)
|
(package-initialize)
|
||||||
|
|
||||||
;; Install use-package.el if have not
|
;;; Bootstrap use-package
|
||||||
(unless (package-installed-p 'use-package)
|
;; Install use-package if it's not already installed.
|
||||||
|
;; use-package is used to configure the rest of the packages.
|
||||||
|
(unless (or (package-installed-p 'use-package)
|
||||||
|
(package-installed-p 'diminish))
|
||||||
(package-refresh-contents)
|
(package-refresh-contents)
|
||||||
(package-install 'use-package)
|
(package-install 'use-package)
|
||||||
(package-install 'diminish)
|
(package-install 'diminish))
|
||||||
(package-install 'bind-key))
|
|
||||||
|
|
||||||
;; use-package.el is no longer needed at runtime
|
;; From use-package README
|
||||||
(eval-when-compile
|
(eval-when-compile
|
||||||
(require 'use-package))
|
(require 'use-package))
|
||||||
(require 'diminish)
|
(require 'diminish) ;; if you use :diminish
|
||||||
(require 'bind-key)
|
(require 'bind-key)
|
||||||
|
|
||||||
;; keybindings
|
;;; Load the config
|
||||||
(use-package general
|
(org-babel-load-file (concat user-emacs-directory "emacs.org"))
|
||||||
:ensure t
|
|
||||||
:config
|
|
||||||
(general-define-key
|
|
||||||
:states '(normal visual insert emacs)
|
|
||||||
:prefix "SPC"
|
|
||||||
:non-normal-prefix "M-SPC"
|
|
||||||
"/" '(counsel-rg :wich-key "rg")
|
|
||||||
"TAB" '(ivy-switch-buffer :which-key "prev buffer")
|
|
||||||
"SPC" '(counsel-M-x :which-key "M-x")
|
|
||||||
"w" '(hydra-window/body :which-key "Window")
|
|
||||||
|
|
||||||
"g" '(:ignore t :which-key "Git")
|
|
||||||
"gg" '(magit :which-key "Magit Status")
|
|
||||||
|
|
||||||
"f" '(:ignore t :which-key "Files")
|
|
||||||
"ff" '(counsel-git :which-key "find in git dir")
|
|
||||||
"fd" '(find-user-init-file :which-key "open init file")
|
|
||||||
))
|
|
||||||
|
|
||||||
;; evil
|
|
||||||
(use-package evil
|
|
||||||
:ensure t
|
|
||||||
:init
|
|
||||||
(setq evil-want-keybinding nil)
|
|
||||||
:config
|
|
||||||
(evil-mode 1)
|
|
||||||
(define-key evil-insert-state-map "jk" 'evil-normal-state))
|
|
||||||
|
|
||||||
(use-package evil-magit
|
|
||||||
:ensure t)
|
|
||||||
|
|
||||||
(use-package evil-collection
|
|
||||||
:after evil
|
|
||||||
:ensure t
|
|
||||||
:config
|
|
||||||
(evil-collection-init))
|
|
||||||
|
|
||||||
;; which key
|
|
||||||
(use-package which-key
|
|
||||||
:ensure t
|
|
||||||
:init
|
|
||||||
(setq which-key-separator " ")
|
|
||||||
(setq which-key-prefix-prefix "+")
|
|
||||||
:config
|
|
||||||
(which-key-mode 1))
|
|
||||||
|
|
||||||
|
|
||||||
;; ivy
|
|
||||||
(use-package ivy
|
|
||||||
:ensure t
|
|
||||||
:defer 1
|
|
||||||
:init
|
|
||||||
(setq ivy-re-builders-alist
|
|
||||||
'((counsel-ag . ivy--regex-plus)
|
|
||||||
(counsel-rg . ivy--regex-plus)
|
|
||||||
(counsel-grep . ivy--regex-plus)
|
|
||||||
(swiper . ivy--regex-plus)
|
|
||||||
(swiper-isearch . ivy--regex-plus)
|
|
||||||
;; Ignore order for non-fuzzy searches by default
|
|
||||||
(t . ivy--regex-ignore-order)))
|
|
||||||
:config
|
|
||||||
(setq ivy-height 15
|
|
||||||
ivy-wrap t
|
|
||||||
ivy-fixed-height-minibuffer t
|
|
||||||
projectile-completion-system 'ivy
|
|
||||||
;; Don't use ^ as initial input
|
|
||||||
ivy-initial-inputs-alist nil
|
|
||||||
;; disable magic slash on non-match
|
|
||||||
ivy-magic-slash-non-match-action nil
|
|
||||||
;; don't show recent files in switch-buffer
|
|
||||||
ivy-use-virtual-buffers nil
|
|
||||||
;; ...but if that ever changes, show their full path
|
|
||||||
ivy-virtual-abbreviate 'full
|
|
||||||
;; don't quit minibuffer on delete-error
|
|
||||||
ivy-on-del-error-function nil
|
|
||||||
;; enable ability to select prompt (alternative to `ivy-immediate-done')
|
|
||||||
ivy-use-selectable-prompt t)
|
|
||||||
(ivy-mode +1))
|
|
||||||
|
|
||||||
(use-package ivy-rich
|
|
||||||
:after ivy
|
|
||||||
:ensure t
|
|
||||||
:config
|
|
||||||
(ivy-rich-mode +1))
|
|
||||||
|
|
||||||
(use-package flx
|
|
||||||
:defer t ; is loaded by ivy
|
|
||||||
:init
|
|
||||||
(setf (alist-get 't ivy-re-builders-alist) #'ivy--regex-fuzzy)
|
|
||||||
(setq ivy-initial-inputs-alist nil
|
|
||||||
ivy-flx-limit 10000))
|
|
||||||
|
|
||||||
(use-package counsel
|
|
||||||
:ensure t)
|
|
||||||
|
|
||||||
(use-package counsel-projectile
|
|
||||||
:ensure t
|
|
||||||
:defer t)
|
|
||||||
|
|
||||||
;; Projectile
|
|
||||||
(use-package projectile
|
|
||||||
:ensure t
|
|
||||||
:init
|
|
||||||
(setq projectile-require-project-root nil)
|
|
||||||
:config
|
|
||||||
(projectile-mode 1))
|
|
||||||
|
|
||||||
;; git
|
|
||||||
(use-package magit
|
|
||||||
:ensure t
|
|
||||||
:bind ("C-x g" . magit-status))
|
|
||||||
|
|
||||||
(use-package forge
|
|
||||||
:ensure t)
|
|
||||||
|
|
||||||
;; org
|
|
||||||
(use-package f
|
|
||||||
:ensure t)
|
|
||||||
(use-package org
|
|
||||||
:ensure t
|
|
||||||
:config
|
|
||||||
(setq org-directory "~/org/"))
|
|
||||||
|
|
||||||
(use-package org-bullets
|
|
||||||
:ensure t
|
|
||||||
:config (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))
|
|
||||||
|
|
||||||
(use-package doom-themes
|
|
||||||
:ensure t
|
|
||||||
:config (load-theme 'doom-one t))
|
|
||||||
|
|
||||||
(use-package all-the-icons)
|
|
||||||
(use-package doom-modeline
|
|
||||||
:ensure t
|
|
||||||
:hook (after-init . doom-modeline-mode))
|
|
||||||
|
|
||||||
(add-hook 'org-mode-hook 'flyspell-mode)
|
|
||||||
(add-hook 'text-mode-hook 'flyspell-mode)
|
|
||||||
|
|||||||
Reference in New Issue
Block a user