jonas/.hive
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finalize: jonas@comfy-station

Browse Source
This commit is contained in:
Jonas Röger
2026-03-28 13:46:36 +01:00
parent 574e91135f
commit 0df3b7ebde
16 changed files with 335 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

290
modules/doom/doom.nix Normal file
View File

@@ -0,0 +1,290 @@
{
flake.homeModules.doom = {
config,
pkgs,
lib,
...
}: let
cfg = config.hive.doom;
doom-pkgs = with pkgs; [
cmake
emacs-all-the-icons-fonts
fira
fira-code-symbols
fontconfig
gcc
nerd-fonts.fira-code
];
default-core-pkgs = with pkgs; [
(ripgrep.override {withPCRE2 = true;})
(aspellWithDicts (d: [d.en d.de d.en-computers d.en-science]))
binutils
editorconfig-core-c
fd
git
gnumake
gnutls
ispell
libtool
vscode-langservers-extracted
(pkgs.stdenvNoCC.mkDerivation {
name = "epdfinfo";
phases = "installPhase";
installPhase = ''
mkdir -p $out/bin
ln -s $(${pkgs.findutils}/bin/find ${pkgs.emacsPackages.pdf-tools}/ -name epdfinfo) $out/bin/
'';
})
];
default-shell-pkgs = with pkgs; [
bash-language-server
];
default-nix-pkgs = with pkgs; [
alejandra
nixd
];
default-latex-pkgs = with pkgs; [
pandoc
poppler
texlab
texlive.combined.scheme-medium
];
default-cxx-pkgs = with pkgs; [
clang
clang-tools
cmake
cppcheck
doxygen
gdb
ninja
];
default-python-pkgs = with pkgs; [
python312
python312Packages.black
pyright
];
doom-path-pkgs =
lib.optionals cfg.withLatexPkgs (cfg.overrideLatexPkgs default-latex-pkgs)
++ lib.optionals cfg.withShellPkgs (cfg.overrideShellPkgs default-shell-pkgs)
++ lib.optionals cfg.withNixPkgs (cfg.overrideNixPkgs default-nix-pkgs)
++ lib.optionals cfg.withCXXPkgs (cfg.overrideCXXPkgs default-cxx-pkgs)
++ lib.optionals cfg.withPythonPkgs (cfg.overridePythonPkgs default-python-pkgs)
++ lib.optional cfg.enableCopilot pkgs.unstable.copilot-language-server
++ default-core-pkgs;
doom-socket-name = "main";
wrapped-emacs = pkgs.symlinkJoin {
name = "wrapped-emacs";
paths = [pkgs.emacs30];
nativeBuildInputs = [pkgs.makeBinaryWrapper];
postBuild = ''
wrapProgram $out/bin/emacs \
--prefix PATH : ${lib.makeBinPath doom-path-pkgs} \
--add-flags "--init-directory=${config.xdg.configHome}/doom-emacs" \
--set DOOMDIR "${config.home.sessionVariables.DOOMDIR}" \
--set DOOMLOCALDIR "${config.home.sessionVariables.DOOMLOCALDIR}"
wrapProgram $out/bin/emacsclient \
--prefix PATH : ${lib.makeBinPath doom-path-pkgs} \
--set DOOMDIR "${config.home.sessionVariables.DOOMDIR}" \
--set DOOMLOCALDIR "${config.home.sessionVariables.DOOMLOCALDIR}"
'';
};
doom-setup = pkgs.writeShellScript "doom-setup" ''
export PATH="${lib.makeBinPath doom-path-pkgs}:$PATH"
export EMACS="${wrapped-emacs}/bin/emacs"
export DOOMDIR="${config.home.sessionVariables.DOOMDIR}"
export DOOMLOCALDIR="${config.home.sessionVariables.DOOMLOCALDIR}"
if [ ! -d "$DOOMLOCALDIR" ]; then
${config.xdg.configHome}/doom-emacs/bin/doom install --force --no-env
else
${config.xdg.configHome}/doom-emacs/bin/doom "$@"
fi
'';
doom-open = pkgs.writeShellScriptBin "doom-open" ''
export EMACS_SOCKET_NAME="$XDG_RUNTIME_DIR/emacs/${doom-socket-name}"
if [ -t 0 ]; then
exec ${wrapped-emacs}/bin/emacsclient -t "$@"
else
exec ${wrapped-emacs}/bin/emacsclient -c "$@"
fi
'';
in {
options.hive.doom = {
enable = lib.mkEnableOption "Enable Doom Emacs";
asDefaultEditor = lib.mkEnableOption "set the EDITOR variable to use the current emacs server (graphical/non-graphical)";
enableCopilot = lib.mkEnableOption "Enable Copilot in Doom Emacs";
enableTidal = lib.mkEnableOption "Enable TidalCycles";
withLatexPkgs = lib.mkEnableOption "Enable LaTeX packages in doom path";
withShellPkgs = lib.mkEnableOption "Enable shell packages in doom path";
withNixPkgs = lib.mkEnableOption "Enable LaTeX packages in doom path";
withCXXPkgs = lib.mkEnableOption "Enable CXX packages in doom path";
withPythonPkgs = lib.mkEnableOption "Enable python packages in doom path";
overrideLatexPkgs = lib.mkOption {
type = lib.types.functionTo (lib.types.listOf lib.types.package);
default = pkgs: pkgs;
example = ''
prev: with pkgs; [
texlive.combined.scheme-full
]
'';
description = "Override the default LaTeX packages in the doom path.";
};
overrideShellPkgs = lib.mkOption {
type = lib.types.functionTo (lib.types.listOf lib.types.package);
default = pkgs: pkgs;
example = ''
prev: with pkgs; [
shellcheck
]
'';
description = "Override the default shell packages in the doom path.";
};
overrideNixPkgs = lib.mkOption {
type = lib.types.functionTo (lib.types.listOf lib.types.package);
default = pkgs: pkgs;
example = ''
prev: with pkgs; [
nixpkgs-fmt
]
'';
description = "Override the default Nix packages in the doom path.";
};
overrideCXXPkgs = lib.mkOption {
type = lib.types.functionTo (lib.types.listOf lib.types.package);
default = pkgs: pkgs;
example = ''
prev: with pkgs; [
openmp
]
'';
description = "Override the default C++ packages in the doom path.";
};
overridePythonPkgs = lib.mkOption {
type = lib.types.functionTo (lib.types.listOf lib.types.package);
default = pkgs: pkgs;
example = ''
prev: with pkgs; [
pythonPackages.black
]
'';
description = "Override the default Python packages in the doom path.";
};
};
config = lib.mkIf cfg.enable {
fonts.fontconfig.enable = true;
programs.emacs = {
enable = true;
package = wrapped-emacs;
};
home = {
sessionPath = ["${config.xdg.configHome}/doom-emacs/bin"];
sessionVariables =
{
DOOMDIR = "${config.xdg.configHome}/doom-config";
DOOMLOCALDIR = "${config.xdg.configHome}/doom-local";
}
// lib.optionalAttrs cfg.asDefaultEditor {
EDITOR = "${doom-open.name}";
};
packages = doom-pkgs ++ lib.optional cfg.asDefaultEditor doom-open;
};
systemd.user.services.doom-emacs-server = {
Unit = {
Description = "Doom Emacs Server";
};
Service = {
ExecStart = "${wrapped-emacs}/bin/emacs --fg-daemon=${doom-socket-name}";
SuccessExitStatus = 15;
};
Install = {
WantedBy = []; # Lazy start by socket
};
};
systemd.user.sockets.doom-emacs-server = {
Socket = {
ListenStream = "/run/user/%U/emacs/${doom-socket-name}";
DirectoryMode = "0700";
};
Install = {
WantedBy = ["sockets.target"];
};
};
xdg = {
enable = true;
configFile = {
"doom-config/splash.png" = {
source = ./static/splash.png;
};
"doom-config/config.el" = {
source = ./static/config.el;
};
"doom-config/config.d/copilot.el" = {
enable = cfg.enableCopilot;
source = ./static/config.d/copilot.el;
};
"doom-config/packages/treesit-docgen.el" = {
source = ./static/packages/treesit-docgen.el;
};
"doom-config/init.el" = {
source = ./static/init.el;
onChange = "${doom-setup} sync --force -e";
};
"doom-config/packages.el" = {
source = ./static/packages.el;
onChange = "${doom-setup} sync --force -u -e";
};
"doom-config/packages.d/copilot.el" = {
enable = cfg.enableCopilot;
source = ./static/packages.d/copilot.el;
onChange = "${doom-setup} sync --force -u -e";
};
"doom-config/packages.d/tidal.el" = {
enable = cfg.enableTidal;
source = ./static/packages.d/tidal.el;
onChange = "${doom-setup} sync --force -u -e";
};
"doom-emacs" = {
source = builtins.fetchGit {
url = "https://github.com/doomemacs/doomemacs";
rev = "a0d6aac43fc94def29c98826e2f0088bcb703d13";
};
onChange = "${doom-setup} --force sync -u -e";
};
};
desktopEntries = {
emacs = {
name = "Doom Emacs";
genericName = "Text Editor";
icon = ./static/icon.png;
exec = "${wrapped-emacs}/bin/emacs %F";
terminal = false;
categories = ["Application" "Development" "TextEditor"];
mimeType = ["text/*"];
settings = {
StartupWMClass = "Doom Emacs";
};
};
emacsclient = {
name = "Doom Emacs (Client)";
genericName = "Text Editor";
icon = ./static/icon.png;
exec = ''
sh -c "if [ -n \\"\\$*\\" ]; then exec ${wrapped-emacs}/bin/emacsclient --alternate-editor= --display=\\"\\$DISPLAY\\" \\"\\$@\\"; else exec emacsclient --alternate-editor= --create-frame; fi" sh %F
'';
terminal = false;
categories = ["Application" "Development" "TextEditor"];
mimeType = ["text/*"];
settings = {
StartupWMClass = "Doom Emacs";
};
};
};
};
};
};
}

