From 9fcc736104c91155d321c5efd20578f0247e8404 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Wed, 17 Dec 2025 09:40:41 -0600 Subject: [PATCH 01/12] config (zed): Switch to external Nix formatter --- programs/zed.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/zed.nix b/programs/zed.nix index b3f7fd6..9477d87 100644 --- a/programs/zed.nix +++ b/programs/zed.nix @@ -52,12 +52,12 @@ }; }; }; + Nix = { + formatter.external.command = "${pkgs.nixfmt-classic}/bin/nixfmt"; + }; }; lsp = { - nil = { - initialization_options.formatting.command = [ "nixfmt" ]; - settings.nix.flake.autoArchive = true; - }; + nil = { settings.nix.flake.autoArchive = true; }; texlab = { settings = { build = { From d40b20d8cc0b2af586ee3e3f3f9436fea285c024 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Wed, 17 Dec 2025 09:44:14 -0600 Subject: [PATCH 02/12] config (zed): Switch default model to Claude Sonnet 4.5 --- programs/zed.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/zed.nix b/programs/zed.nix index 9477d87..4b97b71 100644 --- a/programs/zed.nix +++ b/programs/zed.nix @@ -23,7 +23,7 @@ use_modifier_to_send = true; default_model = { provider = "zed.dev"; - model = "claude-3-7-sonnet"; + model = "claude-sonnet-4-5"; }; default_profile = "minimal"; }; From c7f76d5c1c921d95b8a62540f6ef253c6bd97ed8 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Wed, 17 Dec 2025 09:46:29 -0600 Subject: [PATCH 03/12] config (zed): Add new git_hosting_providers key --- programs/zed.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/programs/zed.nix b/programs/zed.nix index 4b97b71..30f2bcb 100644 --- a/programs/zed.nix +++ b/programs/zed.nix @@ -30,6 +30,18 @@ buffer_font_family = "FiraCode Nerd Font"; buffer_font_size = 11; features = { edit_prediction_provider = "zed"; }; + git_hosting_providers = [ + { + provider = "forgejo"; + base_url = "https://code.millironx.com"; + name = "Milliron X Code"; + } + { + provider = "forgejo"; + base_url = "https://codeberg.org"; + name = "Codeberg"; + } + ]; languages = { Julia = { formatter = { From 20465843e45d377581a65b25bda7505b54558830 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Wed, 17 Dec 2025 09:50:14 -0600 Subject: [PATCH 04/12] config (git): Add ssh rewrites --- programs/git.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/git.nix b/programs/git.nix index 173e5f1..244e916 100644 --- a/programs/git.nix +++ b/programs/git.nix @@ -42,6 +42,11 @@ }; merge = { conflictstyle = "zdiff3"; }; pull = { rebase = true; }; + "url \"ssh://git@github.com/\"".insteadOf = "https://github.com/"; + "url \"ssh://git@gitlab.com/\"".insteadOf = "https://gitlab.com/"; + "url \"ssh://git@codeberg.com/\"".insteadOf = "https://codeberg.com/"; + "url \"ssh://git@code.millironx.com/\"".insteadOf = + "https://code.millironx.com/"; }; }; } From 69205e695fc529a0e4fc90d067172aa9ae9732a2 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Wed, 17 Dec 2025 09:50:44 -0600 Subject: [PATCH 05/12] shell: Add git clone shortcut function --- programs/shells.nix | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/programs/shells.nix b/programs/shells.nix index 6745cf4..6d226b9 100644 --- a/programs/shells.nix +++ b/programs/shells.nix @@ -10,13 +10,32 @@ let } ''; + sourceCodeDirectory = + if pkgs.stdenv.hostPlatform.isDarwin then "~/Developer" else "~/src"; + clone_bash_function = '' + unalias gc + function gc() { + REPO_ID="$(echo "''${1}" | \ + awk '{ + sub(/^git@/, ""); + sub(/^https:\/\//, ""); + sub (/:/, "/"); + sub(/\.git$/, ""); + print + }')" + git clone "https://''${REPO_ID}.git" ${sourceCodeDirectory}/''${REPO_ID} + cd ${sourceCodeDirectory}/''${REPO_ID} + } + + ''; in { programs = { bash = { enable = true; - initExtra = conda_init "bash" + nd_bash_function + '' - export PS1="[\[\e[32m\]\u\[\e[m\]@\[\e[33m\]\h\[\e[m\] \[\e[34m\]\W\[\e[m\]] \\$ " - ''; + initExtra = conda_init "bash" + nd_bash_function + clone_bash_function + + '' + export PS1="[\[\e[32m\]\u\[\e[m\]@\[\e[33m\]\h\[\e[m\] \[\e[34m\]\W\[\e[m\]] \\$ " + ''; }; zsh = { enable = true; @@ -37,7 +56,7 @@ in { "zsh-users/zsh-completions" ]; }; - initContent = conda_init "zsh" + nd_bash_function; + initContent = conda_init "zsh" + nd_bash_function + clone_bash_function; }; }; } From 8e283c2288e46a25b73ef31118b594de6bbdcc6b Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 21 Dec 2025 16:16:57 -0600 Subject: [PATCH 06/12] config (zed): Enable Typst previews --- programs/zed.nix | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/programs/zed.nix b/programs/zed.nix index 30f2bcb..dba9b38 100644 --- a/programs/zed.nix +++ b/programs/zed.nix @@ -87,6 +87,7 @@ }; }; tinymist = { + initialization_options = { preview.background.enabled = true; }; settings = { exportPdf = "onSave"; outputPath = "$root/$name"; @@ -109,12 +110,28 @@ ui_font_size = 16; wrap_guides = [ 80 92 120 ]; }; - userTasks = [{ - label = "latexmk (project)"; - command = "latexmk"; - args = [ "-synctex=1" "-pdf" "-recorder" ]; - cwd = "$ZED_DIRNAME"; - tags = [ "latex-build" ]; - }]; + userTasks = [ + { + label = "latexmk (project)"; + command = "latexmk"; + args = [ "-synctex=1" "-pdf" "-recorder" ]; + cwd = "$ZED_DIRNAME"; + tags = [ "latex-build" ]; + } + { + label = "Open Typst preview"; + command = "${ + if pkgs.stdenv.hostPlatform.isDarwin then "open" else "xdg-open" + } http://127.0.0.1:23635/"; + use_new_terminal = true; + allow_concurrent_runs = false; + reveal = "never"; + reveal_target = "dock"; + hide = "always"; + shell = "system"; + show_summary = true; + show_command = true; + } + ]; }; } From b6a67cfa987bf959ab7425305c05c875c8716fc6 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 21 Dec 2025 16:18:00 -0600 Subject: [PATCH 07/12] shell: Add repo_init function --- programs/shells.nix | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/programs/shells.nix b/programs/shells.nix index 6d226b9..edb0f18 100644 --- a/programs/shells.nix +++ b/programs/shells.nix @@ -28,14 +28,37 @@ let } ''; + repo_init_function = '' + function rinit() { + REPO_ID="$(echo "''${1}" | \ + awk '{ + sub(/^git@/, ""); + sub(/^https:\/\//, ""); + sub (/:/, "/"); + sub(/\.git$/, ""); + print + }')" + + mkdir -p ${sourceCodeDirectory}/''${REPO_ID} + cd ${sourceCodeDirectory}/''${REPO_ID} + + git init + + git remote add origin git@''${REPO_ID/\//:}.git + } + + ''; + + shell_functions = shell: + (conda_init shell) + nd_bash_function + clone_bash_function + + repo_init_function; in { programs = { bash = { enable = true; - initExtra = conda_init "bash" + nd_bash_function + clone_bash_function - + '' - export PS1="[\[\e[32m\]\u\[\e[m\]@\[\e[33m\]\h\[\e[m\] \[\e[34m\]\W\[\e[m\]] \\$ " - ''; + initExtra = shell_functions "bash" + '' + export PS1="[\[\e[32m\]\u\[\e[m\]@\[\e[33m\]\h\[\e[m\] \[\e[34m\]\W\[\e[m\]] \\$ " + ''; }; zsh = { enable = true; @@ -56,7 +79,7 @@ in { "zsh-users/zsh-completions" ]; }; - initContent = conda_init "zsh" + nd_bash_function + clone_bash_function; + initContent = shell_functions "zsh"; }; }; } From 01cf1735738d562f7375706a59f82381e4a0ea13 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 21 Dec 2025 16:19:35 -0600 Subject: [PATCH 08/12] brew (corianne): Install Vienna --- systems/darwin/corianne.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/systems/darwin/corianne.nix b/systems/darwin/corianne.nix index f1c1eb2..b4755c9 100644 --- a/systems/darwin/corianne.nix +++ b/systems/darwin/corianne.nix @@ -234,6 +234,7 @@ in { "ungoogled-chromium" "veracrypt" "vlc" + "vienna" "vorta" "zed" "zotero" From 117cf076970c939852e43091b1e32da783003f87 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 21 Dec 2025 16:19:52 -0600 Subject: [PATCH 09/12] brew (corianne): Remove Musescore --- systems/darwin/corianne.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/systems/darwin/corianne.nix b/systems/darwin/corianne.nix index b4755c9..d4787fe 100644 --- a/systems/darwin/corianne.nix +++ b/systems/darwin/corianne.nix @@ -216,7 +216,6 @@ in { "iterm2" "logseq" "macfuse" - "musescore" "nextcloud" "openrct2" "qownnotes" From 7e65bc03b38bd3a35b51509982247f0402c40043 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 21 Dec 2025 16:20:07 -0600 Subject: [PATCH 10/12] brew (corianne): Remove Anki --- systems/darwin/corianne.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/systems/darwin/corianne.nix b/systems/darwin/corianne.nix index d4787fe..c83a9a1 100644 --- a/systems/darwin/corianne.nix +++ b/systems/darwin/corianne.nix @@ -207,7 +207,6 @@ in { ]; casks = [ "alt-tab" - "anki" "db-browser-for-sqlite" "dolphin" "firefox" From 8c313aae3766137a709f7e1f3dd6dc7dcf6d4cb2 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 21 Dec 2025 16:20:58 -0600 Subject: [PATCH 11/12] dnf (fedora): Remove musescore --- playbooks/packages.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/playbooks/packages.yaml b/playbooks/packages.yaml index 58e7263..34f40c8 100644 --- a/playbooks/packages.yaml +++ b/playbooks/packages.yaml @@ -23,7 +23,6 @@ - libwebp-devel - mkvtoolnix - mpv - - musescore - nextcloud-client - nextcloud-client-dolphin - obs-studio From 7d8843c399f9e4fa17005953fc40c6b7451e12c9 Mon Sep 17 00:00:00 2001 From: "Thomas A. Christensen II" <25492070+MillironX@users.noreply.github.com> Date: Sun, 21 Dec 2025 16:21:10 -0600 Subject: [PATCH 12/12] flatpak (fedora): Remove Anki --- playbooks/packages.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/playbooks/packages.yaml b/playbooks/packages.yaml index 34f40c8..f13c01b 100644 --- a/playbooks/packages.yaml +++ b/playbooks/packages.yaml @@ -89,7 +89,6 @@ - io.openrct2.OpenRCT2 - org.signal.Signal - org.zulip.Zulip - - net.ankiweb.Anki state: latest method: user remote: flathub