Namespace packages

This commit is contained in:
Maciej 2021-03-07 18:24:10 +02:00
parent a09b7edebe
commit 185c112890
Signed by: maciej
GPG key ID: 41D62D42D3B0D765
41 changed files with 177 additions and 177 deletions

View file

@ -14,5 +14,5 @@
:straight t
:defer t)
(provide 'icejam-pkg-avy)
(provide '+custom-pkg-avy)
;;; avy.el ends here

View file

@ -120,5 +120,5 @@
(which-key-mode t)
(provide 'icejam-pkg-base)
(provide '+custom-pkg-base)
;;; base.el ends here

View file

@ -75,5 +75,5 @@
(define-key text-mode-map (kbd "<f13>") 'insert-space-and-complete)
(define-key text-mode-map (kbd "TAB") 'company-indent-or-complete-common)
(provide 'icejam-pkg-company-yasnippet)
(provide '+custom-pkg-company-yasnippet)
;;; company-yasnippet.el ends here

View file

@ -2,7 +2,7 @@
;;; Commentary:
;;; Old and rudimental completion framework.
;;; Code:
(require 'icejam-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el")
(require '+custom-pkg-projectile "$HOME/.emacs.d/pkg/projectile.el")
(setq tags-add-tables nil)
@ -52,5 +52,5 @@
(add-hook 'after-save-hook 'ctags/update-tags-on-save)
(provide 'icejam-pkg-ctags)
(provide '+custom-pkg-ctags)
;;; ctags.el ends here

View file

@ -23,5 +23,5 @@
;; (registers . 5)
(projects . 5)))
(provide 'icejam-pkg-dashboard)
(provide '+custom-pkg-dashboard)
;;; dashboard.el ends here

View file

@ -3,8 +3,8 @@
;;; Notational velocity, backed by OneDrive.
;;; Code:
(require 'icejam-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
(require 'icejam-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el")
(require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
(require '+custom-pkg-hydra "$HOME/.emacs.d/pkg/hydra.el")
(use-package deft
:straight t
@ -19,7 +19,7 @@
("d" deft "Deft")
("q" cancel "quit"))
(define-key icejam-keys-mode-map (kbd "C-c d") '+hydra-deft-menu/body)
(define-key +custom-keys-mode-map (kbd "C-c d") '+hydra-deft-menu/body)
(provide 'icejam-pkg-deft)
(provide '+custom-pkg-deft)
;;; deft.el ends here

View file

@ -23,5 +23,5 @@
(eval-after-load "whitespace" '(diminish 'whitespace-mode))
(eval-after-load "auto-revert-mode" '(diminish 'auto-revert-mode))
(provide 'icejam-pkg-diminish)
(provide '+custom-pkg-diminish)
;;; diminish.el ends here

View file

@ -25,5 +25,5 @@
(unbind-key "C-c ! v" flycheck-mode-map)
(unbind-key "C-c ! x" flycheck-mode-map))
(provide 'icejam-pkg-flycheck)
(provide '+custom-pkg-flycheck)
;;; flycheck.el ends here

View file

@ -3,7 +3,7 @@
;;; Global hydra definitions.
;;; Code:
(require 'icejam-pkg-avy "$HOME/.emacs.d/pkg/avy.el")
(require '+custom-pkg-avy "$HOME/.emacs.d/pkg/avy.el")
(defun mark-and-indent-whole-buffer ()
"Mark and indent whole buffer."
@ -151,5 +151,5 @@ Other: _m_: iMenu
("C-c m" . +hydra-bufmove/body)
("C-c l" . +hydra-language-context-menu/body))
(provide 'icejam-pkg-hydra)
(provide '+custom-pkg-hydra)
;;; hydra.el ends here

View file

@ -17,5 +17,5 @@
(unbind-key "C-c $" flyspell-mode-map)
(unbind-key "C-M-i" flyspell-mode-map)))
(provide 'icejam-pkg-ispell)
(provide '+custom-pkg-ispell)
;;; ispell.el ends here

View file

@ -3,7 +3,7 @@
;;; Counsel, Swiper and Ivy.
;;; Code:
(require 'icejam-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
(require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
(use-package counsel :straight t :defer t)
(use-package swiper :straight t :defer t)
@ -23,17 +23,17 @@
(setq counsel-describe-function-function #'helpful-callable)
(setq counsel-describe-variable-function #'helpful-variable)
(define-key icejam-keys-mode-map (kbd "C-c a") 'counsel-rg)
(define-key icejam-keys-mode-map (kbd "C-c t") 'counsel-find-file)
(define-key icejam-keys-mode-map (kbd "C-c C-s") 'swiper) ;; Find things by regexp
(define-key icejam-keys-mode-map (kbd "M-x") 'counsel-M-x) ;; M-x on steroids
(define-key +custom-keys-mode-map (kbd "C-c a") 'counsel-rg)
(define-key +custom-keys-mode-map (kbd "C-c t") 'counsel-find-file)
(define-key +custom-keys-mode-map (kbd "C-c C-s") 'swiper) ;; Find things by regexp
(define-key +custom-keys-mode-map (kbd "M-x") 'counsel-M-x) ;; M-x on steroids
;; List all key bindings there are.
(define-key icejam-keys-mode-map (kbd "<f1> f") 'counsel-describe-function)
(define-key icejam-keys-mode-map (kbd "<f1> v") 'counsel-describe-variable)
(define-key icejam-keys-mode-map (kbd "<f1> l") 'counsel-find-library)
(define-key icejam-keys-mode-map (kbd "<f2> i") 'counsel-info-lookup-symbol)
(define-key icejam-keys-mode-map (kbd "<f2> u") 'counsel-unicode-char)
(define-key +custom-keys-mode-map (kbd "<f1> f") 'counsel-describe-function)
(define-key +custom-keys-mode-map (kbd "<f1> v") 'counsel-describe-variable)
(define-key +custom-keys-mode-map (kbd "<f1> l") 'counsel-find-library)
(define-key +custom-keys-mode-map (kbd "<f2> i") 'counsel-info-lookup-symbol)
(define-key +custom-keys-mode-map (kbd "<f2> u") 'counsel-unicode-char)
(provide 'icejam-pkg-ivy)
(provide '+custom-pkg-ivy)
;;; ivy.el ends here

View file

@ -10,46 +10,46 @@
;;; Code:
(define-minor-mode icejam-keys-mode
(define-minor-mode +custom-keys-mode
"Minor mode for all of my personal key bindings"
:global t
:keymap (make-sparse-keymap))
;; Globally enable my minor mode
(icejam-keys-mode)
(+custom-keys-mode)
;;; Helpful key bindings
(define-key icejam-keys-mode-map (kbd "C-c \\") 'split-window-right) ;; Split window to the right
(define-key icejam-keys-mode-map (kbd "C-c /") 'split-window-below) ;; Split window to the bottom
(define-key +custom-keys-mode-map (kbd "C-c \\") 'split-window-right) ;; Split window to the right
(define-key +custom-keys-mode-map (kbd "C-c /") 'split-window-below) ;; Split window to the bottom
;; Move between windows key bindings
(define-key icejam-keys-mode-map (kbd "C-c <left>") 'windmove-left)
(define-key icejam-keys-mode-map (kbd "C-c <right>") 'windmove-right)
(define-key icejam-keys-mode-map (kbd "C-c <up>") 'windmove-up)
(define-key icejam-keys-mode-map (kbd "C-c <down>") 'windmove-down)
(define-key +custom-keys-mode-map (kbd "C-c <left>") 'windmove-left)
(define-key +custom-keys-mode-map (kbd "C-c <right>") 'windmove-right)
(define-key +custom-keys-mode-map (kbd "C-c <up>") 'windmove-up)
(define-key +custom-keys-mode-map (kbd "C-c <down>") 'windmove-down)
;; The same, but without using arrow keys
(define-key icejam-keys-mode-map (kbd "C-c [") 'windmove-left)
(define-key icejam-keys-mode-map (kbd "C-c ]") 'windmove-right)
(define-key icejam-keys-mode-map (kbd "C-c {") 'windmove-up)
(define-key icejam-keys-mode-map (kbd "C-c }") 'windmove-down)
(define-key +custom-keys-mode-map (kbd "C-c [") 'windmove-left)
(define-key +custom-keys-mode-map (kbd "C-c ]") 'windmove-right)
(define-key +custom-keys-mode-map (kbd "C-c {") 'windmove-up)
(define-key +custom-keys-mode-map (kbd "C-c }") 'windmove-down)
;; Kill current buffer and window
(define-key icejam-keys-mode-map (kbd "C-c q") 'kill-buffer-and-window)
(define-key +custom-keys-mode-map (kbd "C-c q") 'kill-buffer-and-window)
;; List buffers
(define-key icejam-keys-mode-map (kbd "C-c b") 'ibuffer)
(define-key +custom-keys-mode-map (kbd "C-c b") 'ibuffer)
;; Revert without asking
(defun revert-buffer-no-confirm ()
"Revert buffer without confirmation."
(interactive) (revert-buffer t t))
(define-key icejam-keys-mode-map (kbd "C-c r") 'revert-buffer-no-confirm)
(define-key +custom-keys-mode-map (kbd "C-c r") 'revert-buffer-no-confirm)
;;;;;;;;; Emacs bindings ;;;;;;;;;;;;;;;;;;;;;
(define-key icejam-keys-mode-map [home] 'beginning-of-line)
(define-key icejam-keys-mode-map [end] 'end-of-line)
(define-key +custom-keys-mode-map [home] 'beginning-of-line)
(define-key +custom-keys-mode-map [end] 'end-of-line)
(provide 'icejam-pkg-keys-mode)
(provide '+custom-pkg-keys-mode)
;;; keys-mode.el ends here

View file

@ -71,5 +71,5 @@
:defer t
:requires (lsp-mode lsp-ui))
(provide 'icejam-pkg-lsp)
(provide '+custom-pkg-lsp)
;;; lsp.el ends here

View file

@ -9,5 +9,5 @@
(setq result (append (list (car form) result)
(cdr form))))))
(provide 'icejam-pkg-macros)
(provide '+custom-pkg-macros)
;;; macros ends here

View file

@ -11,5 +11,5 @@
(:map magit-blame-mode-map
("<f5> b" . 'magit-blame-quit)))
(provide 'icejam-pkg-magit)
(provide '+custom-pkg-magit)
;;; magit.el ends here

View file

@ -29,5 +29,5 @@
(unbind-key "C-x x <right>" persp-mode-map)
(unbind-key "C-x x C-x x" persp-mode-map))
(provide 'icejam-pkg-persp)
(provide '+custom-pkg-persp)
;;; persp.el ends here

View file

@ -79,5 +79,5 @@
:straight t
:defer t)
(provide 'icejam-pkg-prog-mode)
(provide '+custom-pkg-prog-mode)
;;; prog-mode ends here

View file

@ -20,5 +20,5 @@
(projectile-mode t)
(provide 'icejam-pkg-projectile)
(provide '+custom-pkg-projectile)
;;; projectile.el ends here

View file

@ -7,9 +7,9 @@
(defconst IS-BSD (eq system-type 'berkeley-unix))
(defconst IS-GNU (eq system-type 'gnu/linux))
(require 'icejam-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
(require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
(defun icejam-delete-window ()
(defun +custom-function-delete-window ()
"Kill a window."
(interactive) (delete-window))
@ -31,20 +31,20 @@
(setq mac-command-modifier 'meta))))
;;;;;;;;; Mac binding (fix) ;;;;;;;;;;;;;;;;;;
(define-key icejam-keys-mode-map (kbd "H-<right>") 'end-of-line)
(define-key icejam-keys-mode-map (kbd "H-<left>") 'beginning-of-line)
(define-key icejam-keys-mode-map (kbd "H-<up>") 'scroll-down) ; WTF is this reverse, I dunno
(define-key icejam-keys-mode-map (kbd "H-<down>") 'scroll-up)
(define-key +custom-keys-mode-map (kbd "H-<right>") 'end-of-line)
(define-key +custom-keys-mode-map (kbd "H-<left>") 'beginning-of-line)
(define-key +custom-keys-mode-map (kbd "H-<up>") 'scroll-down) ; WTF is this reverse, I dunno
(define-key +custom-keys-mode-map (kbd "H-<down>") 'scroll-up)
(define-key icejam-keys-mode-map [(hyper a)] 'mark-whole-buffer)
(define-key icejam-keys-mode-map [(hyper v)] 'yank)
(define-key icejam-keys-mode-map [(hyper x)] 'kill-region)
(define-key icejam-keys-mode-map [(hyper c)] 'kill-ring-save)
(define-key icejam-keys-mode-map [(hyper s)] 'save-buffer)
(define-key icejam-keys-mode-map [(hyper l)] 'goto-line)
(define-key icejam-keys-mode-map [(hyper w)] 'icejam-delete-window)
(define-key icejam-keys-mode-map [(hyper z)] 'undo)
(define-key icejam-keys-mode-map [(hyper q)] 'kill-emacs)
(define-key +custom-keys-mode-map [(hyper a)] 'mark-whole-buffer)
(define-key +custom-keys-mode-map [(hyper v)] 'yank)
(define-key +custom-keys-mode-map [(hyper x)] 'kill-region)
(define-key +custom-keys-mode-map [(hyper c)] 'kill-ring-save)
(define-key +custom-keys-mode-map [(hyper s)] 'save-buffer)
(define-key +custom-keys-mode-map [(hyper l)] 'goto-line)
(define-key +custom-keys-mode-map [(hyper w)] '+delete-window)
(define-key +custom-keys-mode-map [(hyper z)] 'undo)
(define-key +custom-keys-mode-map [(hyper q)] 'kill-emacs)
;; Disable meta on right alt (useful for Polish characters)
(setq mac-right-option-modifier nil)))
@ -53,28 +53,28 @@
(if IS-GNU
(progn
;;;;;;;;; Linux Ergo bindings (fix) ;;;;;;;;;;;;;;;;;;
(define-key icejam-keys-mode-map (kbd "C-<right>") 'end-of-line)
(define-key icejam-keys-mode-map (kbd "C-<left>") 'beginning-of-line)
(define-key icejam-keys-mode-map (kbd "C-<up>") 'scroll-down) ; WTF is this reverse, I dunno
(define-key icejam-keys-mode-map (kbd "C-<down>") 'scroll-up)))
(define-key +custom-keys-mode-map (kbd "C-<right>") 'end-of-line)
(define-key +custom-keys-mode-map (kbd "C-<left>") 'beginning-of-line)
(define-key +custom-keys-mode-map (kbd "C-<up>") 'scroll-down) ; WTF is this reverse, I dunno
(define-key +custom-keys-mode-map (kbd "C-<down>") 'scroll-up)))
;;;;;;;;; BSD-specific config ;;;;;;;;;;;;;;;;;;;;;
(if IS-BSD
(progn
(define-key icejam-keys-mode-map (kbd "A-<right>") 'end-of-line)
(define-key icejam-keys-mode-map (kbd "A-<left>") 'beginning-of-line)
(define-key icejam-keys-mode-map (kbd "A-<up>") 'scroll-down) ; WTF is this reverse, I dunno
(define-key icejam-keys-mode-map (kbd "A-<down>") 'scroll-up)
(define-key +custom-keys-mode-map (kbd "A-<right>") 'end-of-line)
(define-key +custom-keys-mode-map (kbd "A-<left>") 'beginning-of-line)
(define-key +custom-keys-mode-map (kbd "A-<up>") 'scroll-down) ; WTF is this reverse, I dunno
(define-key +custom-keys-mode-map (kbd "A-<down>") 'scroll-up)
(define-key icejam-keys-mode-map (kbd "A-a") 'mark-whole-buffer)
(define-key icejam-keys-mode-map (kbd "A-v") 'yank)
(define-key icejam-keys-mode-map (kbd "A-x") 'kill-region)
(define-key icejam-keys-mode-map (kbd "A-c") 'kill-ring-save)
(define-key icejam-keys-mode-map (kbd "A-s") 'save-buffer)
(define-key icejam-keys-mode-map (kbd "A-l") 'goto-line)
(define-key icejam-keys-mode-map (kbd "A-w" 'icejam-delete-window)
(define-key icejam-keys-mode-map (kbd "A-z") 'undo)
(define-key icejam-keys-mode-map (kbd "A-q") 'kill-emacs))))
(define-key +custom-keys-mode-map (kbd "A-a") 'mark-whole-buffer)
(define-key +custom-keys-mode-map (kbd "A-v") 'yank)
(define-key +custom-keys-mode-map (kbd "A-x") 'kill-region)
(define-key +custom-keys-mode-map (kbd "A-c") 'kill-ring-save)
(define-key +custom-keys-mode-map (kbd "A-s") 'save-buffer)
(define-key +custom-keys-mode-map (kbd "A-l") 'goto-line)
(define-key +custom-keys-mode-map (kbd "A-w" '+delete-window)
(define-key +custom-keys-mode-map (kbd "A-z") 'undo)
(define-key +custom-keys-mode-map (kbd "A-q") 'kill-emacs))))
(provide 'icejam-pkg-sys-specific)
(provide '+custom-pkg-sys-specific)
;;; sys-specific.el ends here

View file

@ -9,7 +9,7 @@
;; Proper terminal in Emacs
;;; Code:
(require 'icejam-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
(require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
(use-package vterm :straight t :defer t)
@ -19,7 +19,7 @@
(interactive)
(vterm))
(define-key icejam-keys-mode-map (kbd "<f12>") 'start-term)
(define-key +custom-keys-mode-map (kbd "<f12>") 'start-term)
(provide 'icejam-pkg-term)
(provide '+custom-pkg-term)
;;; term.el ends here

View file

@ -22,5 +22,5 @@
(global-undo-tree-mode t)
(provide 'icejam-pkg-undo-tree)
(provide '+custom-pkg-undo-tree)
;;; undo-tree.el ends here