playbooks/packages.yaml

@@ -23,6 +23,7 @@
           - libwebp-devel
           - mkvtoolnix
           - mpv
+          - musescore
           - nextcloud-client
           - nextcloud-client-dolphin
           - obs-studio
@@ -89,6 +90,7 @@
           - io.openrct2.OpenRCT2
           - org.signal.Signal
           - org.zulip.Zulip
+          - net.ankiweb.Anki
         state: latest
         method: user
         remote: flathub

programs/git.nix

@@ -42,11 +42,6 @@
       };
       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/";
     };
   };
 }

programs/shells.nix

@@ -10,53 +10,11 @@ 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}
-    }
-
-  '';
-  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 = shell_functions "bash" + ''
+      initExtra = conda_init "bash" + nd_bash_function + ''
         export PS1="[\[\e[32m\]\u\[\e[m\]@\[\e[33m\]\h\[\e[m\] \[\e[34m\]\W\[\e[m\]] \\$ "
       '';
     };
@@ -79,7 +37,7 @@ in {
           "zsh-users/zsh-completions"
         ];
       };
-      initContent = shell_functions "zsh";
+      initContent = conda_init "zsh" + nd_bash_function;
     };
   };
 }

programs/zed.nix

@@ -23,25 +23,13 @@
         use_modifier_to_send = true;
         default_model = {
           provider = "zed.dev";
-          model = "claude-sonnet-4-5";
+          model = "claude-3-7-sonnet";
         };
         default_profile = "minimal";
       };
       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 = {
@@ -64,12 +52,12 @@
             };
           };
         };
-        Nix = {
-          formatter.external.command = "${pkgs.nixfmt-classic}/bin/nixfmt";
-        };
       };
       lsp = {
-        nil = { settings.nix.flake.autoArchive = true; };
+        nil = {
+          initialization_options.formatting.command = [ "nixfmt" ];
+          settings.nix.flake.autoArchive = true;
+        };
         texlab = {
           settings = {
             build = {
@@ -87,7 +75,6 @@
           };
         };
         tinymist = {
-          initialization_options = { preview.background.enabled = true; };
           settings = {
             exportPdf = "onSave";
             outputPath = "$root/$name";
@@ -110,28 +97,12 @@
       ui_font_size = 16;
       wrap_guides = [ 80 92 120 ];
     };
-    userTasks = [
+    userTasks = [{
-      {
+      label = "latexmk (project)";
-        label = "latexmk (project)";
+      command = "latexmk";
-        command = "latexmk";
+      args = [ "-synctex=1" "-pdf" "-recorder" ];
-        args = [ "-synctex=1" "-pdf" "-recorder" ];
+      cwd = "$ZED_DIRNAME";
-        cwd = "$ZED_DIRNAME";
+      tags = [ "latex-build" ];
-        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;
-      }
-    ];
   };
 }

systems/darwin/corianne.nix

@@ -207,6 +207,7 @@ in {
     ];
     casks = [
       "alt-tab"
+      "anki"
       "db-browser-for-sqlite"
       "dolphin"
       "firefox"
@@ -215,6 +216,7 @@ in {
       "iterm2"
       "logseq"
       "macfuse"
+      "musescore"
       "nextcloud"
       "openrct2"
       "qownnotes"
@@ -232,7 +234,6 @@ in {
       "ungoogled-chromium"
       "veracrypt"
       "vlc"
-      "vienna"
       "vorta"
       "zed"
       "zotero"