Compare commits

..

No commits in common. "8ede0fd021a901cbc2f5792fafe775863960f87b" and "1fd66682e5f103db53c041d9ae3addf8ae9d5d0c" have entirely different histories.

2 changed files with 31 additions and 51 deletions

View file

@ -12,8 +12,7 @@
'(c-label-minimum-indentation 0) '(c-label-minimum-indentation 0)
'(c-label-offset -4) '(c-label-offset -4)
'(clojure-build-tool-files '(clojure-build-tool-files
'("project.clj" "build.boot" "build.gradle" "build.gradle.kts" "deps.edn" '("project.clj" "build.boot" "build.gradle" "build.gradle.kts" "deps.edn" "shadow-cljs.edn" "TARGETS"))
"shadow-cljs.edn" "TARGETS"))
'(comint-input-ignoredups t) '(comint-input-ignoredups t)
'(comint-prompt-read-only t) '(comint-prompt-read-only t)
'(comint-scroll-to-bottom-on-input t) '(comint-scroll-to-bottom-on-input t)
@ -64,33 +63,35 @@
bazel blacken cider clang-format clipetty clojure-mode bazel blacken cider clang-format clipetty clojure-mode
color-theme-monokai color-theme-sanityinc-solarized color-theme-monokai color-theme-sanityinc-solarized
color-theme-sanityinc-tomorrow company company-jedi color-theme-sanityinc-tomorrow company company-jedi
company-lsp compat cquery dap-mode dap-netcore company-lsp compat cquery dash-functional deadgrep
dash-functional deadgrep dockerfile-mode doom-themes dockerfile-mode doom-themes earthfile-mode editorconfig
earthfile-mode editorconfig eglot eglot-java elm-mode esup eglot eglot-java elm-mode esup exec-path-from-shell
exec-path-from-shell filladapt fish-mode flycheck filladapt fish-mode flycheck flycheck-elm flycheck-rust
flycheck-elm flycheck-rust flymake flyspell fsharp-mode flymake flyspell fsharp-mode geiser
geiser gnu-elpa-keyring-update go-autocomplete go-mode gnu-elpa-keyring-update go-autocomplete go-mode gptel
gptel graphviz-dot-mode hack-mode haxe-mode howm ink-mode graphviz-dot-mode hack-mode haxe-mode howm ink-mode
js2-mode js2-refactor json-mode jsonnet-mode lsp-hack js2-mode js2-refactor json-mode jsonnet-mode lsp-hack
lsp-pyright lsp-ui lua-mode magit markdown-mode merlin lsp-pyright lsp-ui lua-mode magit markdown-mode merlin
mocha modus-themes monky monokai-theme multi-term mocha modus-themes monky monokai-theme multi-term
mustache-mode nyan-mode paredit popup prettier-js mustache-mode nyan-mode paredit popup prettier-js
projectile protobuf-mode python-mode request rjsx-mode ruby-mode projectile protobuf-mode python-mode request rjsx-mode
rust-mode scala-ts-mode sql-indent swift-mode ruby-mode rust-mode scala-mode scala-ts-mode sql-indent
switch-window terraform-mode thrift tide tree-sitter tss swift-mode switch-window terraform-mode thrift tide
tuareg typescript-mode use-package vterm web-mode wgrep tree-sitter tss tuareg typescript-mode use-package vterm
wgsl-mode xref-js2 xterm-color yaml-mode zig-mode)) web-mode wgrep xref-js2 xterm-color yaml-mode zig-mode))
'(reb-re-syntax 'string) '(reb-re-syntax 'string)
'(rmail-mail-new-frame t) '(rmail-mail-new-frame t)
'(safe-local-variable-values '(safe-local-variable-values
'((docker-image-name . "onceandfuture") '((docker-image-name . "onceandfuture")
(eval ignore-errors (eval ignore-errors "Write-contents-functions is a buffer-local alternative to before-save-hook"
"Write-contents-functions is a buffer-local alternative to before-save-hook"
(add-hook 'write-contents-functions (add-hook 'write-contents-functions
(lambda nil (delete-trailing-whitespace) nil)) (lambda nil
(delete-trailing-whitespace)
nil))
(require 'whitespace) (require 'whitespace)
"Sometimes the mode needs to be toggled off and on." "Sometimes the mode needs to be toggled off and on."
(whitespace-mode 0) (whitespace-mode 1)) (whitespace-mode 0)
(whitespace-mode 1))
(whitespace-line-column . 80) (whitespace-line-column . 80)
(whitespace-style face trailing lines-tail) (require-final-newline . t))) (whitespace-style face trailing lines-tail) (require-final-newline . t)))
'(scala-indent:use-javadoc-style t) '(scala-indent:use-javadoc-style t)

View file

@ -870,10 +870,7 @@ Or, uh, Objective C, I guess."
("/\\(?:WORKSPACE\\(?:\\.bazel\\)?\\)\\'" . bazel-workspace-mode) ("/\\(?:WORKSPACE\\(?:\\.bazel\\)?\\)\\'" . bazel-workspace-mode)
("/\\(?:BUILD\\(?:\\.bazel\\)?\\)\\'" . bazel-build-mode) ("/\\(?:BUILD\\(?:\\.bazel\\)?\\)\\'" . bazel-build-mode)
("/.+\\.tilt\\'" . bazel-starlark-mode) ("/.+\\.tilt\\'" . bazel-starlark-mode)
("/Tiltfile$" . bazel-starlark-mode) ("/Tiltfile$" . bazel-starlark-mode)))
("BUCK" . bazel-build-mode)
("/..bxl\\'" . bazel-starlark-mode)
))
(defun my/open-bazel-build () (defun my/open-bazel-build ()
"Open the build.bazel file that dominates this source file." "Open the build.bazel file that dominates this source file."
@ -1405,20 +1402,17 @@ Do this when you edit your project view."
;; AI Shit ;; AI Shit
;; ================================================================= ;; =================================================================
(defun claude-get-api-key () (defun claude-get-api-key ()
"Get Claude API key from ~/.config/io.datasette.llm/keys.json file." "Get Claude API key from auth-source."
(let* ((keys-file (expand-file-name "~/.config/io.datasette.llm/keys.json")) (let ((auth-info (nth 0 (auth-source-search :host "anthropic.com"
(json-object-type 'hash-table) :user "claude-api"
(json-array-type 'list) :require '(:secret)
(json-key-type 'string)) :create t))))
(if (file-exists-p keys-file) (if auth-info
(let* ((json-data (with-temp-buffer (let ((secret (plist-get auth-info :secret)))
(insert-file-contents keys-file) (if (functionp secret)
(json-read-from-string (buffer-string)))) (funcall secret)
(claude-key (gethash "claude" json-data))) secret))
(if claude-key (error "Claude API key not found in auth-source"))))
claude-key
(error "Claude API key not found in keys.json")))
(error "Key file keys.json file not found at %s" keys-file))))
(use-package gptel :ensure (use-package gptel :ensure
:config :config
@ -1427,19 +1421,4 @@ Do this when you edit your project view."
gptel-backend (gptel-make-anthropic "Claude" gptel-backend (gptel-make-anthropic "Claude"
:stream t :key #'claude-get-api-key)) :stream t :key #'claude-get-api-key))
) )
;; =================================================================
;; Debugging
;; =================================================================
(use-package dap-mode :ensure
:commands dap-debug
:config
(require 'dap-netcore))
;; =================================================================
;; WGSL
;; =================================================================
(use-package wgsl-mode :ensure
:mode "\\.wgsl\\'")
;;; init.el ends here ;;; init.el ends here