changed the config-* prefix to init-* for all of the init files

diff --git a/.gitignore b/.gitignore
index e10b82f834998dd816702edcb1158f74a886e350..5a5c333aa92d63712f35fc54e382726c249c334f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,5 @@
 !/load-lisp.el
 !/custom.el
 !/themes
-!/config
+!/init
 !/lisp
\ No newline at end of file

diff --git a/config/company/config-company.el b/config/company/config-company.el
deleted file mode 100644 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
index 286521c..0000000
--- a/config/keys/config-keys.el
+++ /dev/null
@@ -1,12 +0,0 @@
-(global-unset-key (kbd "<left>"))
-(global-unset-key (kbd "<right>"))
-(global-unset-key (kbd "<up>"))
-(global-unset-key (kbd "<down>"))
-(global-unset-key (kbd "<C-left>"))
-(global-unset-key (kbd "<C-right>"))
-(global-unset-key (kbd "<C-up>"))
-(global-unset-key (kbd "<C-down>"))
-(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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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)

diff --git a/init.el b/init.el
index 0f42efb0192c446af2ffe93fb65c00779230b4d8..013392c2193a15f0abf8d4ebedfe8143a719858e 100644 (file)
--- a/init.el
+++ b/init.el
@@ -35,3 +35,65 @@
 (scroll-bar-mode 0)
 (tool-bar-mode 0)
 (tooltip-mode 0)
