From 89d582cdc753985b0773d9f7c800a6a51cda5e7d Mon Sep 17 00:00:00 2001 From: marc Date: Sun, 8 Sep 2019 19:07:11 +0200 Subject: [PATCH] added magit --- init.el | 344 ++++++++++++++++++++++++++++++++++++++++++++++++------- init.org | 29 +++++ 2 files changed, 331 insertions(+), 42 deletions(-) diff --git a/init.el b/init.el index 4bfcec3..5c160c0 100644 --- a/init.el +++ b/init.el @@ -1,55 +1,315 @@ -;; Garbage collection threshold -;; higher means less interuptions -(setq gc-cons-threshold 400000000) - - -;; Begin initialization -;; Turn off mouse interface early in startup to avoid momentary display -(when window-system - (menu-bar-mode -1) - (tool-bar-mode -1) - (scroll-bar-mode -1) - (tooltip-mode -1) -) - -(setq inhibit-startup-message t) -(setq initial-scratch-message "") +(defun me/tangle-init () + "If the current buffer is 'init.org', +the code blocks are tangled, and the tangled file is compiled." + (when (equal (buffer-file-name) + (expand-file-name (concat user-emacs-directory "init.org"))) + ;; avoid running hooks + (let ((prog-mode-hook nil)) + (org-babel-tangle) + (byte-compile-file (concat user-emacs-directory "init.el")) + (load-file user-init-file)))) +(add-hook 'after-save-hook 'me/tangle-init) -;; Setup package (require 'package) -(add-to-list 'package-archives - '("melpa" . "https://melpa.org/packages/") t) -(add-to-list 'package-archives - '("melpa-stable" . "https://stable.melpa.org/packages/") t) -(add-to-list 'package-archives - '("gnu" . "https://elpa.gnu.org/packages/") t) -(add-to-list 'package-archives - '("org" . "https://orgmode.org/elpa/") t) + +(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) +(add-to-list 'package-archives '("melpa-stable" . "https://stable.melpa.org/packages/") t) +(add-to-list 'package-archives '("org" . "https://orgmode.org/elpa/") t) (package-initialize) -;; Bootstrap use-package -;; Install use-package if it's not already installed -;; use-package is used to configure the rest of the packages (unless (package-installed-p 'use-package) - (package-refresh-contents) - (package-install 'use-package) -) + (package-refresh-contents) + (package-install 'use-package)) (setq use-package-verbose nil) -;; From use-package README -(eval-when-compile - (require 'use-package)) -;; see https://github.com/jwiegley/use-package/issues/522 -(use-package diminish - :ensure t) +;(eval-when-compile + (require 'use-package);) + +(defvar MY--PATH_USER_LOCAL (expand-file-name "~/.emacs.d/user-local/")) + (defvar MY--PATH_USER_GLOBAL (expand-file-name "~/.emacs.d/user-global/")) + + (defvar MY--PATH_ORG_FILES (expand-file-name "~/Archiv/Organisieren/")) + (defvar MY--PATH_ORG_FILES_MOBILE (expand-file-name "~/Archiv/Organisieren/mobile/")) + (defvar MY--PATH_ORG_JOURNAl (expand-file-name "~/Archiv/Organisieren/Journal/")) + (setq bookmark-default-file (concat MY--PATH_USER_LOCAL "bookmarks")) + (setq recentf-save-file (concat MY--PATH_USER_LOCAL "recentf")) + (setq custom-file (concat MY--PATH_USER_LOCAL "custom.el")) ;; don't spam init.e with saved customization settings + (setq abbrev-file-name (concat MY--PATH_USER_GLOBAL "abbrev_defs")) + (setq backup-directory-alist `((".*" . ,temporary-file-directory))) + (setq auto-save-file-name-transforms `((".*" ,temporary-file-directory))) + (setq save-abbrevs 'silently) ;; don't bother me with asking for abbrev saving + (setq-default create-lockfiles nil) ;; disable lock files, can cause trouble in e.g. lsp-mode + (defalias 'yes-or-no-p 'y-or-n-p) ;; answer with y and n + (setq custom-safe-themes t) ;; don't ask me if I want to load a theme + (setq sentence-end-double-space nil) ;; don't coun two spaces after a period as the end of a sentence. + (delete-selection-mode t) ;; delete selected region when typing + + (setq locale-coding-system 'utf-8) + (set-terminal-coding-system 'utf-8) + (set-keyboard-coding-system 'utf-8) + (set-selection-coding-system 'utf-8) + (if (eq system-type 'windows-nt) + (prefer-coding-system 'utf-8dos) + (prefer-coding-system 'utf-8)) + (blink-cursor-mode -1) ;; turn off blinking cursor + (show-paren-mode t) ;; show other part of brackets + (column-number-mode t) + (setq uniquify-buffer-name-style 'forward) + (setq-default indent-tabs-mode nil) ;; avoid tabs in place of multiple spaces (they look bad in tex) + (setq-default indicate-empty-lines t) ;; show empty lines + (setq scroll-margin 5 ;; smooth scrolling + scroll-conservatively 10000 + scroll-preserve-screen-position 1 + scroll-step 1) + (global-hl-line-mode t) ;; highlight current line +(menu-bar-mode 0) ;; disable menu bar +(tool-bar-mode 0) ;; disable tool bar +(scroll-bar-mode 0) ;; disable scroll bar + +(set-face-font 'default "Hack Nerd Font Mono-10") + +(global-visual-line-mode) +(diminish 'visual-line-mode) +(use-package adaptive-wrap + :ensure t + :init + (when (fboundp 'adaptive-wrap-prefix-mode) + (defun my/activate-adaptive-wrap-prefix-mode () + "Toggle `visual-line-mode' and `adaptive-wrap-prefix-mode' simultaneously." + (adaptive-wrap-prefix-mode (if visual-line-mode 1 -1))) + (add-hook 'visual-line-mode-hook 'my/activate-adaptive-wrap-prefix-mode))) + +(use-package display-line-numbers +:init + (add-hook 'prog-mode-hook 'display-line-numbers-mode) + (add-hook 'org-src-mode-hook 'display-line-numbers-mode) +:config +(setq-default display-line-numbers-type 'visual +display-line-numbers-current-absolute t +display-line-numbers-with 4 +display-line-numbers-widen t)) +; (add-hook 'emacs-lisp-mode-hook 'display-line-numbers-mode) + +(use-package magit + :ensure t + :defer t + :init + ; set git-path in work environment + (if (string-equal user-login-name "POH") + (setq magit-git-executable "P:/Eigene Dateien/Tools/Git/bin/git.exe") + ) + :bind (("C-x g" . magit-status)) +) + +(require 'undo-tree) +(use-package undo-tree +:ensure t +:diminish undo-tree-mode +:init +(global-undo-tree-mode 1)) + +(use-package imenu-list + :ensure t + :config + (setq imenu-list-focus-after-activation t + imenu-list-auto-resize t + imenu-list-position 'right) + :bind + (:map global-map + ([f9] . imenu-list-smart-toggle)) + ) + +(require 'which-key) +(use-package which-key + :ensure t + :diminish which-key-mode + :config + (which-key-mode) + (which-key-setup-side-window-right-bottom) + (which-key-setup-minibuffer) + (setq which-key-idle-delay 0.5)) + +(add-hook 'emacs-lisp-mode-hook 'company/elisp-mode-hook) + +(use-package flycheck + ;;:ensure t + :hook + ((css-mode . flycheck-mode) + (emacs-lisp-mode . flycheck-mode) + (python-mode . flycheck-mode)) + :init + (setq flycheck-emacs-lisp-load-path 'inherit) + :config + (setq-default + flycheck-check-synta-automatically '(save mode-enabled) + flycheck-disable-checkers '(emacs-lisp-checkdoc) + eldoc-idle-delay .1 ;; let eldoc echo faster than flycheck + flycheck-display-errors-delay .3)) ;; this way any errors will override eldoc messages (use-package org - :ensure org-plus-contrib - :pin org) + :ensure org-plus-contrib + :init + (add-hook 'org-mode-hook 'company/org-mode-hook) + :config +;; (require 'org-id) + (add-to-list 'org-modules "org-id") + (setq org-default-notes-file (concat MY--PATH_ORG_FILES "notes.org") + org-agenda-files (list MY--PATH_ORG_FILES + MY--PATH_ORG_FILES_MOBILE) + org-id-locations-file (concat MY--PATH_USER_LOCAL ".org-id-locations") + org-log-into-drawer "LOGBOOK")) + (org-id-update-id-locations) + +(require 'org-habit) ;;TODO Lösung ohne require finden, scheint mir nicht ideal zu sein, nur um ein org-modul zu aktivieren +;; (add-to-list 'org-modules "org-habit") + (setq org-habit-graph-column 80 + org-habit-preceding-days 30 + org-habit-following-days 7 + org-habit-show-habits-only-for-today nil) + +(use-package org-journal + :ensure t + :defer t + :custom + (org-journal-dir MY--PATH_ORG_JOURNAl) + (org-journal-enable-agenda-integration t)) + +(require 'ivy) + (use-package ivy + :ensure t + :diminish + (ivy-mode . "") + :init + (ivy-mode 1) + :bind + ("C-r" . ivy-resume) ;; overrides isearch-backwards binding + :config + (setq ivy-use-virtual-buffers t ;; recent files and bookmarks in ivy-switch-buffer + ivy-height 20 ;; height of ivy window + ivy-count-format "%d/%d" ;; current and total number + ivy-re-builders-alist ;; regex replaces spaces with * + '((t . ivy--regex-plus)))) + + (use-package counsel + :ensure t + :bind* + (("M-x" . counsel-M-x) + ("C-x C-f" . counsel-find-file) + ("C-x C-r" . counsel-recentf) + ("C-c C-f" . counsel-git) + ("C-c h f" . counsel-describe-function) + ("C-c h v" . counsel-describe-variable) + ("M-i" . counsel-imenu))) + + (use-package swiper + :ensure t + :bind + ("C-s" . swiper)) + +(use-package ivy-hydra +:ensure t) + +(require 'company) +(use-package company + :defer 1 + :bind + (:map company-active-map + ("RET" . nil) + ([return] . nil) + ("TAB" . company-complete-selection) + ([tab] . company-complete-selection) + ("" . company-complete-common)) + :config + (global-company-mode 1) + (setq-default + company-idle-delay .2 + company-minimum-prefix-length 1 + company-require-match nil + company-show-numbers t + company-tooltip-align-annotations t)) + +(require 'company-statistics) +(use-package company-statistics + :ensure t + :after company + :init + (setq company-statistics-file (concat MY--PATH_USER_LOCAL "company-statistics-cache.el"));~/.emacs.d/user-dir/company-statistics-cache.el") + :config + (company-statistics-mode 1)) + +(use-package company-dabbrev + :ensure nil + :after company + :config + (setq-default company-dabbrev-downcase nil)) + +(use-package company-box + :ensure nil + :init + (add-hook 'company-mode-hook 'company-box-mode)) + +(defun company/org-mode-hook() + (set (make-local-variable 'company-backends) + '(company-capf company-files)) + (add-hook 'completion-at-point-functions 'pcomplete-completions-at-point nil t) + (message "company/org-mode-hook")) + + (defun company/elisp-mode-hook() + (set (make-local-variable 'company-backends) + '((company-elisp company-dabbrev) company-capf company-files)) + (message "company/elisp-mode-hook")) + +(defun company/beancount-mode-hook() + (set (make-local-variable 'company-backends) + '(company-beancount))) + +(use-package beancount + :load-path "user-local/elisp" + :defer t + :mode + ("\\.beancount$" . beancount-mode) + :init + (add-hook 'beancount-mode-hook 'company/beancount-mode-hook) + (setenv "PATH" + (concat "/opt/beancount/bin:" + (getenv "PATH"))) + :config + (setq beancount-filename-main "/home/marc/Archiv/Finanzen/Transaktionen/transactions.beancount")) + +(use-package lsp-mode + :ensure t + :init + (add-to-list 'exec-path "/home/marc/.local/bin") + :config + (setq lsp-prefer-flymake nil) ;; prefer lsp-ui (flycheck) over flymake + (add-hook 'python-mode-hook #'lsp)) + +(use-package lsp-ui + :requires lsp-mode flycheck + :ensure t + :config + (setq lsp-ui-doc-enable t + lsp-ui-doc-use-childframe t + lsp-ui-doc-position 'top + lsp-ui-doc-include-signature t + lsp-ui-sideline-enable nil + lsp-ui-flycheck-enable t + lsp-ui-flycheck-list-position 'right + lsp-ui-flycheck-live-reporting t + lsp-ui-peek-enable t + lsp-ui-peek-list-width 60 + lsp-ui-peek-list-height 25) + (add-hook 'lsp-mode-hook 'lsp-ui-mode)) -;; Load the config -(org-babel-load-file (concat user-emacs-directory "config.org")) +(use-package company-lsp + :requires company + :ensure t + :config + (push 'company-lsp company-backends) -(setq gc-cons-threshold 800000) + ;;disable client-side cache because lsp server does a better job + (setq company-transformers nil + company-lsp-async t + company-lsp-cache-candidates nil)) diff --git a/init.org b/init.org index f4798e2..5ce4d7f 100644 --- a/init.org +++ b/init.org @@ -54,6 +54,7 @@ This function updates init.el whenever changes in init.org are made. The update #+END_SRC * Default settings + #+BEGIN_SRC emacs-lisp (defvar MY--PATH_USER_LOCAL (expand-file-name "~/.emacs.d/user-local/")) (defvar MY--PATH_USER_GLOBAL (expand-file-name "~/.emacs.d/user-global/")) @@ -128,6 +129,34 @@ This function updates init.el whenever changes in init.org are made. The update display-line-numbers-widen t)) ; (add-hook 'emacs-lisp-mode-hook 'display-line-numbers-mode) #+END_SRC +* Git +** Magit +Little crash course in magit: +- magit-init to init a git project +- magit-status (C-x g) to call the status window + +In status buffer: +- s stage files +- u unstage files +- U unstage all files +- a apply changes to staging +- c c commit (type commit message, then C-c C-c to commit) +- b b switch to another branch +- P u git push +- F u git pull + +#+BEGIN_SRC emacs-lisp +(use-package magit + :ensure t + :defer t + :init + ; set git-path in work environment + (if (string-equal user-login-name "POH") + (setq magit-git-executable "P:/Eigene Dateien/Tools/Git/bin/git.exe") + ) + :bind (("C-x g" . magit-status)) +) +#+END_SRC * undo #+BEGIN_SRC emacs-lisp (require 'undo-tree)