mirror of
https://github.com/tomru/DotfilesOld.git
synced 2026-03-03 06:27:21 +01:00
more stuff
This commit is contained in:
Thomas Ruoff
@@ -1,3 +1,4 @@
|
|||||||
|
;; debugging startup
|
||||||
(add-hook 'emacs-startup-hook
|
(add-hook 'emacs-startup-hook
|
||||||
(lambda ()
|
(lambda ()
|
||||||
(message "Emacs ready in %s with %d garbage collections."
|
(message "Emacs ready in %s with %d garbage collections."
|
||||||
@@ -6,125 +7,195 @@
|
|||||||
(time-subtract after-init-time before-init-time)))
|
(time-subtract after-init-time before-init-time)))
|
||||||
gcs-done)))
|
gcs-done)))
|
||||||
|
|
||||||
(require 'package)
|
;; some private settings
|
||||||
(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-<tab>" . helm-execute-persistent-action)
|
|
||||||
("C-<backspace>" . 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-<tab>" . helm-execute-persistent-action)
|
|
||||||
("C-<backspace>" . 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"
|
(setq user-full-name "Thomas Ruoff"
|
||||||
calendar-latitude 48.286993
|
calendar-latitude 48.286993
|
||||||
calendar-longitude 8.726407
|
calendar-longitude 8.726407
|
||||||
calendar-location-name "Rosenfeld, Germany")
|
calendar-location-name "Rosenfeld, Germany")
|
||||||
|
|
||||||
|
;; my functions
|
||||||
|
(defun find-user-init-file ()
|
||||||
|
"Edit the `user-init-file', in another window."
|
||||||
|
(interactive)
|
||||||
|
(find-file user-init-file))
|
||||||
|
|
||||||
(use-package f)
|
|
||||||
(use-package org)
|
|
||||||
(setq org-directory "~/org/")
|
|
||||||
(setq org-agenda-files '("~/org"))
|
|
||||||
|
|
||||||
(use-package org-bullets
|
;; ui
|
||||||
:config (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1))))
|
|
||||||
|
|
||||||
; fullscreen
|
|
||||||
(toggle-frame-maximized)
|
(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)
|
||||||
|
|
||||||
|
;; Install into separate package dirs for each Emacs version, to prevent bytecode incompatibility
|
||||||
|
(let ((versioned-package-dir
|
||||||
|
(expand-file-name (format "elpa-%s.%s" emacs-major-version emacs-minor-version)
|
||||||
|
user-emacs-directory)))
|
||||||
|
(setq package-user-dir versioned-package-dir))
|
||||||
|
|
||||||
|
;; Use Melpa-Stable
|
||||||
|
(add-to-list 'package-archives
|
||||||
|
'("melpa" . "https://melpa.org/packages/")
|
||||||
|
'("org" . "http://orgmode.org/elpa/"))
|
||||||
|
|
||||||
|
(package-initialize)
|
||||||
|
|
||||||
|
;; Install use-package.el if have not
|
||||||
|
(unless (package-installed-p 'use-package)
|
||||||
|
(package-refresh-contents)
|
||||||
|
(package-install 'use-package)
|
||||||
|
(package-install 'diminish)
|
||||||
|
(package-install 'bind-key))
|
||||||
|
|
||||||
|
;; use-package.el is no longer needed at runtime
|
||||||
|
(eval-when-compile
|
||||||
|
(require 'use-package))
|
||||||
|
(require 'diminish)
|
||||||
|
(require 'bind-key)
|
||||||
|
|
||||||
|
;; keybindings
|
||||||
|
(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")
|
||||||
|
|
||||||
|
"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
|
||||||
|
:config
|
||||||
|
(evil-mode 1)
|
||||||
|
(define-key evil-insert-state-map "jk" 'evil-normal-state))
|
||||||
|
|
||||||
|
;; 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))))
|
||||||
|
|
||||||
(add-hook 'org-mode-hook 'flyspell-mode)
|
(add-hook 'org-mode-hook 'flyspell-mode)
|
||||||
(add-hook 'text-mode-hook 'flyspell-mode)
|
(add-hook 'text-mode-hook 'flyspell-mode)
|
||||||
|
|||||||
Reference in New Issue
Block a user