Fix all the annoying errors and take the training wheels off
This commit is contained in:
parent
1d3397a869
commit
0be073f995
SSH key fingerprint:
SHA256:gcG2rc5bPVo4dQ6xICvEeOylJjHYUehCFFNrjjm+c50
2 changed files with 47 additions and 55 deletions
|
|
@ -9,7 +9,7 @@
|
|||
'(org-agenda-files
|
||||
'("~/Documents/notes/20240306172458-homelab.org" "/home/nshields/Documents/notes/daily/2024-03-05.org" "/home/nshields/Documents/notes/daily/2024-03-12.org"))
|
||||
'(package-selected-packages
|
||||
'(kubernetes-evil kubernetes multi-vterm projectile evil-collection-vterm org-roam pomodoro company fzf magit-todos dap-mode lsp-ui lsp-mode marginalia vertico evil-collection which-key vterm use-package rainbow-delimiters pdf-tools org-roam-ui org-modern nix-mode magit kagi gruvbox-theme gotham-theme evil doom-themes doom-modeline-now-playing crdt consult-org-roam command-log-mode catppuccin-theme))
|
||||
'(undo-tree orderless kubernetes-evil kubernetes multi-vterm projectile evil-collection-vterm org-roam pomodoro company fzf magit-todos dap-mode lsp-ui lsp-mode marginalia vertico evil-collection which-key vterm use-package rainbow-delimiters pdf-tools org-roam-ui org-modern nix-mode magit kagi gruvbox-theme gotham-theme evil doom-themes doom-modeline-now-playing crdt consult-org-roam command-log-mode catppuccin-theme))
|
||||
'(visible-bell nil))
|
||||
(custom-set-faces
|
||||
;; custom-set-faces was added by Custom.
|
||||
|
|
|
|||
100
init.el
100
init.el
|
|
@ -20,9 +20,6 @@
|
|||
;; Comment/uncomment this line to enable MELPA Stable if desired. See `package-archive-priorities`
|
||||
;; and `package-pinned-packages`. Most users will not need or want to do this.
|
||||
;;(add-to-list 'package-archives '("melpa-stable" . "https://stable.melpa.org/packages/") t)
|
||||
(package-initialize)
|
||||
|
||||
|
||||
(require 'package)
|
||||
(setq package-archives '(("melpa" . "https://melpa.org/packages/")
|
||||
("org" . "https://orgmode.org/elpa/")
|
||||
|
|
@ -51,7 +48,6 @@
|
|||
(global-set-key (kbd "<escape>") 'keyboard-escape-quit)
|
||||
|
||||
(setq modus-themes-mode-line '(accented borderless padded))
|
||||
(setq modus-themes-completions 'opinionated)
|
||||
(load-theme 'modus-vivendi t)
|
||||
|
||||
(column-number-mode)
|
||||
|
|
@ -60,44 +56,6 @@
|
|||
vterm-mode-hook))
|
||||
(add-hook mode (lambda () (display-line-numbers-mode 0))))
|
||||
|
||||
(use-package multi-vterm :ensure t)
|
||||
(use-package multi-vterm
|
||||
:ensure t
|
||||
:config
|
||||
(add-hook 'vterm-mode-hook
|
||||
(lambda ()
|
||||
(setq-local evil-insert-state-cursor 'box)
|
||||
(evil-insert-state)))
|
||||
(define-key vterm-mode-map [return] #'vterm-send-return)
|
||||
|
||||
(setq vterm-keymap-exceptions nil)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-e") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-f") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-a") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-v") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-b") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-w") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-u") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-d") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-n") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-m") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-p") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-j") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-k") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-r") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-t") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-g") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-c") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-SPC") #'vterm--self-insert)
|
||||
(evil-define-key 'normal vterm-mode-map (kbd "C-d") #'vterm--self-insert)
|
||||
(evil-define-key 'normal vterm-mode-map (kbd ",c") #'multi-vterm)
|
||||
(evil-define-key 'normal vterm-mode-map (kbd ",n") #'multi-vterm-next)
|
||||
(evil-define-key 'normal vterm-mode-map (kbd ",p") #'multi-vterm-prev)
|
||||
(evil-define-key 'normal vterm-mode-map (kbd "i") #'evil-insert-resume)
|
||||
(evil-define-key 'normal vterm-mode-map (kbd "o") #'evil-insert-resume)
|
||||
(evil-define-key 'normal vterm-mode-map (kbd "<return>") #'evil-insert-resume))
|
||||
|
||||
|
||||
(use-package which-key
|
||||
:init (which-key-mode)
|
||||
:diminish which-key-mode
|
||||
|
|
@ -149,7 +107,7 @@
|
|||
(setq evil-want-integration t)
|
||||
(setq evil-want-keybinding nil)
|
||||
:config
|
||||
(evil-mode 1))
|
||||
(evil-mode -1))
|
||||
|
||||
(use-package evil-collection
|
||||
:after evil
|
||||
|
|
@ -179,6 +137,7 @@
|
|||
:config
|
||||
(require 'org-roam-dailies) ;; Ensure the keymap is available
|
||||
(org-roam-db-autosync-mode))
|
||||
|
||||
(org-roam-db-autosync-mode)
|
||||
;; Bind this to C-c n I
|
||||
(defun org-roam-node-insert-immediate (arg &rest args)
|
||||
|
|
@ -267,7 +226,7 @@
|
|||
(magit-status))
|
||||
|
||||
(use-package fzf
|
||||
:bind (("C-c f g" . fzf-git-files)
|
||||
:bind (("C-C F g" . fzf-git-files)
|
||||
("C-c f f" . fzf-find-file)
|
||||
("C-c d" . fzf-directory)
|
||||
("C-c f r" . fzf-grep)
|
||||
|
|
@ -281,16 +240,7 @@
|
|||
fzf/position-bottom t
|
||||
fzf/window-height 15))
|
||||
|
||||
(use-package projectile
|
||||
:diminish projectile-mode
|
||||
:config (projectile-mode)
|
||||
:demand t
|
||||
:bind ("C-M-p" . projectile-find-file)
|
||||
:bind-keymap
|
||||
("C-c p" . projectile-command-map)
|
||||
:init
|
||||
(when (file-directory-p "~/Code")
|
||||
(setq projectile-project-search-path '("~/Code")))
|
||||
|
||||
(setq projectile-switch-project-action #'projectile-dired))
|
||||
|
||||
(use-package kubernetes-evil
|
||||
|
|
@ -305,3 +255,45 @@
|
|||
|
||||
;; example:
|
||||
(define-key *my-leader* (kbd "C-b") #'previous-buffer)
|
||||
|
||||
(use-package multi-vterm :ensure t)
|
||||
(use-package multi-vterm
|
||||
:ensure t
|
||||
:config
|
||||
(add-hook 'vterm-mode-hook
|
||||
(lambda ()
|
||||
(setq-local evil-insert-state-cursor 'box)
|
||||
(evil-insert-state)))
|
||||
(define-key vterm-mode-map [return] #'vterm-send-return)
|
||||
(setq vterm-keymap-exceptions nil)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-e") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-f") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-a") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-v") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-b") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-w") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-u") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-d") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-n") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-m") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-p") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-j") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-k") #'Vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-r") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-t") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-g") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-c") #'vterm--self-insert)
|
||||
(evil-define-key 'insert vterm-mode-map (kbd "C-SPC") #'vterm--self-insert)
|
||||
(evil-define-key 'normal vterm-mode-map (kbd "C-d") #'vterm--self-insert)
|
||||
(evil-define-key 'normal vterm-mode-map (kbd ",c") #'multi-vterm)
|
||||
(evil-define-key 'normal vterm-mode-map (kbd ",n") #'multi-vterm-next)
|
||||
(evil-define-key 'normal vterm-mode-map (kbd ",p") #'multi-vterm-prev)
|
||||
(evil-define-key 'normal vterm-mode-map (kbd "i") #'evil-insert-resume)
|
||||
(evil-define-key 'normal vterm-mode-map (kbd "o") #'evil-insert-resume)
|
||||
(evil-define-key 'normal vterm-mode-map (kbd "<return>") #'evil-insert-resume))
|
||||
|
||||
(use-package orderless
|
||||
:ensure t
|
||||
:custom
|
||||
(completion-styles '(orderless basic))
|
||||
(completion-category-overrides '((file (styles basic partial-completion)))))
|
||||
|
|
|
|||
Loading…
Reference in a new issue