Compare commits

..

No commits in common. "c69e7e43d8e36148f85892727d96cdfb3f18c024" and "579ccd16c1f06f74e62d07462f30f1b0a7fb1960" have entirely different histories.

12 changed files with 62 additions and 77 deletions

View file

@ -1,6 +1,5 @@
;; configure backups ;; configure backups
(setq backup-directory-alist '(("." . "~/.emacs.d/backups/") (setq backup-directory-alist '(("." . "~/.emacs.d/backups/"))
("/dev/shm" . "/dev/null"))
backup-by-copying t backup-by-copying t
delete-old-versions t delete-old-versions t
kept-new-versions 16 kept-new-versions 16

View file

@ -82,7 +82,3 @@
;; configure theme ;; configure theme
(custom-set-variables (custom-set-variables
'(custom-enabled-themes (quote (tango-dark)))) '(custom-enabled-themes (quote (tango-dark))))
;; configur authinfo file
(setq auth-sources
'((:source "~/.authinfo.gpg")))

View file

@ -1,24 +1,38 @@
;; magit
(use-package magit
:ensure t
:init
;; (taken from :open https://r0tty.org/git/dotfiles/emacs/tree/.emacs.d/config/development.el)
(defun vcsh (repo)
"Invoke magit on a vcsh repo. This requires an appropriate entry in `tramp-methods'."
(interactive (let ((repos (delq nil
(mapcar #'(lambda (name)
(if (string-match ".git$" name)
(substring name 0 -4)
nil))
(directory-files "~/.config/vcsh/repo.d")))))
(list (completing-read "Repository: " repos nil t))))
(magit-status-internal (format "/vcsh:%s:" repo)))
:config
;; Turn on flyspell when writing commit messages
(add-hook 'git-commit-setup-hook 'git-commit-turn-on-flyspell))
;; use ripgrep in emacs
(use-package deadgrep
:ensure t
:bind ("M-s d" . deadgrep))
;; paredit ;; paredit
(use-package paredit (use-package paredit
:ensure t :ensure t
:config :config
(autoload 'enable-paredit-mode "paredit" "Turn on pseudo-structural editing of Lisp code." t) (autoload 'enable-paredit-mode "paredit" "Turn on pseudo-structural editing of Lisp code." t)
(add-hook 'emacs-lisp-mode-hook #'enable-paredit-mode) (add-hook 'emacs-lisp-mode-hook #'enable-paredit-mode)
(add-hook 'eval-expression-minibuffer-setup-hook #'enable-paredit-mode) (add-hook 'eval-expression-minibuffer-setup-hook #'enable-paredit-mode)
(add-hook 'ielm-mode-hook #'enable-paredit-mode) (add-hook 'ielm-mode-hook #'enable-paredit-mode)
(add-hook 'lisp-mode-hook #'enable-paredit-mode) (add-hook 'lisp-mode-hook #'enable-paredit-mode)
(add-hook 'lisp-interaction-mode-hook #'enable-paredit-mode) (add-hook 'lisp-interaction-mode-hook #'enable-paredit-mode)
(add-hook 'scheme-mode-hook #'enable-paredit-mode)) (add-hook 'scheme-mode-hook #'enable-paredit-mode))
(use-package highlight-parentheses
:ensure t
:config
(global-highlight-parentheses-mode t))
(use-package rainbow-delimiters
:ensure t
:config
(add-hook 'prog-mode-hook #'rainbow-delimiters-mode))
;; Hack to show only files known to git inside dired; needs the ;; Hack to show only files known to git inside dired; needs the
;; `git-find' shell script shim (taken from :open https://r0tty.org/git/dotfiles/emacs/tree/.emacs.d/config/development.el) ;; `git-find' shell script shim (taken from :open https://r0tty.org/git/dotfiles/emacs/tree/.emacs.d/config/development.el)
@ -39,6 +53,6 @@
;; language server ;; language server
(use-package lsp-mode (use-package lsp-mode
:ensure t :ensure t
:config :config
(add-hook 'rust-mode-hook 'lsp-deferred)) (add-hook 'rust-mode-hook 'lsp-deferred))

View file

@ -1,18 +0,0 @@
;; magit
(use-package magit
:ensure t
:init
;; (taken from :open https://r0tty.org/git/dotfiles/emacs/tree/.emacs.d/config/development.el)
(defun vcsh (repo)
"Invoke magit on a vcsh repo. This requires an appropriate entry in `tramp-methods'."
(interactive (let ((repos (delq nil
(mapcar #'(lambda (name)
(if (string-match ".git$" name)
(substring name 0 -4)
nil))
(directory-files "~/.config/vcsh/repo.d")))))
(list (completing-read "Repository: " repos nil t))))
(magit-status-internal (format "/vcsh:%s:" repo)))
:config
;; Turn on flyspell when writing commit messages
(add-hook 'git-commit-setup-hook 'git-commit-turn-on-flyspell))

View file

@ -1,3 +1,3 @@
(use-package pinentry (use-package pinentry
:init :init
(setq epa-pinentry-mode 'loopback)) (setq epa-pinentry-mode 'loopback))

View file

@ -1,5 +1,5 @@
(use-package org (use-package org
:ensure t :ensure t
:init (setq org-export-backends '(ascii html icalendar latex odt beamer))) :init (setq org-export-backends '(ascii html icalendar latex odt beamer)))
(setq org-directory "~/org") (setq org-directory "~/org")

View file

@ -1,8 +1,8 @@
(use-package ivy-pass (use-package ivy-pass
:ensure t :ensure t
:init :init
;; from https://github.com/ecraven/ivy-pass/blob/master/ivy-pass.el ;; from https://github.com/ecraven/ivy-pass/blob/master/ivy-pass.el
(setq password-store-password-length 32)) (setq password-store-password-length 32))
;; configure ivy-pass key binding ;; configure ivy-pass key binding
(global-set-key [?\C-x ?p] 'ivy-pass) (global-set-key [?\C-x ?p] 'ivy-pass)

View file

@ -1,4 +0,0 @@
;; use ripgrep in emacs
(use-package deadgrep
:ensure t
:bind ("M-s d" . deadgrep))

View file

@ -1,13 +1,13 @@
(use-package cargo (use-package cargo
:ensure t :ensure t
:config :config
;; enable cargo keybindings ;; enable cargo keybindings
(add-hook 'rust-mode-hook 'cargo-minor-mode)) (add-hook 'rust-mode-hook 'cargo-minor-mode))
(use-package rust-mode (use-package rust-mode
:ensure t :ensure t
:config :config
;; format code when saving ;; format code when saving
(setq rust-format-on-save t)) (setq rust-format-on-save t))
(use-package flycheck-rust :ensure t) (use-package flycheck-rust :ensure t)

View file

@ -1,9 +1,9 @@
(use-package tramp (use-package tramp
:config :config
(setq tramp-default-method "ssh") (setq tramp-default-method "ssh")
(add-to-list 'tramp-methods '("vcsh" (add-to-list 'tramp-methods '("vcsh"
(tramp-login-program "vcsh") (tramp-login-program "vcsh")
(tramp-login-args (("enter") (tramp-login-args (("enter")
("%h"))) ("%h")))
(tramp-remote-shell "/bin/sh") (tramp-remote-shell "/bin/sh")
(tramp-remote-shell-args ("-c"))))) (tramp-remote-shell-args ("-c")))))

View file

@ -57,7 +57,7 @@ symbols, which are converted to strings, and suffixed with \".el\"."
:group 'config-snippets :group 'config-snippets
:type '(repeat directory)) :type '(repeat directory))
(setq config-snippets '(base backups c calendar dev functions git gpg org pass ripgrep rust wl yaml)) (setq config-snippets '(base backups c calendar dev functions gpg org pass rust wl yaml))
(message "Loading\nconfig-snippets: %s\nconfig-snippets-path: %s" config-snippets config-snippet-path) (message "Loading\nconfig-snippets: %s\nconfig-snippets-path: %s" config-snippets config-snippet-path)
(dolist (snippet config-snippets) (dolist (snippet config-snippets)

View file

@ -5,11 +5,9 @@
!/.emacs.d/config/c.el !/.emacs.d/config/c.el
!/.emacs.d/config/dev.el !/.emacs.d/config/dev.el
!/.emacs.d/config/functions.el !/.emacs.d/config/functions.el
!/.emacs.d/config/git.el
!/.emacs.d/config/gpg.el !/.emacs.d/config/gpg.el
!/.emacs.d/config/org.el !/.emacs.d/config/org.el
!/.emacs.d/config/pass.el !/.emacs.d/config/pass.el
!/.emacs.d/config/ripgrep.el
!/.emacs.d/config/rust.el !/.emacs.d/config/rust.el
!/.emacs.d/config/tramp.el !/.emacs.d/config/tramp.el
!/.emacs.d/config/yaml.el !/.emacs.d/config/yaml.el