diff --git a/.config/htop/htoprc b/.config/htop/htoprc new file mode 100644 index 0000000..5284644 --- /dev/null +++ b/.config/htop/htoprc @@ -0,0 +1,39 @@ +# Beware! This file is rewritten by htop when settings are changed in the interface. +# The parser is also very primitive, and not human-friendly. +fields=0 48 17 18 38 39 2 46 47 49 1 0 +sort_key=47 +sort_direction=-1 +tree_sort_key=0 +tree_sort_direction=1 +hide_kernel_threads=1 +hide_userland_threads=0 +shadow_other_users=0 +show_thread_names=0 +show_program_path=0 +highlight_base_name=0 +highlight_megabytes=1 +highlight_threads=1 +highlight_changes=0 +highlight_changes_delay_secs=5 +find_comm_in_cmdline=1 +strip_exe_from_cmdline=1 +show_merged_command=0 +tree_view=0 +tree_view_always_by_pid=0 +header_margin=1 +detailed_cpu_time=0 +cpu_count_from_one=1 +show_cpu_usage=1 +show_cpu_frequency=0 +show_cpu_temperature=0 +degree_fahrenheit=0 +update_process_names=0 +account_guest_in_cpu_meter=0 +color_scheme=0 +enable_mouse=1 +delay=15 +left_meters=AllCPUs Memory Swap +left_meter_modes=1 1 1 +right_meters=Tasks LoadAverage Uptime +right_meter_modes=2 2 2 +hide_function_bar=0 diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index 9ddf610..498ce87 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -58,7 +58,7 @@ '(org-odd-levels-only t) '(org-todo-keywords '((sequence "TODO" "|" "DONE" "ABANDONED" "DEFERRED"))) '(package-selected-packages - '(swift-mode flycheck-elm sql-indent eglot-java 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 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 color-theme-monokai auto-complete auto-complete-nxml flymake flyspell json-mode popup ruby-mode company-jedi elm-mode monky color-theme-sanityinc-tomorrow)) + '(flycheck-elm sql-indent eglot-java 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 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 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 diff --git a/.emacs.d/init.el b/.emacs.d/init.el index f2550d9..3536bf7 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -283,7 +283,6 @@ ;; Fix path loading on MacOS X (when (memq window-system '(mac ns)) - (use-package exec-path-from-shell :ensure t) (exec-path-from-shell-initialize)) ;;; Stefan Monnier . It is the opposite of fill-paragraph @@ -411,12 +410,6 @@ (cond ((ts/is-deno-project) '("deno" "lsp" :initializationOptions :enable t :lint t)) (t '("typescript-language-server" "--stdio")))) -(defun my-find-swift-lsp () - "Try to find the swift LSP." - ;; On windows with scoop this lives in a weird place. - (or (executable-find "sourcekit-lsp") ;; Support newer clangd - (executable-find "C:/Users/john/scoop/apps/swift/current/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/sourcekit-lsp") - "sourcekit-lsp")) (use-package eglot :ensure t :commands (eglot-ensure eglot) @@ -430,7 +423,6 @@ (go-mode . eglot-ensure) ;; 2022-07-29 Add eglot for go (typescript-mode . eglot-ensure) ;; 2023-09-03 Eglot for typescript (typescript-ts-mode . eglot-ensure) ;; 2023-09-03 Eglot for typescript - (swift-mode . eglot-ensure) ;; 2023-11-11 Eglot for swift? ;; 2023-09-10 Respect language-specific formatters ;; @@ -471,12 +463,9 @@ (:check (:command "clippy"))))) ;; -- - (add-to-list 'eglot-server-programs - `(swift-mode . ( ,(my-find-swift-lsp) "--sync" "--log-level" "debug"))) - - (add-hook 'eglot-managed-mode-hook 'my-disable-flycheck-on-eglot) - (remove-hook 'eglot-connect-hook 'eglot-signal-didChangeConfiguration) - (add-hook 'eglot-connect-hook 'my-eglot-connect-hook)) + (add-hook 'eglot-managed-mode-hook 'my-disable-flycheck-on-eglot) + (remove-hook 'eglot-connect-hook 'eglot-signal-didChangeConfiguration) + (add-hook 'eglot-connect-hook 'my-eglot-connect-hook)) ;; NOTE: elgot defers to flymake for error information. (use-package flymake @@ -984,7 +973,7 @@ Or, uh, Objective C, I guess." ) (use-package add-node-modules-path :ensure t - :hook (typescript-mode . add-node-modules-path)) + :hook typescript-mode) (use-package prettier-js :ensure t :hook (typescript-mode . prettier-js-mode)) @@ -1038,9 +1027,8 @@ Or, uh, Objective C, I guess." ;; Magit stuff ;; ================================================================= (use-package magit :ensure t - :bind (("C-x g" . magit-status) - ("C-c g" . magit-dispatch) - ("C-c f" . magit-file-dispatch))) + :bind ("C-x g" . magit-status)) + ;; ================================================================= ;; Mercurial stuff @@ -1308,10 +1296,5 @@ Or, uh, Objective C, I guess." ;; ================================================================= (use-package sql-indent :ensure t) -;; ================================================================= -;; Swift -;; ================================================================= -(use-package swift-mode :ensure t - :mode "\\.swift\\(interface\\)?\\'") ;;; init.el ends here diff --git a/.gitconfig.shared b/.gitconfig.shared index 624bcd8..cc33735 100644 --- a/.gitconfig.shared +++ b/.gitconfig.shared @@ -7,8 +7,6 @@ [alias] st = status ci = commit -[pull] - rebase = true [push] default = upstream [init] @@ -19,8 +17,3 @@ selected = manager [credential "https://git.d0ty.me"] provider = generic -[filter "lfs"] - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - required = true diff --git a/.gitignore b/.gitignore index decc760..9a89589 100644 --- a/.gitignore +++ b/.gitignore @@ -36,4 +36,3 @@ _viminfo vscode/History vscode/globalStorage vscode/workspaceStorage -.config/htop/htoprc diff --git a/vscode/settings.json b/vscode/settings.json index f28feaf..d5572a7 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -88,14 +88,9 @@ "/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", - "doty-dev.johndoty.devspaces.dev.lacework.engineering": "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": "hybrid", + "remote.autoForwardPortsSource": "process", "go.toolsManagement.autoUpdate": true, "bazel.queriesShareServer": true, "remote.portsAttributes": { @@ -109,7 +104,5 @@ "[python]": { "editor.formatOnType": true }, - "git.confirmSync": false, - "cmake.showOptionsMovedNotification": false, - "jupyter.askForKernelRestart": false + "git.confirmSync": false } \ No newline at end of file