.emacs.d/custom.el

@@ -31,7 +31,7 @@
  '(flycheck-python-flake8-executable "python3")
  '(font-lock-global-modes t)
  '(font-lock-maximum-size nil)
- '(font-lock-support-mode 'jit-lock-mode t)
+ '(font-lock-support-mode 'jit-lock-mode)
  '(global-auto-revert-mode t)
  '(global-font-lock-mode t nil (font-lock))
  '(ido-enable-flex-matching t)
@@ -58,7 +58,7 @@
  '(org-odd-levels-only t)
  '(org-todo-keywords '((sequence "TODO" "|" "DONE" "ABANDONED" "DEFERRED")))
  '(package-selected-packages
-   '(omnisharp vterm lsp-pyright blacken nyan-mode earthfile-mode compat adaptive-wrap terraform-mode deadgrep protobuf-mode bazel howm python-mode color-theme-sanityinc-solarized monokai-theme rust-mode tide typescript-mode modus-themes tree-sitter flycheck-rust eglot ink-mode prettier-js zig-mode esup gnu-elpa-keyring-update lsp-hack hack-mode filladapt lsp-ui yaml-mode wgrep fsharp-mode company-lsp cquery mustache-mode clang-format projectile dash-functional mocha add-node-modules-path rjsx-mode xref-js2 js2-refactor company omnisharp geiser cider clojure-mode graphviz-dot-mode multi-term xterm-color thrift markdown-mode tuareg merlin ag use-package flycheck dockerfile-mode js2-mode web-mode tss switch-window paredit magit lua-mode go-mode go-autocomplete exec-path-from-shell csharp-mode color-theme-monokai auto-complete auto-complete-nxml flymake flyspell json-mode popup ruby-mode company-jedi elm-mode monky color-theme-sanityinc-tomorrow))
+   '(lsp-pyright blacken nyan-mode earthfile-mode compat adaptive-wrap terraform-mode deadgrep protobuf-mode bazel howm python-mode color-theme-sanityinc-solarized monokai-theme rust-mode tide typescript-mode modus-themes tree-sitter flycheck-rust eglot ink-mode prettier-js zig-mode esup gnu-elpa-keyring-update lsp-hack hack-mode filladapt lsp-ui yaml-mode wgrep fsharp-mode company-lsp cquery mustache-mode clang-format projectile dash-functional mocha add-node-modules-path rjsx-mode xref-js2 js2-refactor company omnisharp geiser cider clojure-mode graphviz-dot-mode multi-term xterm-color thrift markdown-mode tuareg merlin ag use-package flycheck dockerfile-mode js2-mode web-mode tss switch-window paredit magit lua-mode go-mode go-autocomplete exec-path-from-shell csharp-mode color-theme-monokai auto-complete auto-complete-nxml flymake flyspell json-mode popup ruby-mode company-jedi elm-mode monky color-theme-sanityinc-tomorrow))
  '(reb-re-syntax 'string)
  '(rmail-mail-new-frame t)
  '(safe-local-variable-values
@@ -90,7 +90,7 @@
  '(truncate-lines t)
  '(typescript-indent-level 2)
  '(use-dialog-box nil)
- '(warning-suppress-types '((emacs) ((unlock-file))))
+ '(warning-suppress-types '(((unlock-file))))
  '(web-mode-code-indent-offset 2)
  '(web-mode-css-indent-offset 2)
  '(which-func-mode-global t nil (which-func))

.emacs.d/init.el

@@ -319,15 +319,11 @@
 (add-hook 'text-mode-hook 'my-text-mode-hook)
 
 ;; =================================================================
-;; Company? Company.
+;; Company?
 ;; =================================================================
 (use-package company :ensure t
   :commands company-mode
-  :config
+  :hook (typescript-mode . company-mode))
-  ;; 2023-08-26: Enable comapny mode globally.
-  (setq company-idle-delay 0.3)
-  (global-company-mode t)
-  )
 
 ;; =================================================================
 ;; Common configuration for LSP-based systems.
@@ -338,19 +334,17 @@
       (executable-find "clangd"))
   "Path to the clangd binary.")
 