+
+(let ((config-directory (file-name-concat user-emacs-directory "init")))
+  (add-to-list 'load-path (file-name-concat config-directory "company"))
+  (add-to-list 'load-path (file-name-concat config-directory "conf-mode"))
+  (add-to-list 'load-path (file-name-concat config-directory "dired"))
+  (add-to-list 'load-path (file-name-concat config-directory "display-buffer"))
+  (add-to-list 'load-path (file-name-concat config-directory "eglot"))
+  (add-to-list 'load-path (file-name-concat config-directory "eldoc"))
+  (add-to-list 'load-path (file-name-concat config-directory "electric"))
+  (add-to-list 'load-path (file-name-concat config-directory "flycheck"))
+  (add-to-list 'load-path (file-name-concat config-directory "flymake"))
+  (add-to-list 'load-path (file-name-concat config-directory "garbage-collection"))
+  (add-to-list 'load-path (file-name-concat config-directory "ibuffer"))
+  (add-to-list 'load-path (file-name-concat config-directory "keys"))
+  (add-to-list 'load-path (file-name-concat config-directory "man"))
+  (add-to-list 'load-path (file-name-concat config-directory "lsp-mode"))
+  (add-to-list 'load-path (file-name-concat config-directory "native-comp"))
+  (add-to-list 'load-path (file-name-concat config-directory "package"))
+  (add-to-list 'load-path (file-name-concat config-directory "prog-mode"))
+  (add-to-list 'load-path (file-name-concat config-directory "project"))
+  (add-to-list 'load-path (file-name-concat config-directory "recentf"))
+  (add-to-list 'load-path (file-name-concat config-directory "savehist"))
+  (add-to-list 'load-path (file-name-concat config-directory "text-mode"))
+  (add-to-list 'load-path (file-name-concat config-directory "tramp")))
+
+(require 'init-text-mode)
+(require 'init-conf-mode)
+(require 'init-prog-mode)
+(require 'init-dired)
+(require 'init-display-buffer)
+(require 'init-eldoc)
+(require 'init-electric)
+(require 'init-flymake)
+(require 'init-garbage-collection)
+(require 'init-ibuffer)
+(require 'init-keys)
+(require 'init-man)
+(require 'init-package)
+(require 'init-project)
+(require 'init-recentf)
+(require 'init-savehist)
+(require 'init-tramp)
+
+(when (locate-library "company")
+  (require 'init-company))
+
+(when (locate-library "eglot")
+  (require 'init-eglot))
+
+(when (locate-library "flycheck")
+  (require 'init-flycheck))
+
+(when (locate-library "lsp-mode")
+  (require 'init-lsp-mode))
+
+(when (and (> emacs-major-version 28) (native-comp-available-p))
+  (require 'init-native-comp))
+
+(let ((local-lisp-directory (file-name-concat user-emacs-directory "lisp")))
+  (add-to-list 'load-path (file-name-concat local-lisp-directory "man-wrapper")))
+
+(require 'man-wrapper)

diff --git a/init/company/init-company.el b/init/company/init-company.el
new file mode 100644 (file)
index 0000000..633efe7
--- /dev/null
+++ b/init/company/init-company.el
@@ -0,0 +1,8 @@
+(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 'init-company)

diff --git a/init/conf-mode/init-conf-mode-hooks.el b/init/conf-mode/init-conf-mode-hooks.el
new file mode 100644 (file)
index 0000000..c662e45
--- /dev/null
+++ b/init/conf-mode/init-conf-mode-hooks.el
@@ -0,0 +1 @@
+(setq conf-mode-hook (copy-tree text-mode-hook))

diff --git a/init/conf-mode/init-conf-mode.el b/init/conf-mode/init-conf-mode.el
new file mode 100644 (file)
index 0000000..4a77537
--- /dev/null
+++ b/init/conf-mode/init-conf-mode.el
@@ -0,0 +1,5 @@
+(require 'init-text-mode)
+
+(load "init-conf-mode-hooks")
+
+(provide 'init-conf-mode)

diff --git a/init/dir-locals/eglot-dir-locals.el b/init/dir-locals/eglot-dir-locals.el
new file mode 100644 (file)
index 0000000..9fff9e8
--- /dev/null
+++ b/init/dir-locals/eglot-dir-locals.el
@@ -0,0 +1,6 @@
+((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/init/dired/init-dired.el b/init/dired/init-dired.el
new file mode 100644 (file)
index 0000000..1d47ccf
--- /dev/null
+++ b/init/dired/init-dired.el
@@ -0,0 +1,4 @@
+(setq dired-listing-switches "-alh"
+      dired-kill-when-opening-new-dired-buffer t)
+
+(provide 'init-dired)

diff --git a/init/display-buffer/init-display-buffer-best-side.el b/init/display-buffer/init-display-buffer-best-side.el
new file mode 100644 (file)
index 0000000..e0f588a
--- /dev/null
+++ b/init/display-buffer/init-display-buffer-best-side.el
@@ -0,0 +1,7 @@
+(defun init-display-buffer-frame-wide-p ()
+  (> (frame-pixel-width) (/ (x-display-pixel-width) 2)))
+
+(defun init-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/init/display-buffer/init-display-buffer.el b/init/display-buffer/init-display-buffer.el
new file mode 100644 (file)
index 0000000..f1c4290
--- /dev/null
+++ b/init/display-buffer/init-display-buffer.el
@@ -0,0 +1,5 @@
+(setq display-buffer-base-action '(display-buffer-same-window display-buffer-reuse-window))
+
+(load "init-display-buffer-best-side")
+
+(provide 'init-display-buffer)

diff --git a/init/eglot/init-eglot-servers.el b/init/eglot/init-eglot-servers.el
new file mode 100644 (file)
index 0000000..2dce402
--- /dev/null
+++ b/init/eglot/init-eglot-servers.el
@@ -0,0 +1,9 @@
+(defvar init-eglot-server-clangd '((c-mode c++-mode) .
+                                     ("clangd"
+                                      "--header-insersion=never")))
+
+(defvar init-eglot-server-rust-analyzer '((rust-mode) .
+                                            ("rust-analyzer")))
+  
+(add-to-list 'eglot-server-programs init-eglot-server-clangd)
+(add-to-list 'eglot-server-programs init-eglot-server-rust-analyzer)

diff --git a/init/eglot/init-eglot.el b/init/eglot/init-eglot.el
new file mode 100644 (file)
index 0000000..dd85cca
--- /dev/null
+++ b/init/eglot/init-eglot.el
@@ -0,0 +1,7 @@
+(require 'eglot)
+
+(setq eglot-autoshutdown t)
+
+(load "init-eglot-servers")
+
+(provide 'init-eglot)

diff --git a/init/eldoc/init-eldoc.el b/init/eldoc/init-eldoc.el
new file mode 100644 (file)
index 0000000..c4568e0
--- /dev/null
+++ b/init/eldoc/init-eldoc.el
@@ -0,0 +1,4 @@
+(setq eldoc-idle-delay 0
+      eldoc-echo-area-use-multiline-p 5)
+
+(provide 'init-eldoc)

diff --git a/init/electric/init-electric.el b/init/electric/init-electric.el
new file mode 100644 (file)
index 0000000..7d668b6
--- /dev/null
+++ b/init/electric/init-electric.el
@@ -0,0 +1,7 @@
+(require 'electric)
+(require 'elec-pair)
+
+(add-to-list 'electric-pair-pairs '("?(" . "?)"))
+(add-to-list 'electric-pair-pairs '("?{" . "?}"))
+
+(provide 'init-electric)

diff --git a/init/flycheck/init-flycheck-cargo-has-command-p-fix.el b/init/flycheck/init-flycheck-cargo-has-command-p-fix.el
new file mode 100644 (file)
index 0000000..48d53d6
--- /dev/null
+++ b/init/flycheck/init-flycheck-cargo-has-command-p-fix.el
@@ -0,0 +1,7 @@
+(defun init-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 'init-flycheck-rust-cargo-has-command-p)

diff --git a/init/flycheck/init-flycheck.el b/init/flycheck/init-flycheck.el
new file mode 100644 (file)
index 0000000..ee59ef8
--- /dev/null
+++ b/init/flycheck/init-flycheck.el
@@ -0,0 +1,15 @@
+(require 'flycheck)
+
+(load "init-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.*"
+                                     (init-display-buffer-best-side)
+                                     (which-side . (lambda ()
+                                                     (if (init-display-buffer-frame-wide-p)
+                                                         'right
+                                                       'bottom)))))
+
+
+(provide 'init-flycheck)

diff --git a/init/flymake/init-flymake-hooks.el b/init/flymake/init-flymake-hooks.el
new file mode 100644 (file)
index 0000000..a19bc3c
--- /dev/null
+++ b/init/flymake/init-flymake-hooks.el
@@ -0,0 +1,2 @@
+(add-hook 'flymake-diagnostics-buffer-mode-hook (lambda ()
+                                                  (visual-line-mode 1)))

diff --git a/init/flymake/init-flymake.el b/init/flymake/init-flymake.el
new file mode 100644 (file)
index 0000000..0fbd45a
--- /dev/null
+++ b/init/flymake/init-flymake.el
@@ -0,0 +1,12 @@
+(require 'flymake)
+
+(load "init-flymake-hooks")
+
+(add-to-list 'display-buffer-alist '("\\*Flymake diagnostics.*"
+                                     (init-display-buffer-best-side)
+                                     (which-side . (lambda ()
+                                                     (if (init-display-buffer-frame-wide-p)
+                                                         'right
+                                                       'bottom)))))
+
+(provide 'init-flymake)

diff --git a/init/garbage-collection/init-garbage-collection.el b/init/garbage-collection/init-garbage-collection.el
new file mode 100644 (file)
index 0000000..96b2252
--- /dev/null
+++ b/init/garbage-collection/init-garbage-collection.el
@@ -0,0 +1,3 @@
+(setq gc-cons-threshold (* (expt 1024 2) 25))
+
+(provide 'init-garbage-collection)

diff --git a/init/ibuffer/init-ibuffer-filter-groups.el b/init/ibuffer/init-ibuffer-filter-groups.el
new file mode 100644 (file)
index 0000000..fbdd8ff
--- /dev/null
+++ b/init/ibuffer/init-ibuffer-filter-groups.el
@@ -0,0 +1,10 @@
+(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 'init-ibuffer-filter-groups)

diff --git a/init/ibuffer/init-ibuffer-human-readable-size.el b/init/ibuffer/init-ibuffer-human-readable-size.el
new file mode 100644 (file)
index 0000000..6d62521
--- /dev/null
+++ b/init/ibuffer/init-ibuffer-human-readable-size.el
@@ -0,0 +1,16 @@
+(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 'init-ibuffer-human-readable-size)

diff --git a/init/ibuffer/init-ibuffer-never-show.el b/init/ibuffer/init-ibuffer-never-show.el
new file mode 100644 (file)
index 0000000..0cf8db2
--- /dev/null
+++ b/init/ibuffer/init-ibuffer-never-show.el
@@ -0,0 +1,13 @@
+(defvar init-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))
+      init-ibuffer-never-show)
+
+(provide 'init-ibuffer-never-show)

diff --git a/init/ibuffer/init-ibuffer.el b/init/ibuffer/init-ibuffer.el
new file mode 100644 (file)
index 0000000..209328c
--- /dev/null
+++ b/init/ibuffer/init-ibuffer.el
@@ -0,0 +1,22 @@
+(require 'ibuffer)
+(require 'ibuf-ext)
+(require 'init-ibuffer-human-readable-size)
+(require 'init-ibuffer-never-show)
+(require 'init-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 'init-ibuffer)

diff --git a/init/keys/init-keys.el b/init/keys/init-keys.el
new file mode 100644 (file)
index 0000000..4bbaa5e
--- /dev/null
+++ b/init/keys/init-keys.el
@@ -0,0 +1,12 @@
+(global-unset-key (kbd "<left>"))
+(global-unset-key (kbd "<right>"))
+(global-unset-key (kbd "<up>"))
+(global-unset-key (kbd "<down>"))
+(global-unset-key (kbd "<C-left>"))
+(global-unset-key (kbd "<C-right>"))
+(global-unset-key (kbd "<C-up>"))
+(global-unset-key (kbd "<C-down>"))
+(global-set-key   (kbd "C-x k")     'kill-buffer)
+(global-set-key   (kbd "C-x C-b")   'ibuffer)
+
+(provide 'init-keys)

diff --git a/init/lsp-mode/init-lsp-mode-disable-install-server.el b/init/lsp-mode/init-lsp-mode-disable-install-server.el
new file mode 100644 (file)
index 0000000..ed5e73a
--- /dev/null
+++ b/init/lsp-mode/init-lsp-mode-disable-install-server.el
@@ -0,0 +1,40 @@
+(setq lsp-server-install-dir "/somewhere/that/doesnt/exist")
+
+(defun init-lsp-mode-disable-install-server-error ()
+  (error "lsp-mode server install features have been disabled"))
+
+(advice-add 'lsp-install-server
+            :around
+            'init-lsp-mode-disable-install-server-error)
+
+(advice-add 'lsp-update-server
+            :around
+            'init-lsp-mode-disable-install-server-error)
+
+(advice-add 'lsp-update-servers
+            :around
+            'init-lsp-mode-disable-install-server-error)
+
+(advice-add 'lsp-download-install
+            :around
+            'init-lsp-mode-disable-install-server-error)
+
+(advice-add 'lsp-download-path
+            :around
+            'init-lsp-mode-disable-install-server-error)
+
+(advice-add 'lsp-async-start-process
+            :around
+            'init-lsp-mode-disable-install-server-error)
+
+(advice-add 'lsp--download-status
+            :around
+            'init-lsp-mode-disable-install-server-error)
+
+(advice-add 'lsp--install-server-internal
+            :around
+            'init-lsp-mode-disable-install-server-error)
+
+(advice-add 'lsp--npm-dependency-install
+            :around
+            'init-lsp-mode-disable-install-server-error)

diff --git a/init/lsp-mode/init-lsp-mode.el b/init/lsp-mode/init-lsp-mode.el
new file mode 100644 (file)
index 0000000..f77e503
--- /dev/null
+++ b/init/lsp-mode/init-lsp-mode.el
@@ -0,0 +1,19 @@
+(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 "init-lsp-mode-disable-install-server")
+
+(provide 'init-lsp-mode)

diff --git a/init/man/init-man.el b/init/man/init-man.el
new file mode 100644 (file)
index 0000000..521f491
--- /dev/null
+++ b/init/man/init-man.el
@@ -0,0 +1,3 @@
+(setq Man-notify-method 'pushy)
+
+(provide 'init-man)

diff --git a/init/native-comp/init-native-comp.el b/init/native-comp/init-native-comp.el
new file mode 100644 (file)
index 0000000..9ae0489
--- /dev/null
+++ b/init/native-comp/init-native-comp.el
@@ -0,0 +1,3 @@
+(setq native-comp-async-jobs-number (string-to-number (shell-command-to-string "nproc")))
+
+(provide 'init-native-comp)

diff --git a/init/package/init-package.el b/init/package/init-package.el
new file mode 100644 (file)
index 0000000..3e2129d
--- /dev/null
+++ b/init/package/init-package.el
@@ -0,0 +1,4 @@
+(setq package-archives nil
+      package-check-signature 'all)
+
+(provide 'init-package)

diff --git a/init/prog-mode/init-prog-mode-hooks.el b/init/prog-mode/init-prog-mode-hooks.el
new file mode 100644 (file)
index 0000000..a3c63e0
--- /dev/null
+++ b/init/prog-mode/init-prog-mode-hooks.el
@@ -0,0 +1 @@
+(setq prog-mode-hook (copy-tree text-mode-hook))

diff --git a/init/prog-mode/init-prog-mode.el b/init/prog-mode/init-prog-mode.el
new file mode 100644 (file)
index 0000000..eec9811
--- /dev/null
+++ b/init/prog-mode/init-prog-mode.el
@@ -0,0 +1,5 @@
+(require 'init-text-mode)
+
+(load "init-prog-mode-hooks")
+
+(provide 'init-prog-mode)

diff --git a/init/project/init-project-find-rust-projects.el b/init/project/init-project-find-rust-projects.el
new file mode 100644 (file)
index 0000000..65359bd
--- /dev/null
+++ b/init/project/init-project-find-rust-projects.el
@@ -0,0 +1,4 @@
+(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/init/project/init-project.el b/init/project/init-project.el
new file mode 100644 (file)
index 0000000..2e83d81
--- /dev/null
+++ b/init/project/init-project.el
@@ -0,0 +1,3 @@
+(load "init-project-find-rust-projects")
+
+(provide 'init-project)

diff --git a/init/recentf/init-recentf.el b/init/recentf/init-recentf.el
new file mode 100644 (file)
index 0000000..293db0d
--- /dev/null
+++ b/init/recentf/init-recentf.el
@@ -0,0 +1,4 @@
+(setq recentf-max-menu-items 25
+      recentf-max-saved-items 25)
+
+(provide 'init-recentf)

diff --git a/init/savehist/init-savehist.el b/init/savehist/init-savehist.el
new file mode 100644 (file)
index 0000000..7e6e311
--- /dev/null
+++ b/init/savehist/init-savehist.el
@@ -0,0 +1,11 @@
+(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 'init-savehist)

diff --git a/init/text-mode/init-text-mode-hooks.el b/init/text-mode/init-text-mode-hooks.el
new file mode 100644 (file)
index 0000000..f740e0c
--- /dev/null
+++ b/init/text-mode/init-text-mode-hooks.el
@@ -0,0 +1,9 @@
+(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/init/text-mode/init-text-mode.el b/init/text-mode/init-text-mode.el
new file mode 100644 (file)
index 0000000..4318c95
--- /dev/null
+++ b/init/text-mode/init-text-mode.el
@@ -0,0 +1,3 @@
+(load "init-text-mode-hooks")
+
+(provide 'init-text-mode)

diff --git a/init/tramp/init-tramp-connection-properties.el b/init/tramp/init-tramp-connection-properties.el
new file mode 100644 (file)
index 0000000..88f2dfd
--- /dev/null
+++ b/init/tramp/init-tramp-connection-properties.el
@@ -0,0 +1,2 @@
+(add-to-list 'tramp-connection-properties (list (regexp-quote (format "/sudo:root@%s:" system-name))
+                                                "session-timeout" (* 60 20)))

diff --git a/init/tramp/init-tramp-sudo-hang-fix.el b/init/tramp/init-tramp-sudo-hang-fix.el
new file mode 100644 (file)
index 0000000..3882f28
--- /dev/null
+++ b/init/tramp/init-tramp-sudo-hang-fix.el
@@ -0,0 +1,3 @@
+(defun sudo-edit ()
+  (interactive)
+  (find-file (format "/sudo:root@%s:%s" system-name (read-file-name "Edit as root: "))))

diff --git a/init/tramp/init-tramp.el b/init/tramp/init-tramp.el
new file mode 100644 (file)
index 0000000..aad0582
--- /dev/null
+++ b/init/tramp/init-tramp.el
@@ -0,0 +1,10 @@
+(require 'tramp)
+
+(setq password-cache nil
+      password-cache-expiry 0
+      tramp-persistency-file-name nil)
+
+(load "init-tramp-connection-properties")
+(load "init-tramp-sudo-hang-fix")
+
+(provide 'init-tramp)

diff --git a/load-config.el b/load-config.el
index 231787d07b10f1b51957b4f16f46b4f11cadb2b9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/load-config.el
+++ b/load-config.el
@@ -1,56 +0,0 @@
-(let ((config-directory (file-name-concat user-emacs-directory "config")))
-  (add-to-list 'load-path (file-name-concat config-directory "company"))
-  (add-to-list 'load-path (file-name-concat config-directory "conf-mode"))
-  (add-to-list 'load-path (file-name-concat config-directory "dired"))
-  (add-to-list 'load-path (file-name-concat config-directory "display-buffer"))
-  (add-to-list 'load-path (file-name-concat config-directory "eglot"))
-  (add-to-list 'load-path (file-name-concat config-directory "eldoc"))
-  (add-to-list 'load-path (file-name-concat config-directory "electric"))
-  (add-to-list 'load-path (file-name-concat config-directory "flycheck"))
-  (add-to-list 'load-path (file-name-concat config-directory "flymake"))
-  (add-to-list 'load-path (file-name-concat config-directory "garbage-collection"))
-  (add-to-list 'load-path (file-name-concat config-directory "ibuffer"))
-  (add-to-list 'load-path (file-name-concat config-directory "keys"))
-  (add-to-list 'load-path (file-name-concat config-directory "man"))
-  (add-to-list 'load-path (file-name-concat config-directory "lsp-mode"))
-  (add-to-list 'load-path (file-name-concat config-directory "native-comp"))
-  (add-to-list 'load-path (file-name-concat config-directory "package"))
-  (add-to-list 'load-path (file-name-concat config-directory "prog-mode"))
-  (add-to-list 'load-path (file-name-concat config-directory "project"))
-  (add-to-list 'load-path (file-name-concat config-directory "recentf"))
-  (add-to-list 'load-path (file-name-concat config-directory "savehist"))
-  (add-to-list 'load-path (file-name-concat config-directory "text-mode"))
-  (add-to-list 'load-path (file-name-concat config-directory "tramp")))
-
-(require 'config-text-mode)
-(require 'config-conf-mode)
-(require 'config-prog-mode)
-(require 'config-dired)
-(require 'config-display-buffer)
-(require 'config-eldoc)
-(require 'config-electric)
-(require 'config-flymake)
-(require 'config-garbage-collection)
-(require 'config-ibuffer)
-(require 'config-keys)
-(require 'config-man)
-(require 'config-package)
-(require 'config-project)
-(require 'config-recentf)
-(require 'config-savehist)
-(require 'config-tramp)
-
-(when (locate-library "company")
-  (require 'config-company))
-
-(when (locate-library "eglot")
-  (require 'config-eglot))
-
-(when (locate-library "flycheck")
-  (require 'config-flycheck))
-
-(when (locate-library "lsp-mode")
-  (require 'config-lsp-mode))
-
-(when (and (> emacs-major-version 28) (native-comp-available-p))
-  (require 'config-native-comp))

diff --git a/load-lisp.el b/load-lisp.el
index bfad1ad17264ef5cc66ed65c73cbbc44eb377dfd..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/load-lisp.el
+++ b/load-lisp.el
@@ -1,4 +0,0 @@
-(let ((local-lisp-directory (file-name-concat user-emacs-directory "lisp")))
-  (add-to-list 'load-path (file-name-concat local-lisp-directory "man-wrapper")))
-
-(require 'man-wrapper)