feat: miscellaneous updates

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743341436,
+        "lastModified": 1745054840,
-        "narHash": "sha256-G16Liuyv9SOziASKI5qRuyp/wJpDKSfQP3ksj2YUDZQ=",
+        "narHash": "sha256-mLtmmYsDN2Yn1Q05ZxPGPsNGlfZWFFDGj/EShHv9Vpw=",
         "owner": "ryanccn",
         "repo": "am",
-        "rev": "0e302b8eff61f1844b7dfd6991c479b03f7b98fc",
+        "rev": "36d349c9976ea264c6bdea28847d248d09af977c",
         "type": "github"
       },
       "original": {
@@ -20,6 +20,26 @@
         "type": "github"
       }
     },
+    "arkencrab": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1748505140,
+        "narHash": "sha256-RO5inKcQEZLlS/JdsLspct8zE7OUXmwgzezuTea4Ro4=",
+        "owner": "ryanccn",
+        "repo": "arkencrab",
+        "rev": "cd226a6171898761f2ccf7111ae0a42a390029c4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ryanccn",
+        "repo": "arkencrab",
+        "type": "github"
+      }
+    },
     "catppuccin": {
       "inputs": {
         "nixpkgs": [
@@ -27,11 +47,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743414153,
+        "lastModified": 1748080874,
-        "narHash": "sha256-bFIXz7SvLlSNR4M3vYPYS1CpEN9vTUiH01R4iR/BDmA=",
+        "narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "2f52f9ead26f80d7b391cedcbb3eb309bd83fff4",
+        "rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112",
         "type": "github"
       },
       "original": {
@@ -67,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743607567,
+        "lastModified": 1748570847,
-        "narHash": "sha256-kTzKPDFmNzwO1cK4fiJgPB/iSw7HgBAmknRTeAPJAeI=",
+        "narHash": "sha256-XU1a6wFctd+s3ZvBIFB6s4GhPJ+Oc6pkeOrEsbA2fMo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "49748c74cdbae03d70381f150b810f92617f23aa",
+        "rev": "4e9efaa68b0be7e19127dad4f0506a9b89e28ef4",
         "type": "github"
       },
       "original": {
@@ -80,6 +100,26 @@
         "type": "github"
       }
     },
+    "moldau": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1746267775,
+        "narHash": "sha256-/noXgOMDHfVvGaF48TmMv0o9QwMxZLYyMgpyn89RNdI=",
+        "owner": "ryanccn",
+        "repo": "moldau",
+        "rev": "447b391b9bc04ce9437cd0171db267b5d6c3f0e6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ryanccn",
+        "repo": "moldau",
+        "type": "github"
+      }
+    },
     "morlana": {
       "inputs": {
         "nixpkgs": [
@@ -87,11 +127,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743340617,
+        "lastModified": 1747527940,
-        "narHash": "sha256-laBEsV4Hxg6BxAjOKf7EclqZiOltNCi/mE4rNzfchME=",
+        "narHash": "sha256-q3pAB5UFef7yzyIhShzucb1cYq2j8ga43HxtpfX3Bd8=",
         "owner": "ryanccn",
         "repo": "morlana",
-        "rev": "9fe612776403d8eaa6860b78aa7f7dc68f1b41f0",
+        "rev": "d2667a9833ad41f9df2f5ac6a058aeb9c773128e",
         "type": "github"
       },
       "original": {
@@ -107,11 +147,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743496612,
+        "lastModified": 1748352827,
-        "narHash": "sha256-emPWa5lmKbnyuj8c1mSJUkzJNT+iJoU9GMcXwjp2oVM=",
+        "narHash": "sha256-sNUUP6qxGkK9hXgJ+p362dtWLgnIWwOCmiq72LAWtYo=",
         "owner": "nix-darwin",
         "repo": "nix-darwin",
-        "rev": "73d59580d01e9b9f957ba749f336a272869c42dd",
+        "rev": "44a7d0e687a87b73facfe94fba78d323a6686a90",
         "type": "github"
       },
       "original": {
@@ -127,11 +167,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743306489,
+        "lastModified": 1748145500,
-        "narHash": "sha256-LROaIjSLo347cwcHRfSpqzEOa2FoLSeJwU4dOrGm55E=",
+        "narHash": "sha256-t9fx0l61WOxtWxXCqlXPWSuG/0XMF9DtE2T7KXgMqJw=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "b3696bfb6c24aa61428839a99e8b40c53ac3a82d",
+        "rev": "a98adbf54d663395df0b9929f6481d4d80fc8927",
         "type": "github"
       },
       "original": {
@@ -142,11 +182,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743568003,
+        "lastModified": 1748506378,
-        "narHash": "sha256-ZID5T65E8ruHqWRcdvZLsczWDOAWIE7om+vQOREwiX0=",
+        "narHash": "sha256-oS0Gxh63Df8b8r04lqEYDDLKhHIrVr9/JLOn2bn8JaI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b7ba7f9f45c5cd0d8625e9e217c28f8eb6a19a76",
+        "rev": "3866ad91cfc172f08a6839def503d8fc2923c603",
         "type": "github"
       },
       "original": {
@@ -163,11 +203,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743610126,
+        "lastModified": 1747309661,
-        "narHash": "sha256-qh4YEfdfO6WofdrFHVDvkNocloK2LuWelfZPilxiKPk=",
+        "narHash": "sha256-p/+O/WK2yd/RvmFNA52e9VZRczSrgB8DNzghw/1nVPM=",
         "owner": "ryanccn",
         "repo": "nrr",
-        "rev": "2897e6945b26645d746e87da937a1ac762f979a5",
+        "rev": "76f0d1097efc76b29b3be3dcc60cd47fb3acbf65",
         "type": "github"
       },
       "original": {
@@ -183,11 +223,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743340790,
+        "lastModified": 1746622954,
-        "narHash": "sha256-fnRXur0YiZdiRqqKYDdxMCo7ROMqwimOIg1waCqugPo=",
+        "narHash": "sha256-rumKd6B7Ig2EmJG14CuAJdo/nrWAHBJzvx8mkQsMoZw=",
         "owner": "ryanccn",
         "repo": "nyoom",
-        "rev": "131feeb52c0ec403186e19b60433ac4548f585f1",
+        "rev": "ec421346a51fc7f1dc571fe11a4733f4f6417dd4",
         "type": "github"
       },
       "original": {
@@ -199,11 +239,11 @@
     "ohmyzsh": {
       "flake": false,
       "locked": {
-        "lastModified": 1743249320,
+        "lastModified": 1748515796,
-        "narHash": "sha256-Wh4PR/TH6DDDfckI9nAnbecDs9MUBzj7+iwY19yv454=",
+        "narHash": "sha256-rjN+/5P/q7uXSVGf/jypOCYLvoGYGPMZTy1dL9+E4Uc=",
         "owner": "ohmyzsh",
         "repo": "ohmyzsh",
-        "rev": "f81259fb344685e2dc8b67f8ad8764ccd4e8502e",
+        "rev": "95ef2516697aa764d1d4bb93ad3490584cc118ec",
         "type": "github"
       },
       "original": {
@@ -215,9 +255,11 @@
     "root": {
       "inputs": {
         "am": "am",
+        "arkencrab": "arkencrab",
         "catppuccin": "catppuccin",
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
+        "moldau": "moldau",
         "morlana": "morlana",
         "nix-darwin": "nix-darwin",
         "nix-index-database": "nix-index-database",
@@ -237,11 +279,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743561237,
+        "lastModified": 1748572605,
-        "narHash": "sha256-dd97LXek202OWmUXvKYFdYWj0jHrn3p+L5Ojh1SEOqs=",
+        "narHash": "sha256-k0nhPtkVDQkVJckRw6fGIeeDBktJf1BH0i8T48o7zkk=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "1de27ae43712a971c1da100dcd84386356f03ec7",
+        "rev": "405ef13a5b80a0a4d4fc87c83554423d80e5f929",
         "type": "github"
       },
       "original": {

flake.nix

@@ -75,6 +75,16 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    moldau = {
+      url = "github:ryanccn/moldau";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    arkencrab = {
+      url = "github:ryanccn/arkencrab";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";

packages/ryan-mono-bin.nix

@@ -8,11 +8,11 @@
   fetchzip,
 }:
 let
-  version = "2025.03.09";
+  version = "2025.04.28";
 
   hashes = {
-    "ryan-mono" = "sha256-CDYRMkHbHTQgoVforRxLb+vMZuUwQ4Whl0kDAyadFKQ=";
+    "ryan-mono" = "sha256-UPw0L5j7h9YcmI1nvgqg0kgYKLi8Ip4ghYzwpanoaqE=";
-    "ryan-term" = "sha256-iPPoJ803P3Gw0pO37jFiaLr+Yug3vwxNHBiP2fr+1cg=";
+    "ryan-term" = "sha256-uu6lEfhtnAp8v50jvY9oXPnOFnDoIAWxxAAjNIXQbec=";
   };
 in
 stdenvNoCC.mkDerivation {

systems/caladan/default.nix

@@ -40,5 +40,6 @@
     home = "/Users/ryan";
   };
 
+  system.primaryUser = "ryan";
   system.stateVersion = 6;
 }

systems/caladan/packages.nix

@@ -14,8 +14,6 @@ in
 {
   environment.systemPackages = with pkgs; [
     nixfmt-rfc-style
-    alejandra
-    nixpkgs-fmt
     statix
     deadnix
 
@@ -32,21 +30,11 @@ in
     yt-dlp
     xkcdpass
 
-    # nodePackages.typescript-language-server
-    dprint
-
-    # google-cloud-sdk
-    # railway
-    # cloudflared
-    # flyctl
-
-    # btop
     doggo
     doppler
+    dprint
     dust
     fd
-    ffmpeg
-    # gum
     hyperfine
     jq
     just
@@ -59,15 +47,16 @@ in
     watchexec
     xh
 
-    typst
     exiftool
-    # packwiz
+    ffmpeg
-    # spicetify-cli
+    typst
 
     defaultPackages.nrr
     defaultPackages.am
     defaultPackages.nyoom
     defaultPackages.morlana
     defaultPackages.spdx-gen
+    defaultPackages.moldau
+    defaultPackages.arkencrab
   ];
 }

users/ryan/apps/ghostty.nix

@@ -18,7 +18,7 @@ let
     theme = "catppuccin-${config.catppuccin.flavor}";
     window-colorspace = "display-p3";
 
-    font-family = "IBM Plex Mono";
+    font-family = "Ryan Term";
     font-size = 14;
     font-feature = [
       "-calt"

users/ryan/apps/vscode.nix

@@ -28,12 +28,11 @@ let
     "graphql.vscode-graphql"
     "graphql.vscode-graphql-syntax"
     "golang.go"
-    "griimick.vhs"
     "jnoortheen.nix-ide"
+    "ms-python.debugpy"
     "ms-python.isort"
-    "ms-python.vscode-pylance"
     "ms-python.python"
-    "myriad-dreamin.tinymist"
+    "ms-python.vscode-pylance"
     "naumovs.color-highlight"
     "prisma.prisma"
     "ronnidc.nunjucks"
@@ -60,18 +59,17 @@ let
     "[astro]" = "astro-build.astro-vscode";
     "[rust]" = "rust-lang.rust-analyzer";
     "[nix]" = "jnoortheen.nix-ide";
-    "[typst]" = "myriad-dreamin.tinymist";
   };
 in
 {
   programs.vscode = {
     enable = true;
     package = pkgs.writeShellApplication {
-      name = "vscode-1.98.2";
+      name = "vscode-1.100.2";
       text = "";
       derivationArgs = {
         pname = "vscode";
-        version = "1.98.2";
+        version = "1.100.2";
       };
     };
 
@@ -104,12 +102,13 @@ in
         "git.confirmSync" = false;
         "git.inputValidation" = false;
         "git.suggestSmartCommit" = false;
+        "git.branchRandomName.enable" = true;
         "git.blame.editorDecoration.enabled" = true;
 
         "diffEditor.renderSideBySide" = false;
         "diffEditor.ignoreTrimWhitespace" = false;
 
-        "editor.fontFamily" = ''"IBM Plex Mono", "Symbols Nerd Font", monospace'';
+        "editor.fontFamily" = ''"Ryan Mono", "Symbols Nerd Font", monospace'';
         "editor.fontLigatures" = true;
         "editor.fontSize" = 16;
         "editor.lineHeight" = 1.5;
@@ -125,7 +124,7 @@ in
         "editor.insertSpaces" = true;
         "editor.formatOnSave" = true;
 
-        "terminal.integrated.fontFamily" = ''"IBM Plex Mono", "Symbols Nerd Font Mono", monospace'';
+        "terminal.integrated.fontFamily" = ''"Ryan Term", "Symbols Nerd Font Mono", monospace'';
         "terminal.integrated.fontSize" = 14;
         "terminal.integrated.lineHeight" = 1.5;
         "terminal.integrated.cursorBlinking" = true;
@@ -150,6 +149,7 @@ in
         };
 
         "telemetry.telemetryLevel" = "off";
+        "telemetry.feedback.enabled" = false;
         "workbench.enableExperiments" = false;
         "workbench.settings.enableNaturalLanguageSearch" = false;
         "extensions.ignoreRecommendations" = true;

users/ryan/default.nix

@@ -10,7 +10,7 @@
   programs.home-manager.enable = true;
 
   imports = [
-    inputs.catppuccin.homeManagerModules.catppuccin
+    inputs.catppuccin.homeModules.catppuccin
     inputs.nix-index-database.hmModules.nix-index
 
     ./variables.nix
@@ -37,6 +37,7 @@
   programs.bash.enable = true;
   xdg.enable = true;
 
+  programs.nix-index.enable = true;
   programs.nix-index-database.comma.enable = true;
 
   home.stateVersion = "24.11";

users/ryan/programs/fish/configs/99_interactive.fish

@@ -5,14 +5,21 @@
 if status is-interactive
     nix-your-shell fish | source
 
+    if test -d "$(brew --prefix)/share/fish/completions"
+        set -p fish_complete_path "$(brew --prefix)/share/fish/completions"
+    end
+    if test -d "$(brew --prefix)/share/fish/vendor_completions.d"
+        set -p fish_complete_path "$(brew --prefix)/share/fish/vendor_completions.d"
+    end
+
     if command -q nrr
         source "$(COMPLETE=fish nrr | psub)"
+    end
     if command -q nrx
         source "$(COMPLETE=fish nrx | psub)"
     end
-    end
 
-    if set -q GHOSTTY_RESOURCES_DIR
+    if test "$TERM_PROGRAM" = "ghostty" && set -q GHOSTTY_RESOURCES_DIR
         source "$GHOSTTY_RESOURCES_DIR/shell-integration/fish/vendor_conf.d/ghostty-shell-integration.fish"
     end
 end

users/ryan/programs/rust.nix

@@ -5,23 +5,12 @@
 {
   pkgs,
   inputs,
-  lib,
-  config,
   ...
 }:
 let
-  toml = pkgs.formats.toml { };
   rust-bin = inputs.rust-overlay.lib.mkRustBin { } pkgs;
 in
 {
-  home.file."${config.xdg.dataHome}/cargo/config.toml".source = toml.generate "config.toml" {
-    linker = "${lib.getExe pkgs.clang}";
-    rustflags = [
-      "-C"
-      "link-arg=-fuse-ld=${lib.getExe pkgs.mold}"
-    ];
-  };
-
   home.packages = with pkgs; [
     (rust-bin.stable.latest.default.override {
       extensions = [

users/ryan/programs/tealdeer.nix

@@ -7,7 +7,6 @@
     enable = true;
     settings = {
       display.compact = true;
-      updates.auto_update = true;
     };
   };
 }

users/ryan/programs/zsh.nix

@@ -21,8 +21,7 @@ in
     enableCompletion = true;
 
     envExtra = builtins.readFile ./zsh/envExtra.zsh;
-    # initExtraBeforeCompInit = builtins.readFile ./zsh/initExtraBeforeCompInit.zsh;
+    initContent = builtins.readFile ./zsh/initExtra.zsh;
-    initExtra = builtins.readFile ./zsh/initExtra.zsh;
 
     inherit shellAliases;