-;; 2023-08-23 Disabling all this nonsense for now; I'm using pyright at
+(defvar my-pylsp-executable
-;;            work and don't feel like maintaining this stuff.
+  (executable-find "pylsp")
-;; (defvar my-pylsp-executable
+  "The path to the python-lsp-server binary.")
-;;   (executable-find "pylsp")
+
-;;   "The path to the python-lsp-server binary.")
+(defvar my-pyls-executable
-;;
+  (executable-find "pyls")
-;; (defvar my-pyls-executable
+  "The path to the python-language-server binary.")
-;;   (executable-find "pyls")
+
-;;   "The path to the python-language-server binary.")
+(defvar my-pyls-language-server-executable
-;;
+  (executable-find "pyls-langauge-server")
-;; (defvar my-pyls-language-server-executable
+  "The path to the pyls-language-server binary (used at FB).")
-;;   (executable-find "pyls-langauge-server")
-;;   "The path to the pyls-language-server binary (used at FB).")
 
 (defun my-disable-flycheck-on-eglot ()
   "Disable flycheck in eglot-managed buffers."
@@ -365,30 +359,26 @@
 (use-package eglot :ensure
   :commands (eglot-ensure eglot)
   :hook
-  (python-mode . eglot-ensure)
+  ;; 2023-06-26 Using LSP mode for python these days.
+  ;; (python-mode . eglot-ensure)
   (rust-mode   . eglot-ensure)
   (c++-mode    . eglot-ensure)
   (c-mode      . eglot-ensure)
   (go-mode     . eglot-ensure) ;; 2022-07-29 Add eglot for go
   (before-save . eglot-format) ;; 2023-05-25 Format buffers on save
   :bind
-  ("C-c r"  . eglot-rename)       ;; 2022-08-23 Make rename more accessible
   ("C-c \\" . eglot-code-actions) ;; 2022-07-29 I want to make code actions easier.
   :config
   (when my-clangd-executable
     (add-to-list 'eglot-server-programs
                  `((c++-mode c-mode) . (,my-clangd-executable))))
 
-  ;; 2023-08-23 Disabling all this nonsense for now; I'm using pyright at
+  (let ((py-executable (or my-pyls-language-server-executable
-  ;;            work and don't feel like maintaining this stuff.
+                           my-pylsp-executable
-  ;;
+                           my-pyls-executable)))
-  ;; (let ((py-executable (or my-pyright-executable
+    (when py-executable
-  ;;                          my-pyls-language-server-executable
+      (add-to-list 'eglot-server-programs
-  ;;                          my-pylsp-executable
+                   `(python-mode . (,py-executable)))))
-  ;;                          my-pyls-executable)))
-  ;;   (when py-executable
-  ;;     (add-to-list 'eglot-server-programs
-  ;;                  `(python-mode . (,py-executable)))))
 
   ;; 2022-04-28 Configuration for Deno.
   (defclass eglot-deno (eglot-lsp-server) ()
@@ -734,10 +724,7 @@ Or, uh, Objective C, I guess."
     (blacken-mode)))
 
 (use-package python-mode :ensure
-  :init
+  :mode "\\.py\\'"
-  ;; NOTE: Not using :mode here because it implies :defer which... doesn't
-  ;; work with python-mode because it fights the built-in python mode.
-  (add-to-list 'auto-mode-alist '("\\.py$" . python-mode))
   :config
   (add-to-list 'interpreter-mode-alist '("python" . python-mode))
   (add-hook 'python-mode-hook 'my-python-mode-hook))
@@ -746,12 +733,10 @@ Or, uh, Objective C, I guess."
   :commands (blacken-mode)
   :hook (python-mode . blacken-mode))
 
-;; 2023-08-23 Disabling all this nonsense for now; I'm using pyright at
+(use-package lsp-pyright :ensure
-;;            work and don't feel like maintaining this stuff.
+  :hook (python-mode . (lambda ()
-;; (use-package lsp-pyright :ensure
+                          (require 'lsp-pyright)
-;;   :hook (python-mode . (lambda ()
+                          (lsp))))  ; or lsp-deferred
-;;                           (require 'lsp-pyright)
-;;                           (lsp))))  ; or lsp-deferred
 
 ;; =================================================================
 ;; Bazel Support
@@ -915,10 +900,9 @@ Or, uh, Objective C, I guess."
       (eglot-ensure)
 
     ;; Not a deno project; just enable tide and the normal
+    (eldoc-mode)
     (tide-setup)
-    (flycheck-mode +1)
+    (tide-hl-identifier-mode)))
-    (tide-hl-identifier-mode)
-    (eldoc-mode +1)))
 
 (use-package typescript-mode :ensure t
   :config
@@ -1126,7 +1110,7 @@ Or, uh, Objective C, I guess."
 (defun my-pico8-hook ()
   "My hook for pico-8 mode."
   ;; Pico-8 has a small indent.
-  (setq lua-indent-level 1)
+  (setq lua-indent-level 2)
   (set-fill-column 32))
 
 (use-package pico8-mode

.gitconfig

@@ -3,7 +3,7 @@
     email = john@d0ty.me
 
 [include]
-    path = .gitconfig.shared
+	path = .gitconfig.shared
 [credential "https://github.com"]
     helper =
     helper = !/opt/local/bin/gh auth git-credential
@@ -15,4 +15,4 @@
 [github]
     user = DeCarabas
 [safe]
-    directory = /home/linuxbrew/.linuxbrew/Homebrew/Library/Taps/homebrew/homebrew-core
+	directory = /home/linuxbrew/.linuxbrew/Homebrew/Library/Taps/homebrew/homebrew-core

.gitconfig.shared

@@ -11,9 +11,3 @@
     default = upstream
 [init]
     defaultBranch = main
-[rebase]
-    updateRefs = true
-[credential "helperselector"]
-    selected = manager
-[credential "https://git.d0ty.me"]
-    provider = generic

vscode/settings.json

@@ -88,7 +88,11 @@
     "/Users/doty/lacework/services/bazel/rust/clippyallrust.py"
   ],
   "remote.SSH.showLoginTerminal": true,
-  "remote.SSH.remotePlatform": {"coder.doty-dev":"linux","192.168.0.114":"linux","coder-vscode--johndoty--doty-dev":"linux"},
+  "remote.SSH.remotePlatform": {
+    "coder.doty-dev": "linux",
+    "192.168.0.114": "linux",
+    "coder-vscode--johndoty--doty-dev": "linux"
+  },
   "java.import.maven.enabled": false,
   "remote.autoForwardPortsSource": "process",
   "go.toolsManagement.autoUpdate": true,