8
modules/doom/static/config.d/copilot.el Normal file
View File

@@ -0,0 +1,8 @@
;; accept completion from copilot and fallback to company
(use-package! copilot
:hook (prog-mode . copilot-mode)
:bind (:map copilot-completion-map
("<tab>" . 'copilot-accept-completion)
("TAB" . 'copilot-accept-completion)
("C-TAB" . 'copilot-accept-completion-by-word)
("C-<tab>" . 'copilot-accept-completion-by-word)))

266
modules/doom/static/config.el Normal file
View File

@@ -0,0 +1,266 @@
;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
;; Place your private configuration here! Remember, you do not need to run 'doom
;; sync' after modifying this file!
;; Some functionality uses this to identify you, e.g. GPG configuration, email
;; clients, file templates and snippets. It is optional.
;; (setq user-full-name "John Doe"
;; user-mail-address "john@doe.com")
;; Doom exposes five (optional) variables for controlling fonts in Doom:
;;
;; - `doom-font' -- the primary font to use
;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable)
;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for
;; presentations or streaming.
;; - `doom-symbol-font' -- for symbols
;; - `doom-serif-font' -- for the `fixed-pitch-serif' face
;;
;; See 'C-h v doom-font' for documentation and more examples of what they
;; accept. For example:
;;
;; (setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light)
;; doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13))
(setq doom-font (font-spec :family "FiraCode Nerd Font Mono" :size 14 :weight 'semi-light)
doom-variable-pitch-font (font-spec :family "Fira Sans" :size 15))
;;
;; If you or Emacs can't find your font, use 'M-x describe-font' to look them
;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to
;; refresh your font settings. If Emacs still can't find your font, it likely
;; wasn't installed correctly. Font issues are rarely Doom issues!
;; There are two ways to load a theme. Both assume the theme is installed and
;; available. You can either set `doom-theme' or manually load a theme with the
;; `load-theme' function. This is the default:
(setq doom-theme 'doom-gruvbox)
(custom-set-faces! `(font-lock-operator-face :foreground ,(doom-color 'operators)))
;; This determines the style of line numbers in effect. If set to `nil', line
;; numbers are disabled. For relative line numbers, set this to `relative'.
(setq display-line-numbers-type 'relative)
;; If you use `org' and don't want your org files in the default location below,
;; change `org-directory'. It must be set before org loads!
(setq org-directory "~/org/")
;; Whenever you reconfigure a package, make sure to wrap your config in an
;; `after!' block, otherwise Doom's defaults may override your settings. E.g.
;;
;; (after! PACKAGE
;; (setq x y))
;;
;; The exceptions to this rule:
;;
;; - Setting file/directory variables (like `org-directory')
;; - Setting variables which explicitly tell you to set them before their
;; package is loaded (see 'C-h v VARIABLE' to look up their documentation).
;; - Setting doom variables (which start with 'doom-' or '+').
;;
;; Here are some additional functions/macros that will help you configure Doom.
;;
;; - `load!' for loading external *.el files relative to this one
;; - `use-package!' for configuring packages
;; - `after!' for running code after a package has loaded
;; - `add-load-path!' for adding directories to the `load-path', relative to
;; this file. Emacs searches the `load-path' when you load packages with
;; `require' or `use-package'.
;; - `map!' for binding new keys
;;
;; To get information about any of these functions/macros, move the cursor over
;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
;; This will open documentation for it, including demos of how they are used.
;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces,
;; etc).
;;
;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
;; they are implemented.
(use-package! treemacs
:init
(setq +treemacs-git-mode 'deferred)
:config
(setq treemacs-position 'right)
)
(add-hook 'git-commit-mode-hook #'conventional-commit-setup)
(use-package! rainbow-delimiters
:hook ((prog-mode . rainbow-delimiters-mode))
:config
(setq rainbow-delimiters-max-face-count 6))
(map! :leader
:desc "Project VTerm" "p RET" #'projectile-run-vterm)
(map! :leader
:desc "File Symbols" "c s" #'consult-lsp-file-symbols
:desc "All Symbols" "c S" #'consult-lsp-symbols)
(use-package envrc
:hook (after-init . envrc-global-mode))
(after! markdown-mode
(setq markdown-split-window-direction 'right)
(setq markdown-command "pandoc -t html5 -f markdown_mmd --embed-resources --standalone --mathjax --quiet --highlight-style=zenburn")
(setq markdown-enable-math t))
(add-hook! 'markdown-mode-hook 'pandoc-mode)
(require 'dap-cpptools)
(use-package! graphviz-dot-mode
:ensure t
:config
(setq graphviz-dot-indent-width 4))
(after! auctex
(add-hook! 'LaTeX-mode-hook 'lsp)
(map! :map LaTeX-mode-map
:localleader
:desc "Sync View PDF" "v" (lambda () (interactive) (TeX-pdf-tools-sync-view)))
(setq +latex-viewers '(pdf-tools)))
(set-frame-parameter nil 'alpha-background 85)
(add-to-list 'default-frame-alist '(alpha-background . 85))
(after! lsp-clangd
(setq lsp-clients-clangd-args
'("--background-index"
"--clang-tidy"
"--completion-style=detailed"
"--header-insertion=never"
"--header-insertion-decorators=0"
"--compile-commands-dir=build"
))
(set-lsp-priority! 'clangd 2))
(after! ccls
(setq ccls-initialization-options '(:index (:comments 2) :completion (:detailedLabel t) :compilationDatabaseDirectory "build" :cache (:directory ".cache/ccls" :format "binary")))
(set-lsp-priority! 'ccls 1))
(setq apheleia-formatters-respect-indent-level nil)
(defun my-ui-doc-glance-then-focus ()
"Glances UI-Doc if not present, otherwise focus"
(interactive)
(if (lsp-ui-doc--visible-p)
(lsp-ui-doc-focus-frame)
(lsp-ui-doc-glance)))
(map! :map (cpp-mode-map c-mode-map c++-mode-map lsp-mode-map)
:desc "Show Doc-UI" :n "C-h" #'my-ui-doc-glance-then-focus)
(set-formatter! 'alejandra '("alejandra" "--quiet") :modes '(nix-mode nix-ts-mode))
;; nixd
(after! 'lsp-mode
(lsp-register-client
(make-lsp-client :new-connection (lsp-stdio-connection "nixd")
:major-modes '(nix-mode)
:priority 0
:server-id 'nixd)))
;;Use TS-modes
(after! treesit
(load! "packages/treesit-docgen.el"))
;;
;;(defconst mode-ts-mode-mapping
;; '((python-mode . python-ts-mode)
;; (css-mode . css-ts-mode)
;; (typescript-mode . typescript-ts-mode)
;; (js-mode . typescript-ts-mode)
;; (js2-mode . typescript-ts-mode)
;; (c-mode . c-ts-mode)
;; (c++-mode . c++-ts-mode)
;; (c-or-c++-mode . c-or-c++-ts-mode)
;; (bash-mode . bash-ts-mode)
;; (css-mode . css-ts-mode)
;; (json-mode . json-ts-mode)
;; (js-json-mode . json-ts-mode)
;; (sh-mode . bash-ts-mode)
;; (c-or-c++-mode . c-or-c++-ts-mode)
;; (sh-base-mode . bash-ts-mode))
;; "A map from original mode to the ts-mode")
;;
;;(use-package! treesit
;; :defer t
;; :mode (("\\.tsx\\'" . tsx-ts-mode)
;; ("\\.js\\'" . typescript-ts-mode)
;; ("\\.mjs\\'" . typescript-ts-mode)
;; ("\\.mts\\'" . typescript-ts-mode)
;; ("\\.cjs\\'" . typescript-ts-mode)
;; ("\\.ts\\'" . typescript-ts-mode)
;; ("\\.jsx\\'" . tsx-ts-mode)
;; ("\\.json\\'" . json-ts-mode)
;; ("\\.Dockerfile\\'" . dockerfile-ts-mode)
;; ("\\.c\\'" . c-ts-mode)
;; ("\\.h\\'" . c-or-c++-ts-mode)
;; ("\\.cpp\\'" . c++-ts-mode)
;; ("\\.py\\'" . python-ts-mode)
;; ("\\.sh\\'" . bash-ts-mode)
;; )
;; :preface
;; (dolist (mapping mode-ts-mode-mapping)
;; (add-to-list 'major-mode-remap-alist mapping)))
;;
;;;; Integrate with legacy tree-sitter mode
;;(use-package! tree-sitter
;; :hook ((c++-ts-mode . tree-sitter-mode)
;; (c-ts-mode . tree-sitter-mode)
;; (c-or-c++-ts-mode . tree-sitter-mode)
;; (python-ts-mode . tree-sitter-mode)
;; (css-ts-mode . tree-sitter-mode)
;; (typescript-ts-mode . tree-sitter-mode)
;; (js-ts-mode . tree-sitter-mode)
;; (bash-ts-mode . tree-sitter-mode)
;; (json-ts-mode . tree-sitter-mode)
;; (tree-sitter-mode . tree-sitter-hl-mode))
;; :config
;; (let (result)
;; (dolist (mapping tree-sitter-major-mode-language-alist)
;; (let* ((pre-mode (car mapping))
;; (ts-lang (cdr mapping))
;; (post-mode (cdr (assoc pre-mode mode-ts-mode-mapping))))
;; (when post-mode
;; (push (cons post-mode ts-lang) result))))
;; (dolist (mapping result)
;; (add-to-list 'tree-sitter-major-mode-language-alist mapping))))
;; Integrate with lsp-mode
(use-package lsp-mode
:defer t
:hook ((lsp-mode . lsp-diagnostics-mode)
(lsp-mode . lsp-enable-which-key-integration)
(python-ts-mode . lsp-deferred)
(css-ts-mode . lsp-deferred)
(typescript-ts-mode . lsp-deferred)
(js-ts-mode . lsp-deferred)
(c-ts-mode . lsp-deferred)
(c++-ts-mode . lsp-deferred)
(haskell-ts-mode . lsp-deferred)
(c-or-c++-ts-mode . lsp-deferred)
(bash-ts-mode . lsp-deferred)
(json-ts-mode . lsp-deferred)))
(after! jj-mode
(map! :leader
(:prefix ("j" . "Jujutsu")
:desc "Log" "j" #'jj-log
:desc "Describe" "d" #'jj-describe
:desc "Abandon" "a" #'jj-abandon
:desc "New" "n" #'jj-new
)))
(setq auto-mode-alist (cons '("\\.smt$" . smtlib-mode) auto-mode-alist))
(autoload 'smtlib-mode "smtlib" "Major mode for SMTLIB" t)
(let ((config-dir (expand-file-name "config.d" doom-user-dir)))
(when (file-directory-p config-dir)
(dolist (file (directory-files config-dir t "\\.el$" t))
(load file))))

BIN
modules/doom/static/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 126 KiB

198
modules/doom/static/init.el Normal file
View File

@@ -0,0 +1,198 @@
;;; init.el -*- lexical-binding: t; -*-
;; This file controls what Doom modules are enabled and what order they load
;; in. Remember to run 'doom sync' after modifying it!
;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's
;; documentation. There you'll find a link to Doom's Module Index where all
;; of our modules are listed, including what flags they support.
;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or
;; 'C-c c k' for non-vim users) to view its documentation. This works on
;; flags as well (those symbols that start with a plus).
;;
;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its
;; directory (for easy access to its source code).
(doom! :input
;;bidi ; (tfel ot) thgir etirw uoy gnipleh
;;chinese
;;japanese
;;layout ; auie,ctsrnm is the superior home row
:completion
(company +childframe) ; the ultimate code completion backend
;;(corfu +orderless) ; complete with cap(f), cape and a flying feather!
;;helm ; the *other* search engine for love and life
;;ido ; the other *other* search engine...
;;ivy ; a search engine for love and life
vertico ; the search engine of the future
:ui
;;deft ; notational velocity for Emacs
doom ; what makes DOOM look the way it does
doom-dashboard ; a nifty splash screen for Emacs
;;doom-quit ; DOOM quit-message prompts when you quit Emacs
(emoji +unicode +github) ; 🙂
hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
;;hydra
;;indent-guides ; highlighted indent columns
ligatures ; ligatures and symbols to make your code pretty again
;;minimap ; show a map of the code on the side
modeline ; snazzy, Atom-inspired modeline, plus API
;;nav-flash ; blink cursor line after big motions
;;neotree ; a project drawer, like NERDTree for vim
ophints ; highlight the region an operation acts on
(popup +defaults) ; tame sudden yet inevitable temporary windows
;;tabs ; a tab bar for Emacs
treemacs ; a project drawer, like neotree but cooler
;;unicode ; extended unicode support for various languages
(vc-gutter +pretty) ; vcs diff in the fringe
vi-tilde-fringe ; fringe tildes to mark beyond EOB
window-select ; visually switch windows
workspaces ; tab emulation, persistence & separate workspaces
zen ; distraction-free coding or writing
:editor
(evil +everywhere); come to the dark side, we have cookies
file-templates ; auto-snippets for empty files
fold ; (nigh) universal code folding
(format +onsave) ; automated prettiness
;;god ; run Emacs commands without modifier keys
;;lispy ; vim for lisp, for people who don't like vim
;;multiple-cursors ; editing in many places at once
;;objed ; text object editing for the innocent
;;parinfer ; turn lisp into python, sort of
;;rotate-text ; cycle region at point between text candidates
snippets ; my elves. They type so I don't have to
;;word-wrap ; soft wrapping with language-aware indent
:emacs
dired ; making dired pretty [functional]
electric ; smarter, keyword-based electric-indent
(ibuffer +icons) ; interactive buffer management
(undo +tree) ; persistent, smarter undo for your inevitable mistakes
vc ; version-control and Emacs, sitting in a tree
:term
;;eshell ; the elisp shell that works everywhere
;;shell ; simple shell REPL for Emacs
;;term ; basic terminal emulator for Emacs
vterm ; the best terminal emulation in Emacs
:checkers
syntax ; tasing you for every semicolon you forget
(spell +flyspell) ; tasing you for misspelling mispelling
grammar ; tasing grammar mistake every you make
:tools
;;ansible
;;biblio ; Writes a PhD for you (citation needed)
;;collab ; buffers with friends
(debugger +realgud +lsp) ; FIXME stepping through code, to help you add bugs
;;direnv
;;docker
;;editorconfig ; let someone else argue about tabs vs spaces
ein ; tame Jupyter notebooks with emacs
(eval +overlay) ; run code, run (also, repls)
lookup ; navigate your code and its documentation
lsp ; M-x vscode
magit ; a git porcelain for Emacs
;;make ; run make tasks from Emacs
;;pass ; password manager for nerds
pdf ; pdf enhancements
;;prodigy ; FIXME managing external services & code builders
;;rgb ; creating color strings
;;taskrunner ; taskrunner for all your projects
;;terraform ; infrastructure as code
;;tmux ; an API for interacting with tmux
tree-sitter ; syntax and parsing, sitting in a tree...
;;upload ; map local to remote projects via ssh/ftp
:os
(:if (featurep :system 'macos) macos) ; improve compatibility with macOS
(tty +osc) ; improve the terminal Emacs experience
:lang
;;agda ; types of types of types of types...
;;beancount ; mind the GAAP
(cc +lsp +tree-sitter) ; C > C++ == 1
;;clojure ; java with a lisp
;;common-lisp ; if you've seen one lisp, you've seen them all
;;coq ; proofs-as-programs
;;crystal ; ruby at the speed of c
;;csharp ; unity, .NET, and mono shenanigans
;;data ; config/data formats
;;(dart +flutter) ; paint ui and not much else
;;dhall
;;elixir ; erlang done right
;;elm ; care for a cup of TEA?
emacs-lisp ; drown in parentheses
;;erlang ; an elegant language for a more civilized age
;;ess ; emacs speaks statistics
;;factor
;;faust ; dsp, but you get to keep your soul
;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER)
;;fsharp ; ML stands for Microsoft's Language
;;fstar ; (dependent) types and (monadic) effects and Z3
;;gdscript ; the language you waited for
;;(go +lsp) ; the hipster dialect
;;(graphql +lsp) ; Give queries a REST
(haskell +lsp +tree-sitter) ; a language that's lazier than I am
;;hy ; readability of scheme w/ speed of python
;;idris ; a language you can depend on
(json +tree-sitter) ; At least it ain't XML
(java +lsp +tree-sitter) ; the poster child for carpal tunnel syndrome
;;javascript ; all(hope(abandon(ye(who(enter(here))))))
;;julia ; a better, faster MATLAB
;;kotlin ; a better, slicker Java(Script)
(latex +lsp +latexmk) ; writing papers in Emacs has never been so fun
;;lean ; for folks with too much to prove
;;ledger ; be audit you can be
;;lua ; one-based indices? one-based indices
(markdown +tree-sitter) ; writing docs for people to ignore
;;nim ; python + lisp at the speed of c
(nix +tree-sitter +lsp) ; I hereby declare "nix geht mehr!"
;;ocaml ; an objective camel
(org +brain +dagndrop +noter +pretty +roam2) ; organize your plain life in plain text
;;php ; perl's insecure younger brother
;;plantuml ; diagrams for confusing people more
;;purescript ; javascript, but functional
(python +lsp +pyenv +pyright +tree-sitter) ; beautiful is better than ugly
;;qt ; the 'cutest' gui framework ever
;;racket ; a DSL for DSLs
;;raku ; the artist formerly known as perl6
;;rest ; Emacs as a REST client
;;rst ; ReST in peace
;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
(rust +lsp +tree-sitter) ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
;;scala ; java, but good
;;(scheme +guile) ; a fully conniving family of lisps
(sh +tree-sitter) ; she sells {ba,z,fi}sh shells on the C xor
;;sml
;;solidity ; do you need a blockchain? No.
;;swift ; who asked for emoji variables?
;;terra ; Earth and Moon in alignment for performance.
;;web ; the tubes
(yaml +tree-sitter) ; JSON, but readable
;;zig ; C, but simpler
:email
;;(mu4e +org +gmail)
;;notmuch
;;(wanderlust +gmail)
:app
;;calendar
;;emms
;;everywhere ; *leave* Emacs!? You must be joking
;;irc ; how neckbeards socialize
;;(rss +org) ; emacs as an RSS reader
;;twitter ; twitter client https://twitter.com/vnought
:config
;;literate
(default +bindings +smartparens))
(setq fancy-splash-image "~/.config/doom-config/splash.png")

2
modules/doom/static/packages.d/copilot.el Normal file
View File

@@ -0,0 +1,2 @@
(package! copilot
:recipe (:host github :repo "copilot-emacs/copilot.el" :files ("*.el")))

1
modules/doom/static/packages.d/tidal.el Normal file
View File

@@ -0,0 +1 @@
(package! tidal)

97
modules/doom/static/packages.el Normal file
View File

@@ -0,0 +1,97 @@
;; -*- no-byte-compile: t; -*-
;;; $DOOMDIR/packages.el
;; To install a package with Doom you must declare them here and run 'doom sync'
;; on the command line, then restart Emacs for the changes to take effect -- or
;; use 'M-x doom/reload'.
;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
;; (package! some-package)
;; To install a package directly from a remote git repo, you must specify a
;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
;; https://github.com/radian-software/straight.el#the-recipe-format
;; (package! another-package
;; :recipe (:host github :repo "username/repo"))
;; If the package you are trying to install does not contain a PACKAGENAME.el
;; file, or is located in a subdirectory of the repo, you'll need to specify
;; `:files' in the `:recipe':
;; (package! this-package
;; :recipe (:host github :repo "username/repo"
;; :files ("some-file.el" "src/lisp/*.el")))
;; If you'd like to disable a package included with Doom, you can do so here
;; with the `:disable' property:
;; (package! builtin-package :disable t)
;; You can override the recipe of a built in package without having to specify
;; all the properties for `:recipe'. These will inherit the rest of its recipe
;; from Doom or MELPA/ELPA/Emacsmirror:
;; (package! builtin-package :recipe (:nonrecursive t))
;; (package! builtin-package-2 :recipe (:repo "myfork/package"))
;; Specify a `:branch' to install a package from a particular branch or tag.
;; This is required for some packages whose default branch isn't 'master' (which
;; our package manager can't deal with; see radian-software/straight.el#279)
;; (package! builtin-package :recipe (:branch "develop"))
;; Use `:pin' to specify a particular commit to install.
;; (package! builtin-package :pin "1a2b3c4d5e")
;; Doom's packages are pinned to a specific commit and updated from release to
;; release. The `unpin!' macro allows you to unpin single packages...
;; (unpin! pinned-package)
;; ...or multiple packages
;; (unpin! pinned-package another-pinned-package)
;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
;; (unpin! t)
(package! conventional-commit
:recipe (:host github :repo "akirak/conventional-commit.el" :files ("conventional-commit.el")))
;; TODO: Remove this when a fix for https://github.com/doomemacs/doomemacs/issues/8286 is included
(package! package-lint :pin "21edc6d0d0eadd2d0a537f422fb9b7b8a3ae6991")
(package! ws-butler
:recipe (:host github
:repo "emacsmirror/nongnu_elpa"
:branch "elpa/ws-butler"
:local-repo "ws-butler")
:pin "9ee5a7657a22e836618813c2e2b64a548d27d2ff")
(package! smtlib-mode
:recipe (:host github
:repo "chsticksel/smtlib-mode"
:branch "master"
:local-repo "smtlib-mode")
:pin "ed387e63b64091228e6a8a429b02b8fba165f5b5")
;; Usabel ein PR branch. Original is deprecated
(package! ein
:recipe (:host github
:repo "natsirtguy/emacs-ipython-notebook"
:branch "fix-polymode-compatibility")
:pin "2ff01b4adbb6302798fc84464d1e420e337113fd")
(package! envrc
:recipe (:host github
:repo "Grimpper/envrc"
:branch "support-async-execution"
)
:pin "71f67971bc5eb2974ae2f738512c8f09f0822527")
(package! pdf-tools)
(package! eww)
(package! pandoc-mode)
(package! tramp)
(package! graphviz-dot-mode)
(package! rainbow-delimiters)
(package! jj-mode :recipe (:host github :repo "bolivier/jj-mode.el"))
(let ((package-dir (expand-file-name "packages.d" doom-user-dir)))
(when (file-directory-p package-dir)
(dolist (file (directory-files package-dir t "\\.el$" t))
(load file))))

71
modules/doom/static/packages/treesit-docgen.el Normal file
View File

@@ -0,0 +1,71 @@
(defun treesit-docgen--get-function-node (node)
"Get the function node the given NODE belongs to. Or nil"
(treesit-parent-until node
(lambda (n)
(or (equal (treesit-node-type n) "function_definition")
(and (equal (treesit-node-type n) "declaration"))
(equal (treesit-node-type (treesit-node-child-by-field-name n "declarator"))
"function_declarator")))
t)
)
(defun treesit-docgen--fn-template-node (fn-node)
"Get the template node of a function or nil"
(let* ((par (treesit-node-parent fn-node))
(par-t (treesit-node-type par)))
(when (string= par-t "template_declaration") par)
))
(defun treesit-docgen--fn-tpars (fn-node)
"Get the template parameters of the function node or nil"
(let* ((template (treesit-docgen--fn-template-node fn-node))
(tpars (treesit-node-child-by-field-name template "parameters")))
(when tpars
(delq nil
(mapcar (lambda (tpar) (when (string= (treesit-node-type tpar) "type_parameter_declaration")
(treesit-node-text tpar)))
(treesit-node-children tpars))))))
(defun treesit-docgen--fn-type (fn-node)
"Get the return type of the function node"
(let ((fn-type-node (treesit-node-child-by-field-name fn-node "type")))
(treesit-node-text fn-type-node)))
(defun treesit-docgen--fn-pars (fn-node)
"Get the parameter names of the function node"
(let* ((fn-node-decl (treesit-node-child-by-field-name fn-node "declarator"))
(fn-node-pars (treesit-node-child-by-field-name fn-node-decl "parameters"))
)
(when fn-node-pars
(delq nil
(mapcar (lambda (par) (when (string= (treesit-node-type par) "parameter_declaration")
(treesit-node-text par)))
(treesit-node-children fn-node-pars))))))
(defun treesit-docgen-insert-doc ()
"Insert a documentation template for the function at point"
(interactive)
(let* ((node (treesit-node-at (point)))
(fn-node (treesit-docgen--get-function-node node)))
(when fn-node
(let* ((fn-type (treesit-docgen--fn-type fn-node))
(fn-pars (treesit-docgen--fn-pars fn-node))
(fn-tpars (treesit-docgen--fn-tpars fn-node)))
(goto-char (treesit-node-start
(or (treesit-docgen--fn-template-node fn-node)
fn-node)))
(insert "///\n")
(insert "///@brief\n")
(insert "///\n")
(when fn-tpars
(dolist (tpar fn-tpars)
(insert "///@tparam " tpar "\n"))
(insert "///\n"))
(when fn-pars
(dolist (par fn-pars)
(insert "///@param " par "\n"))
(insert "///\n"))
(when fn-type
(insert "///@return " fn-type "\n")
(insert "///\n")
)))))

BIN
modules/doom/static/splash.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 165 KiB

37
modules/programs/jj.nix Normal file
View File

@@ -0,0 +1,37 @@
{
flake.homeModules.jj = {
config,
lib,
pkgs,
...
}: let
cfg = config.hive.jj;
in {
options.hive.jj = {
followGit = lib.mkOption {
type = lib.types.bool;
default = true;
description = "Follow the current git configuration";
};
};
config = {
home.packages = with pkgs; [
jujutsu
];
programs.jujutsu = {
enable = true;
settings = {
user = lib.optionalAttrs cfg.followGit {
name = config.programs.git.settings.user.name;
email = config.programs.git.settings.user.email;
};
ui = lib.optionalAttrs (cfg.followGit && config.programs.difftastic.enable) {
diff-formatter = ["${pkgs.difftastic}/bin/difft" "--color=always" "$left" "$right"];
};
};
};
};
};
}