From 6fac8a28da9bf30da71941340505c2316d0db5a3 Mon Sep 17 00:00:00 2001 From: John Turner Date: Fri, 7 Oct 2022 03:10:21 -0400 Subject: changed the config-* prefix to init-* for all of the init files --- config/company/config-company.el | 8 ----- config/conf-mode/config-conf-mode-hooks.el | 1 - config/conf-mode/config-conf-mode.el | 5 --- config/dir-locals/eglot-dir-locals.el | 6 ---- config/dired/config-dired.el | 4 --- .../config-display-buffer-best-side.el | 7 ---- config/display-buffer/config-display-buffer.el | 5 --- config/eglot/config-eglot-servers.el | 9 ----- config/eglot/config-eglot.el | 7 ---- config/eldoc/config-eldoc.el | 4 --- config/electric/config-electric.el | 7 ---- .../config-flycheck-cargo-has-command-p-fix.el | 7 ---- config/flycheck/config-flycheck.el | 15 -------- config/flymake/config-flymake-hooks.el | 2 -- config/flymake/config-flymake.el | 12 ------- .../config-garbage-collection.el | 3 -- config/ibuffer/config-ibuffer-filter-groups.el | 10 ------ .../ibuffer/config-ibuffer-human-readable-size.el | 16 --------- config/ibuffer/config-ibuffer-never-show.el | 13 ------- config/ibuffer/config-ibuffer.el | 22 ------------ config/keys/config-keys.el | 12 ------- .../config-lsp-mode-disable-install-server.el | 40 ---------------------- config/lsp-mode/config-lsp-mode.el | 19 ---------- config/man/config-man.el | 3 -- config/native-comp/config-native-comp.el | 3 -- config/package/config-package.el | 4 --- config/prog-mode/config-prog-mode-hooks.el | 1 - config/prog-mode/config-prog-mode.el | 5 --- .../project/config-project-find-rust-projects.el | 4 --- config/project/config-project.el | 3 -- config/recentf/config-recentf.el | 4 --- config/savehist/config-savehist.el | 11 ------ config/text-mode/config-text-mode-hooks.el | 9 ----- config/text-mode/config-text-mode.el | 3 -- config/tramp/config-tramp-connection-properties.el | 2 -- config/tramp/config-tramp-sudo-hang-fix.el | 3 -- config/tramp/config-tramp.el | 10 ------ 37 files changed, 299 deletions(-) delete mode 100644 config/company/config-company.el delete mode 100644 config/conf-mode/config-conf-mode-hooks.el delete mode 100644 config/conf-mode/config-conf-mode.el delete mode 100644 config/dir-locals/eglot-dir-locals.el delete mode 100644 config/dired/config-dired.el delete mode 100644 config/display-buffer/config-display-buffer-best-side.el delete mode 100644 config/display-buffer/config-display-buffer.el delete mode 100644 config/eglot/config-eglot-servers.el delete mode 100644 config/eglot/config-eglot.el delete mode 100644 config/eldoc/config-eldoc.el delete mode 100644 config/electric/config-electric.el delete mode 100644 config/flycheck/config-flycheck-cargo-has-command-p-fix.el delete mode 100644 config/flycheck/config-flycheck.el delete mode 100644 config/flymake/config-flymake-hooks.el delete mode 100644 config/flymake/config-flymake.el delete mode 100644 config/garbage-collection/config-garbage-collection.el delete mode 100644 config/ibuffer/config-ibuffer-filter-groups.el delete mode 100644 config/ibuffer/config-ibuffer-human-readable-size.el delete mode 100644 config/ibuffer/config-ibuffer-never-show.el delete mode 100644 config/ibuffer/config-ibuffer.el delete mode 100644 config/keys/config-keys.el delete mode 100644 config/lsp-mode/config-lsp-mode-disable-install-server.el delete mode 100644 config/lsp-mode/config-lsp-mode.el delete mode 100644 config/man/config-man.el delete mode 100644 config/native-comp/config-native-comp.el delete mode 100644 config/package/config-package.el delete mode 100644 config/prog-mode/config-prog-mode-hooks.el delete mode 100644 config/prog-mode/config-prog-mode.el delete mode 100644 config/project/config-project-find-rust-projects.el delete mode 100644 config/project/config-project.el delete mode 100644 config/recentf/config-recentf.el delete mode 100644 config/savehist/config-savehist.el delete mode 100644 config/text-mode/config-text-mode-hooks.el delete mode 100644 config/text-mode/config-text-mode.el delete mode 100644 config/tramp/config-tramp-connection-properties.el delete mode 100644 config/tramp/config-tramp-sudo-hang-fix.el delete mode 100644 config/tramp/config-tramp.el (limited to 'config') diff --git a/config/company/config-company.el b/config/company/config-company.el deleted file mode 100644 index e98e2a2..0000000 --- a/config/company/config-company.el +++ /dev/null @@ -1,8 +0,0 @@ -(require 'company) - -(setq company-idle-delay 0 - company-clang-executable "/usr/lib/llvm/11/bin/clang" - company-clang-insert-arguments nil - company-minimum-prefix-length 1) - -(provide 'config-company) diff --git a/config/conf-mode/config-conf-mode-hooks.el b/config/conf-mode/config-conf-mode-hooks.el deleted file mode 100644 index c662e45..0000000 --- a/config/conf-mode/config-conf-mode-hooks.el +++ /dev/null @@ -1 +0,0 @@ -(setq conf-mode-hook (copy-tree text-mode-hook)) diff --git a/config/conf-mode/config-conf-mode.el b/config/conf-mode/config-conf-mode.el deleted file mode 100644 index 1e1554b..0000000 --- a/config/conf-mode/config-conf-mode.el +++ /dev/null @@ -1,5 +0,0 @@ -(require 'config-text-mode) - -(load "config-conf-mode-hooks") - -(provide 'config-conf-mode) diff --git a/config/dir-locals/eglot-dir-locals.el b/config/dir-locals/eglot-dir-locals.el deleted file mode 100644 index 9fff9e8..0000000 --- a/config/dir-locals/eglot-dir-locals.el +++ /dev/null @@ -1,6 +0,0 @@ -((rust-mode . ((eval . (eglot-ensure)) - (eglot-workspace-configuration . ((:rust-analyzer . (:checkOnSave - (:command "clippy"))))) - (rust-format-on-save . t) - (rust-format-goto-problem . t) - (rust-rustfmt-switches . ("--edition" "2021"))))) diff --git a/config/dired/config-dired.el b/config/dired/config-dired.el deleted file mode 100644 index d037bfb..0000000 --- a/config/dired/config-dired.el +++ /dev/null @@ -1,4 +0,0 @@ -(setq dired-listing-switches "-alh" - dired-kill-when-opening-new-dired-buffer t) - -(provide 'config-dired) diff --git a/config/display-buffer/config-display-buffer-best-side.el b/config/display-buffer/config-display-buffer-best-side.el deleted file mode 100644 index 9a2ff48..0000000 --- a/config/display-buffer/config-display-buffer-best-side.el +++ /dev/null @@ -1,7 +0,0 @@ -(defun config-display-buffer-frame-wide-p () - (> (frame-pixel-width) (/ (x-display-pixel-width) 2))) - -(defun config-display-buffer-best-side (buffer alist) - (let* ((side (funcall (alist-get 'which-side alist))) - (alist (append (cdr alist) (list (cons 'side side))))) - (display-buffer-in-side-window buffer alist))) diff --git a/config/display-buffer/config-display-buffer.el b/config/display-buffer/config-display-buffer.el deleted file mode 100644 index 022b1df..0000000 --- a/config/display-buffer/config-display-buffer.el +++ /dev/null @@ -1,5 +0,0 @@ -(setq display-buffer-base-action '(display-buffer-same-window display-buffer-reuse-window)) - -(load "config-display-buffer-best-side") - -(provide 'config-display-buffer) diff --git a/config/eglot/config-eglot-servers.el b/config/eglot/config-eglot-servers.el deleted file mode 100644 index 833766d..0000000 --- a/config/eglot/config-eglot-servers.el +++ /dev/null @@ -1,9 +0,0 @@ -(defvar config-eglot-server-clangd '((c-mode c++-mode) . - ("clangd" - "--header-insersion=never"))) - -(defvar config-eglot-server-rust-analyzer '((rust-mode) . - ("rust-analyzer"))) - -(add-to-list 'eglot-server-programs config-eglot-server-clangd) -(add-to-list 'eglot-server-programs config-eglot-server-rust-analyzer) diff --git a/config/eglot/config-eglot.el b/config/eglot/config-eglot.el deleted file mode 100644 index 17b36de..0000000 --- a/config/eglot/config-eglot.el +++ /dev/null @@ -1,7 +0,0 @@ -(require 'eglot) - -(setq eglot-autoshutdown t) - -(load "config-eglot-servers") - -(provide 'config-eglot) diff --git a/config/eldoc/config-eldoc.el b/config/eldoc/config-eldoc.el deleted file mode 100644 index 9513919..0000000 --- a/config/eldoc/config-eldoc.el +++ /dev/null @@ -1,4 +0,0 @@ -(setq eldoc-idle-delay 0 - eldoc-echo-area-use-multiline-p 5) - -(provide 'config-eldoc) diff --git a/config/electric/config-electric.el b/config/electric/config-electric.el deleted file mode 100644 index a401739..0000000 --- a/config/electric/config-electric.el +++ /dev/null @@ -1,7 +0,0 @@ -(require 'electric) -(require 'elec-pair) - -(add-to-list 'electric-pair-pairs '("?(" . "?)")) -(add-to-list 'electric-pair-pairs '("?{" . "?}")) - -(provide 'config-electric) diff --git a/config/flycheck/config-flycheck-cargo-has-command-p-fix.el b/config/flycheck/config-flycheck-cargo-has-command-p-fix.el deleted file mode 100644 index 1135165..0000000 --- a/config/flycheck/config-flycheck-cargo-has-command-p-fix.el +++ /dev/null @@ -1,7 +0,0 @@ -(defun config-flycheck-rust-cargo-has-command-p (command) - (let* ((commands (process-lines "cargo" "--list")) - (trimmed (-map (lambda (row) (-slice row 4 (string-search " " 4))) commands))) - (seq-contains-p (-rest trimmed) command))) - -(advice-add 'flycheck-rust-cargo-has-command-p - :override 'config-flycheck-rust-cargo-has-command-p) diff --git a/config/flycheck/config-flycheck.el b/config/flycheck/config-flycheck.el deleted file mode 100644 index 95c0b49..0000000 --- a/config/flycheck/config-flycheck.el +++ /dev/null @@ -1,15 +0,0 @@ -(require 'flycheck) - -(load "config-flycheck-cargo-has-command-p-fix") - -(add-hook 'flycheck-error-list-mode-hook (lambda () (visual-line-mode 1))) - -(add-to-list 'display-buffer-alist '("\\*Flycheck errors.*" - (config-display-buffer-best-side) - (which-side . (lambda () - (if (config-display-buffer-frame-wide-p) - 'right - 'bottom))))) - - -(provide 'config-flycheck) diff --git a/config/flymake/config-flymake-hooks.el b/config/flymake/config-flymake-hooks.el deleted file mode 100644 index a19bc3c..0000000 --- a/config/flymake/config-flymake-hooks.el +++ /dev/null @@ -1,2 +0,0 @@ -(add-hook 'flymake-diagnostics-buffer-mode-hook (lambda () - (visual-line-mode 1))) diff --git a/config/flymake/config-flymake.el b/config/flymake/config-flymake.el deleted file mode 100644 index c9a3dfe..0000000 --- a/config/flymake/config-flymake.el +++ /dev/null @@ -1,12 +0,0 @@ -(require 'flymake) - -(load "config-flymake-hooks") - -(add-to-list 'display-buffer-alist '("\\*Flymake diagnostics.*" - (config-display-buffer-best-side) - (which-side . (lambda () - (if (config-display-buffer-frame-wide-p) - 'right - 'bottom))))) - -(provide 'config-flymake) diff --git a/config/garbage-collection/config-garbage-collection.el b/config/garbage-collection/config-garbage-collection.el deleted file mode 100644 index 1540baf..0000000 --- a/config/garbage-collection/config-garbage-collection.el +++ /dev/null @@ -1,3 +0,0 @@ -(setq gc-cons-threshold (* (expt 1024 2) 25)) - -(provide 'config-garbage-collection) diff --git a/config/ibuffer/config-ibuffer-filter-groups.el b/config/ibuffer/config-ibuffer-filter-groups.el deleted file mode 100644 index 6f9c8d2..0000000 --- a/config/ibuffer/config-ibuffer-filter-groups.el +++ /dev/null @@ -1,10 +0,0 @@ -(setq ibuffer-saved-filter-groups - '(("default" - ("Misc" (and (name . "^\\*.*$") - (not (mode . Man-mode)))) - ("Dired" (mode . dired-mode)) - ("Man" (mode . Man-mode))))) - -(add-hook 'ibuffer-mode-hook (lambda () (ibuffer-switch-to-saved-filter-groups "default"))) - -(provide 'config-ibuffer-filter-groups) diff --git a/config/ibuffer/config-ibuffer-human-readable-size.el b/config/ibuffer/config-ibuffer-human-readable-size.el deleted file mode 100644 index 5cec3a9..0000000 --- a/config/ibuffer/config-ibuffer-human-readable-size.el +++ /dev/null @@ -1,16 +0,0 @@ -(define-ibuffer-column size-human-readable - (:name "Size" :inline t) - (let ((size (buffer-size))) - (cond - ((> size (expt 1000 4)) - (error "buffer is over 1TB large!")) - ((> size (expt 1000 3)) - (format "%sG" (/ size (expt 1000 3)))) - ((> size (expt 1000 2)) - (format "%sM" (/ size (expt 1000 2)))) - ((> size 1000) - (format "%sK" (/ size 1000))) - (t - (format "%sB" size))))) - -(provide 'config-ibuffer-human-readable-size) diff --git a/config/ibuffer/config-ibuffer-never-show.el b/config/ibuffer/config-ibuffer-never-show.el deleted file mode 100644 index d9c0e2c..0000000 --- a/config/ibuffer/config-ibuffer-never-show.el +++ /dev/null @@ -1,13 +0,0 @@ -(defvar config-ibuffer-never-show '("^\\*Messages\\*$" - "^\\*Help\\*$" - "^\\*Completions\\*$" - "^\\*Backtrace\\*$" - "^\\*Async-native-compile-log\\*$" - "^\\*Native-compile-Log\\*$" - "^\\*Warnings\\*$")) - -(mapc (lambda (p) - (add-to-list 'ibuffer-never-show-predicates p)) - config-ibuffer-never-show) - -(provide 'config-ibuffer-never-show) diff --git a/config/ibuffer/config-ibuffer.el b/config/ibuffer/config-ibuffer.el deleted file mode 100644 index 5907510..0000000 --- a/config/ibuffer/config-ibuffer.el +++ /dev/null @@ -1,22 +0,0 @@ -(require 'ibuffer) -(require 'ibuf-ext) -(require 'config-ibuffer-human-readable-size) -(require 'config-ibuffer-never-show) -(require 'config-ibuffer-filter-groups) - -(setq ibuffer-display-summary nil - ibuffer-expert t) - -(setq ibuffer-formats - '((mark modified read-only locked " " - (name 32 32 :left :elide) - " " - (size-human-readable 5 5 :right) - " " - (mode 16 16 :left :elide) - " " filename-and-process) - (mark " " - (name 16 -1) - " " filename))) - -(provide 'config-ibuffer) diff --git a/config/keys/config-keys.el b/config/keys/config-keys.el deleted file mode 100644 index 286521c..0000000 --- a/config/keys/config-keys.el +++ /dev/null @@ -1,12 +0,0 @@ -(global-unset-key (kbd "")) -(global-unset-key (kbd "")) -(global-unset-key (kbd "")) -(global-unset-key (kbd "")) -(global-unset-key (kbd "")) -(global-unset-key (kbd "")) -(global-unset-key (kbd "")) -(global-unset-key (kbd "")) -(global-set-key (kbd "C-x k") 'kill-buffer) -(global-set-key (kbd "C-x C-b") 'ibuffer) - -(provide 'config-keys) diff --git a/config/lsp-mode/config-lsp-mode-disable-install-server.el b/config/lsp-mode/config-lsp-mode-disable-install-server.el deleted file mode 100644 index 7a3c415..0000000 --- a/config/lsp-mode/config-lsp-mode-disable-install-server.el +++ /dev/null @@ -1,40 +0,0 @@ -(setq lsp-server-install-dir "/somewhere/that/doesnt/exist") - -(defun config-lsp-mode-disable-install-server-error () - (error "lsp-mode server install features have been disabled")) - -(advice-add 'lsp-install-server - :around - 'config-lsp-mode-disable-install-server-error) - -(advice-add 'lsp-update-server - :around - 'config-lsp-mode-disable-install-server-error) - -(advice-add 'lsp-update-servers - :around - 'config-lsp-mode-disable-install-server-error) - -(advice-add 'lsp-download-install - :around - 'config-lsp-mode-disable-install-server-error) - -(advice-add 'lsp-download-path - :around - 'config-lsp-mode-disable-install-server-error) - -(advice-add 'lsp-async-start-process - :around - 'config-lsp-mode-disable-install-server-error) - -(advice-add 'lsp--download-status - :around - 'config-lsp-mode-disable-install-server-error) - -(advice-add 'lsp--install-server-internal - :around - 'config-lsp-mode-disable-install-server-error) - -(advice-add 'lsp--npm-dependency-install - :around - 'config-lsp-mode-disable-install-server-error) diff --git a/config/lsp-mode/config-lsp-mode.el b/config/lsp-mode/config-lsp-mode.el deleted file mode 100644 index a42498e..0000000 --- a/config/lsp-mode/config-lsp-mode.el +++ /dev/null @@ -1,19 +0,0 @@ -(require 'lsp-mode) -(require 'flycheck) - -(setq lsp-enable-dap-auto-configure nil - lsp-enable-folding nil - lsp-enable-indentation t - lsp-enable-on-type-formatting nil - lsp-completion-enable nil - lsp-enable-snippet nil - lsp-modeline-code-actions-enable nil - lsp-lens-enable nil - lsp-signature-auto-activate nil - lsp-eldoc-render-all t - lsp-rls-server-command nil - lsp-enable-suggest-server-download nil) - -(load "config-lsp-mode-disable-install-server") - -(provide 'config-lsp-mode) diff --git a/config/man/config-man.el b/config/man/config-man.el deleted file mode 100644 index b4c5060..0000000 --- a/config/man/config-man.el +++ /dev/null @@ -1,3 +0,0 @@ -(setq Man-notify-method 'pushy) - -(provide 'config-man) diff --git a/config/native-comp/config-native-comp.el b/config/native-comp/config-native-comp.el deleted file mode 100644 index c44a984..0000000 --- a/config/native-comp/config-native-comp.el +++ /dev/null @@ -1,3 +0,0 @@ -(setq native-comp-async-jobs-number (string-to-number (shell-command-to-string "nproc"))) - -(provide 'config-native-comp) diff --git a/config/package/config-package.el b/config/package/config-package.el deleted file mode 100644 index d3be495..0000000 --- a/config/package/config-package.el +++ /dev/null @@ -1,4 +0,0 @@ -(setq package-archives nil - package-check-signature 'all) - -(provide 'config-package) diff --git a/config/prog-mode/config-prog-mode-hooks.el b/config/prog-mode/config-prog-mode-hooks.el deleted file mode 100644 index a3c63e0..0000000 --- a/config/prog-mode/config-prog-mode-hooks.el +++ /dev/null @@ -1 +0,0 @@ -(setq prog-mode-hook (copy-tree text-mode-hook)) diff --git a/config/prog-mode/config-prog-mode.el b/config/prog-mode/config-prog-mode.el deleted file mode 100644 index 5caf9f2..0000000 --- a/config/prog-mode/config-prog-mode.el +++ /dev/null @@ -1,5 +0,0 @@ -(require 'config-text-mode) - -(load "config-prog-mode-hooks") - -(provide 'config-prog-mode) diff --git a/config/project/config-project-find-rust-projects.el b/config/project/config-project-find-rust-projects.el deleted file mode 100644 index 65359bd..0000000 --- a/config/project/config-project-find-rust-projects.el +++ /dev/null @@ -1,4 +0,0 @@ -(add-to-list 'project-find-functions (lambda (directory) - (let ((rust-project (locate-dominating-file directory "Cargo.toml"))) - (when rust-project - (cons 'transient rust-project))))) diff --git a/config/project/config-project.el b/config/project/config-project.el deleted file mode 100644 index c4c61ea..0000000 --- a/config/project/config-project.el +++ /dev/null @@ -1,3 +0,0 @@ -(load "config-project-find-rust-projects") - -(provide 'config-project) diff --git a/config/recentf/config-recentf.el b/config/recentf/config-recentf.el deleted file mode 100644 index 3b7466a..0000000 --- a/config/recentf/config-recentf.el +++ /dev/null @@ -1,4 +0,0 @@ -(setq recentf-max-menu-items 25 - recentf-max-saved-items 25) - -(provide 'config-recentf) diff --git a/config/savehist/config-savehist.el b/config/savehist/config-savehist.el deleted file mode 100644 index 7a1cc40..0000000 --- a/config/savehist/config-savehist.el +++ /dev/null @@ -1,11 +0,0 @@ -(require 'savehist) - -(setq savehist-file (expand-file-name "savehist" user-emacs-directory) - savehist-save-minibuffer-history t) - -(add-to-list 'savehist-additional-variables 'command-history) - -(unless (file-exists-p savehist-file) - (make-empty-file savehist-file)) - -(provide 'config-savehist) diff --git a/config/text-mode/config-text-mode-hooks.el b/config/text-mode/config-text-mode-hooks.el deleted file mode 100644 index f740e0c..0000000 --- a/config/text-mode/config-text-mode-hooks.el +++ /dev/null @@ -1,9 +0,0 @@ -(add-hook 'text-mode-hook (lambda () - (display-line-numbers-mode 1) - (visual-line-mode 1) - (display-fill-column-indicator-mode 1) - (electric-pair-mode 1) - (electric-indent-mode 1) - (setq-local display-fill-column-indicator-column 120) - (when (require 'highlight-indentation nil t) - (highlight-indentation-mode 1)))) diff --git a/config/text-mode/config-text-mode.el b/config/text-mode/config-text-mode.el deleted file mode 100644 index f2a832e..0000000 --- a/config/text-mode/config-text-mode.el +++ /dev/null @@ -1,3 +0,0 @@ -(load "config-text-mode-hooks") - -(provide 'config-text-mode) diff --git a/config/tramp/config-tramp-connection-properties.el b/config/tramp/config-tramp-connection-properties.el deleted file mode 100644 index 88f2dfd..0000000 --- a/config/tramp/config-tramp-connection-properties.el +++ /dev/null @@ -1,2 +0,0 @@ -(add-to-list 'tramp-connection-properties (list (regexp-quote (format "/sudo:root@%s:" system-name)) - "session-timeout" (* 60 20))) diff --git a/config/tramp/config-tramp-sudo-hang-fix.el b/config/tramp/config-tramp-sudo-hang-fix.el deleted file mode 100644 index 3882f28..0000000 --- a/config/tramp/config-tramp-sudo-hang-fix.el +++ /dev/null @@ -1,3 +0,0 @@ -(defun sudo-edit () - (interactive) - (find-file (format "/sudo:root@%s:%s" system-name (read-file-name "Edit as root: ")))) diff --git a/config/tramp/config-tramp.el b/config/tramp/config-tramp.el deleted file mode 100644 index e50ff1d..0000000 --- a/config/tramp/config-tramp.el +++ /dev/null @@ -1,10 +0,0 @@ -(require 'tramp) - -(setq password-cache nil - password-cache-expiry 0 - tramp-persistency-file-name nil) - -(load "config-tramp-connection-properties") -(load "config-tramp-sudo-hang-fix") - -(provide 'config-tramp) -- cgit v1.2.3