add git markers
This commit is contained in:
+100
-20
@@ -28,10 +28,20 @@
|
||||
(eval-when-compile (require 'use-package))
|
||||
(setq use-package-always-ensure t)
|
||||
(pdf-tools-install)
|
||||
(use-package exec-path-from-shell)
|
||||
|
||||
|
||||
#+end_src
|
||||
** Git
|
||||
#+begin_src emacs-lisp
|
||||
(use-package git-gutter)
|
||||
|
||||
(use-package git-gutter-fringe)
|
||||
|
||||
(define-fringe-bitmap 'git-gutter-fr:added [224] nil nil '(center repeated))
|
||||
(define-fringe-bitmap 'git-gutter-fr:modified [224] nil nil '(center repeated))
|
||||
(define-fringe-bitmap 'git-gutter-fr:deleted [128 192 224 240] nil nil 'bottom)
|
||||
#+end_src
|
||||
** Prolog
|
||||
#+begin_src emacs-lisp
|
||||
(autoload 'run-prolog "prolog" "Start a Prolog sub-process." t)
|
||||
@@ -54,8 +64,10 @@
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(use-package zenburn-theme)
|
||||
(use-package doom-themes)
|
||||
(use-package spacemacs-theme)
|
||||
|
||||
(load-theme 'spacemacs-dark t)
|
||||
|
||||
(load-theme 'doom-one t)
|
||||
|
||||
(use-package vertico
|
||||
:custom
|
||||
@@ -178,13 +190,55 @@
|
||||
(require 'smartparens-config))
|
||||
#+end_src
|
||||
|
||||
** Flycheck
|
||||
#+begin_src emacs-lisp
|
||||
(use-package flycheck
|
||||
:init
|
||||
(progn
|
||||
(define-fringe-bitmap 'my-flycheck-fringe-indicator
|
||||
(vector #b00000000
|
||||
#b00000000
|
||||
#b00000000
|
||||
#b00000000
|
||||
#b00000000
|
||||
#b00000000
|
||||
#b00000000
|
||||
#b00011100
|
||||
#b00111110
|
||||
#b00111110
|
||||
#b00111110
|
||||
#b00011100
|
||||
#b00000000
|
||||
#b00000000
|
||||
#b00000000
|
||||
#b00000000
|
||||
#b00000000))
|
||||
|
||||
(flycheck-define-error-level 'error
|
||||
:severity 2
|
||||
:overlay-category 'flycheck-error-overlay
|
||||
:fringe-bitmap 'my-flycheck-fringe-indicator
|
||||
:fringe-face 'flycheck-fringe-error)
|
||||
|
||||
(flycheck-define-error-level 'warning
|
||||
:severity 1
|
||||
:overlay-category 'flycheck-warning-overlay
|
||||
:fringe-bitmap 'my-flycheck-fringe-indicator
|
||||
:fringe-face 'flycheck-fringe-warning)
|
||||
|
||||
(flycheck-define-error-level 'info
|
||||
:severity 0
|
||||
:overlay-category 'flycheck-info-overlay
|
||||
:fringe-bitmap 'my-flycheck-fringe-indicator
|
||||
:fringe-face 'flycheck-fringe-info)))
|
||||
#+end_src
|
||||
|
||||
** LSP
|
||||
#+begin_src emacs-lisp
|
||||
;; Java
|
||||
(use-package exec-path-from-shell)
|
||||
(use-package lsp-java)
|
||||
(require 'lsp-java)
|
||||
(add-hook 'java-mode-hook #'lsp)
|
||||
(use-package hydra)
|
||||
(setq lsp-java-jdt-download-url "https://download.eclipse.org/jdtls/milestones/0.57.0/jdt-language-server-0.57.0-202006172108.tar.gz")
|
||||
|
||||
@@ -201,7 +255,6 @@
|
||||
:hook
|
||||
((prog-mode . lsp)
|
||||
(c-mode . lsp)
|
||||
(emacs-lisp-mode . lsp)
|
||||
(java-mode . lsp)
|
||||
(latex-mode . lsp)
|
||||
(python-mode . lsp)
|
||||
@@ -228,12 +281,6 @@
|
||||
(keymap-global-set "M-a" 'switch-to-buffer)
|
||||
#+end_src
|
||||
|
||||
** Dired
|
||||
#+begin_src emacs-lisp
|
||||
(add-hook 'dired-mode-hook (lambda () (local-key-binding "-" 'dired-jump)))
|
||||
#+end_src
|
||||
|
||||
|
||||
** C
|
||||
*** Dereference arrow
|
||||
|
||||
@@ -256,7 +303,7 @@
|
||||
#+BEGIN_SRC emacs-lisp
|
||||
(defun reload-conf ()
|
||||
(interactive)
|
||||
(load-file "~/.emacs.d/init.el"))
|
||||
(load-file "~/.emacs.default/init.el"))
|
||||
(keymap-global-set "C-c r" 'reload-conf)
|
||||
#+END_SRC
|
||||
|
||||
@@ -264,7 +311,7 @@
|
||||
#+begin_src emacs-lisp
|
||||
(defun open-config ()
|
||||
(interactive)
|
||||
(find-file "~/.emacs.d/config.org"))
|
||||
(find-file "~/.emacs.default/config.org"))
|
||||
(keymap-global-set "C-c c" 'open-config)
|
||||
#+end_src
|
||||
** Window command
|
||||
@@ -292,11 +339,12 @@
|
||||
|
||||
* Org
|
||||
#+begin_src emacs-lisp
|
||||
(use-package org-superstar)
|
||||
(defun my/buffer-face-mode-variable ()
|
||||
"Set font to a variable width (proportional) fonts in current buffer"
|
||||
(interactive)
|
||||
(setq buffer-face-mode-face '(:family "Roboto Slab"
|
||||
:height 150
|
||||
:height 120
|
||||
:width normal))
|
||||
(buffer-face-mode))
|
||||
(use-package org-bullets
|
||||
@@ -419,6 +467,11 @@
|
||||
(add-hook 'before-make-frame-hook (lambda () (scroll-bar-mode -1)))
|
||||
#+END_SRC
|
||||
|
||||
** Prog
|
||||
#+begin_src emacs-lisp
|
||||
(add-hook 'prog-mode-hook 'git-gutter-mode)
|
||||
#+end_src
|
||||
|
||||
* Terminal
|
||||
#+begin_src emacs-lisp
|
||||
(use-package vterm
|
||||
@@ -438,15 +491,8 @@
|
||||
#+end_src
|
||||
* Misceleaneous
|
||||
|
||||
** Music
|
||||
#+begin_src emacs-lisp
|
||||
(use-package emms)
|
||||
(emms-all)
|
||||
(setq emms-player-list '(emms-player-vlc)
|
||||
emms-info-functions '(emms-info-native))
|
||||
#+end_src
|
||||
|
||||
** Indentation
|
||||
|
||||
#+begin_src emacs-lisp
|
||||
(use-package rainbow-delimiters)
|
||||
(use-package highlight-indent-guides)
|
||||
@@ -477,3 +523,37 @@
|
||||
(setq-default indent-tabs-mode nil)
|
||||
(setq-default tab-width 4)
|
||||
#+end_src
|
||||
|
||||
** Smooth scroll
|
||||
#+begin_src emacs-lisp
|
||||
(setq mouse-wheel-scroll-amount '(1 ((shift) . 1) ((control) . nil)))
|
||||
(setq mouse-wheel-follow-mouse 't) ; scroll window under mouse
|
||||
(require 'mwheel)
|
||||
(setq mouse-wheel-scroll-amount '(3 ((shift) . 1) ((control) . 5)))
|
||||
(setq mouse-wheel-inhibit-click-time 0.1)
|
||||
(setq scroll-step 1
|
||||
scroll-conservatively 10000
|
||||
scroll-preserve-screen-position 1)
|
||||
(pixel-scroll-mode 1) ; Enable pixel-level scrolling
|
||||
(setq pixel-scroll-precision-large-scroll-height 40.0)
|
||||
(use-package smooth-scrolling
|
||||
:init
|
||||
(smooth-scrolling-mode t))
|
||||
(use-package good-scroll
|
||||
:ensure t
|
||||
:config
|
||||
(good-scroll-mode 1))
|
||||
|
||||
#+end_src
|
||||
|
||||
** Startup screen
|
||||
#+begin_src emacs-lisp
|
||||
(use-package dashboard
|
||||
:ensure t
|
||||
:config
|
||||
(dashboard-setup-startup-hook)
|
||||
(setq initial-buffer-choice (lambda () (get-buffer "*dashboard*")))
|
||||
(setq server-window (lambda () (switch-to-buffer "*dashboard*"))))
|
||||
(setq server-window (lambda () (switch-to-buffer "*dashboard*")))
|
||||
(kill-buffer "*scratch*")
|
||||
#+end_src
|
||||
|
||||
Reference in New Issue
Block a user