diff options
| -rw-r--r-- | desktop/.config/blightmud/servers.ron | 12 | ||||
| -rw-r--r-- | emacs/.config/emacs/emacs-custom.el | 65 |
2 files changed, 24 insertions, 53 deletions
diff --git a/desktop/.config/blightmud/servers.ron b/desktop/.config/blightmud/servers.ron index cebb41a..ab4f915 100644 --- a/desktop/.config/blightmud/servers.ron +++ b/desktop/.config/blightmud/servers.ron @@ -5,4 +5,16 @@ tls: true, verify_cert: true, ), + "nukefire": ( + host: "tdome.nukefire.org", + port: 4000, + tls: false, + verify_cert: false, + ), + "alter_aeon": ( + host: "alteraeon.com", + port: 3000, + tls: false, + verify_cert: false, + ), }
\ No newline at end of file diff --git a/emacs/.config/emacs/emacs-custom.el b/emacs/.config/emacs/emacs-custom.el index 286790f..126daae 100644 --- a/emacs/.config/emacs/emacs-custom.el +++ b/emacs/.config/emacs/emacs-custom.el @@ -5,33 +5,6 @@ ;; If there is more than one, they won't work right. '(ai-code-onboarding-seen t) '(custom-safe-themes -<<<<<<< variant A - '("fbf73690320aa26f8daffdd1210ef234ed1b0c59f3d001f342b9c0bbf49f531c" - "0340489fa0ccbfa05661bc5c8c19ee0ff95ab1d727e4cc28089b282d30df8fc8" - "e3999eba4f25d912d7d61cbaaed1b551957e61da047279da89499d3bd1f1d007" - "8d412c0ed46b865312d6df5c1dfd1821d349dd3cba00049cf88c4ad34403597e" - "88267200889975d801f6c667128301af0bc183f3450c4b86138bfb23e8a78fb1" - default)) - '(package-selected-packages - '(ace-mc anki-editor anzu apache-mode bar-cursor bm boxquote - browse-kill-ring clojure-mode color-theme-modern coterm - csv-mode deadgrep diff-hl diminish diredfl direnv - doom-themes dslide dts-mode editorconfig embark-consult - eproject esh-help eshell-syntax-highlighting ess exercism - expand-region flycheck flycheck-hledger folding gcmh - git-modes gitattributes-mode gitconfig-mode gitignore-mode - goto-chg graphviz-dot-mode haskell-mode helpful htmlize - idle-highlight-mode ido-completing-read+ initsplit - kj-emacs ledger-mode lsp-mode magit mixed-pitch - modus-themes mutt-alias muttrc-mode nix-mode notmuch - ob-async org-download org-pomodoro pcmpl-args pcre2el - pdf-tools pod-mode projectile puni puppet-mode repeat-help - rust-mode rustic selected session smudge tabbar tempel - tidal undo-tree unobtrusive-magit-theme wgrep which-key - with-editor yaml-mode yasnippet yasnippet-snippets - zenburn-theme)) - '(package-vc-selected-packages '((kj-emacs :url "/home/orbekk/git/kj-emacs.git"))) ->>>>>>> variant B '("5e39e95c703e17a743fb05a132d727aa1d69d9d2c9cde9353f5350e545c793d4" "fbf73690320aa26f8daffdd1210ef234ed1b0c59f3d001f342b9c0bbf49f531c" "0340489fa0ccbfa05661bc5c8c19ee0ff95ab1d727e4cc28089b282d30df8fc8" @@ -39,43 +12,29 @@ "8d412c0ed46b865312d6df5c1dfd1821d349dd3cba00049cf88c4ad34403597e" "88267200889975d801f6c667128301af0bc183f3450c4b86138bfb23e8a78fb1" default)) - '(package-selected-packages nil) + '(package-selected-packages + '(ace-mc ace-window ai-code aidermacs all-the-icons anki-editor anzu + clojure-mode corfu coterm deadgrep diff-hl diredfl direnv + doom-themes dslide dts-mode editorconfig embark-consult + emojify esh-help eshell-syntax-highlighting ess exercism + expand-region flycheck gcmh ghostel gptel + graphviz-dot-mode idle-highlight-mode ledger-mode + marginalia mixed-pitch modus-themes nix-mode ob-async + orderless org-pomodoro pcmpl-args pcre2el pdf-tools + projectile puni rainbow-delimiters repeat-help rustic + selected sly smudge tempel tidal unobtrusive-magit-theme + vertico wgrep which-key ws-butler yaml-mode yasnippet)) '(package-vc-selected-packages '((anki-editor :url "https://github.com/anki-editor/anki-editor") (kj-emacs :url "/home/orbekk/git/kj-emacs.git"))) '(safe-local-variable-directories '("/home/orbekk/common-lisp/ledger/")) -####### Ancestor - '("fbf73690320aa26f8daffdd1210ef234ed1b0c59f3d001f342b9c0bbf49f531c" "0340489fa0ccbfa05661bc5c8c19ee0ff95ab1d727e4cc28089b282d30df8fc8" "e3999eba4f25d912d7d61cbaaed1b551957e61da047279da89499d3bd1f1d007" "8d412c0ed46b865312d6df5c1dfd1821d349dd3cba00049cf88c4ad34403597e" "88267200889975d801f6c667128301af0bc183f3450c4b86138bfb23e8a78fb1" default)) - '(package-selected-packages - '(modus-themes kj-emacs dslide org-download anki-editor yasnippet org-pomodoro eshell-syntax-highlighting esh-help pcmpl-args exercism tidal haskell-mode diff-hl dts-mode clojure-mode unobtrusive-magit-theme ledger-mode nix-mode rustic tempel puni magit gcmh smudge helpful pdf-tools pcre2el repeat-help selected ace-mc expand-region idle-highlight-mode diredfl anzu direnv ob-async mixed-pitch deadgrep wgrep coterm doom-themes with-editor zenburn-theme yasnippet-snippets yaml-mode which-key undo-tree tabbar session rust-mode puppet-mode pod-mode notmuch muttrc-mode mutt-alias lsp-mode initsplit ido-completing-read+ htmlize graphviz-dot-mode goto-chg gitignore-mode gitconfig-mode gitattributes-mode git-modes folding flycheck ess eproject editorconfig diminish csv-mode color-theme-modern browse-kill-ring boxquote bm bar-cursor apache-mode projectile embark-consult)) - '(package-vc-selected-packages '((kj-emacs :url "/home/orbekk/git/kj-emacs.git"))) -======= end '(safe-local-variable-values -<<<<<<< variant A '((org-duration-format . h:mm) (org-duration-format \` h:mm) (checkdoc-allow-quoting-nil-and-t . t) (eval outline-hide-sublevels 3) (eval outline-hide-sublevels 2) (Package . CL-WHO) (Package . HUNCHENTOOT) (Base . 10) (Package . CL-USER) (Syntax . COMMON-LISP) (eval sly-connect "localhost" 9090) (sly-port . 9090) ->>>>>>> variant B - '((checkdoc-allow-quoting-nil-and-t . t) - (eval outline-hide-sublevels 3) (eval outline-hide-sublevels 2) - (Package . CL-WHO) (Package . HUNCHENTOOT) (Base . 10) - (Package . CL-USER) (Syntax . COMMON-LISP) - (eval sly-connect "localhost" 9090) (sly-port . 9090) -####### Ancestor - '((checkdoc-allow-quoting-nil-and-t . t) - (eval outline-hide-sublevels 3) - (eval outline-hide-sublevels 2) - (Package . CL-WHO) - (Package . HUNCHENTOOT) - (Base . 10) - (Package . CL-USER) - (Syntax . COMMON-LISP) - (eval sly-connect "localhost" 9090) - (sly-port . 9090) -======= end (checkdoc-package-keywords-flag)))) (custom-set-faces ;; custom-set-faces was added by Custom. |