feat: reorganize, update

flake.lock

@@ -10,11 +10,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731138670,
+        "lastModified": 1731927628,
-        "narHash": "sha256-jZ+ZkjdCCQv9t31q31ZYx3X7VxynYUPltF9gmMigaB4=",
+        "narHash": "sha256-IqBX3qvvxR94mC6DePsTye6pHjhg40THvxUD405cm8U=",
         "owner": "ryanccn",
         "repo": "am",
-        "rev": "1d086d84e8dc0e133e275fe4b5dd84a8001fb66b",
+        "rev": "c33a08341bb05761e7900dd4316446c6ef08b444",
         "type": "github"
       },
       "original": {
@@ -25,11 +25,11 @@
     },
     "catppuccin": {
       "locked": {
-        "lastModified": 1731232837,
+        "lastModified": 1733001911,
-        "narHash": "sha256-0aIwr/RC/oe7rYkfJb47xjdEQDSNcqpFGsEa+EPlDEs=",
+        "narHash": "sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "32359bf226fe874d3b7a0a5753d291a4da9616fe",
+        "rev": "a817009ebfd2cca7f70a77884e5098d0a8c83f8e",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731235328,
+        "lastModified": 1733085484,
-        "narHash": "sha256-NjavpgE9/bMe/ABvZpyHIUeYF1mqR5lhaep3wB79ucs=",
+        "narHash": "sha256-dVmNuUajnU18oHzBQWZm1BQtANCHaqNuxTHZQ+GN0r8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "60bb110917844d354f3c18e05450606a435d2d10",
+        "rev": "c1fee8d4a60b89cae12b288ba9dbc608ff298163",
         "type": "github"
       },
       "original": {
@@ -83,11 +83,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731144068,
+        "lastModified": 1732778088,
-        "narHash": "sha256-3unl0edCutqvxQ5Wf00oiI/DgX/qJily5hBIgPnNWoY=",
+        "narHash": "sha256-qx4IbbDhEbi5ZWcBNVw/Frxz8UWjMRafVFeTMlt3120=",
         "owner": "ryanccn",
         "repo": "morlana",
-        "rev": "c3370463b96850d28db6103f756f1e242d796cc8",
+        "rev": "832662972c6a706ed0ba75196dafad1665cf68ba",
         "type": "github"
       },
       "original": {
@@ -103,11 +103,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731153869,
+        "lastModified": 1733047432,
-        "narHash": "sha256-3Ftf9oqOypcEyyrWJ0baVkRpvQqroK/SVBFLvU3nPuc=",
+        "narHash": "sha256-fQUKxgxAEHlL5bevRkdsQB7sSpAMhlvxf7Zw0KK8QIg=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "5c74ab862c8070cbf6400128a1b56abb213656da",
+        "rev": "e30a3622b606dffc622305b4bbe1cfe37e78fa40",
         "type": "github"
       },
       "original": {
@@ -118,11 +118,11 @@
     },
     "nix-filter": {
       "locked": {
-        "lastModified": 1730207686,
+        "lastModified": 1731533336,
-        "narHash": "sha256-SCHiL+1f7q9TAnxpasriP6fMarWE5H43t25F5/9e28I=",
+        "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
         "owner": "numtide",
         "repo": "nix-filter",
-        "rev": "776e68c1d014c3adde193a18db9d738458cd2ba4",
+        "rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
         "type": "github"
       },
       "original": {
@@ -138,11 +138,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731209121,
+        "lastModified": 1733024876,
-        "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=",
+        "narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3",
+        "rev": "6e0b7f81367069589a480b91603a10bcf71f3103",
         "type": "github"
       },
       "original": {
@@ -153,11 +153,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1730958623,
+        "lastModified": 1733064805,
-        "narHash": "sha256-JwQZIGSYnRNOgDDoIgqKITrPVil+RMWHsZH1eE1VGN0=",
+        "narHash": "sha256-7NbtSLfZO0q7MXPl5hzA0sbVJt6pWxxtGWbaVUDDmjs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "85f7e662eda4fa3a995556527c87b2524b691933",
+        "rev": "31d66ae40417bb13765b0ad75dd200400e98de84",
         "type": "github"
       },
       "original": {
@@ -177,11 +177,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731251221,
+        "lastModified": 1732541227,
-        "narHash": "sha256-eGPJzmVALvAUi73l7n+oZXEJl8eOK4Xnp3RK4LTZvk8=",
+        "narHash": "sha256-gbTRShWfwbHN8GcTXkWzaeNc5nVlEJf8Qe4bUT/CvL4=",
         "owner": "ryanccn",
         "repo": "nrr",
-        "rev": "6858072eb9bef36ebd558883b102d1e9252bb299",
+        "rev": "e3efbaf985e51fefc940993ee65f6ac3fdddcb8f",
         "type": "github"
       },
       "original": {
@@ -200,11 +200,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731123626,
+        "lastModified": 1732792649,
-        "narHash": "sha256-AoNxSBEEP/JsApHr91HhO8fUczNbbSDsSzvyeAdYQak=",
+        "narHash": "sha256-/qXj3b70ljGgaC0jbqh1X8YCaXFVqQrvciymtJpIDJg=",
         "owner": "ryanccn",
         "repo": "nyoom",
-        "rev": "c902d9c2a3a8bc343f068bd914fee716a3ccb5b9",
+        "rev": "27240cc8ef94ca0d6be28cad2c9121cae741c3eb",
         "type": "github"
       },
       "original": {
@@ -216,11 +216,11 @@
     "ohmyzsh": {
       "flake": false,
       "locked": {
-        "lastModified": 1730644558,
+        "lastModified": 1732784241,
-        "narHash": "sha256-rduWnGus/kiRk4qDnR9ifwZb+PnPPCs+aWHhT+M55WQ=",
+        "narHash": "sha256-31wI3wFGQ9YhEo7XguLSTNY0rvOFa+/MoFwDAZIo7ZY=",
         "owner": "ohmyzsh",
         "repo": "ohmyzsh",
-        "rev": "7ed475cb589c9e82211f71b3a5d7083b69cea93c",
+        "rev": "69a6359f7cf8978d464573fb7b023ee3cd00181a",
         "type": "github"
       },
       "original": {
@@ -245,6 +245,7 @@
         "ohmyzsh": "ohmyzsh",
         "rust-overlay": "rust-overlay",
         "spdx-gen": "spdx-gen",
+        "systems": "systems",
         "vivid-zsh": "vivid-zsh"
       }
     },
@@ -255,11 +256,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731378398,
+        "lastModified": 1733020719,
-        "narHash": "sha256-a0QWaiX8+AJ9/XBLGMDy6c90GD7HzpxKVdlFwCke5Pw=",
+        "narHash": "sha256-Chv9+3zrf1DhdB9JyskjoV0vJbCQEgkVqrU3p4RPLv8=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "0ae9fc2f2fe5361837d59c0bdebbda176427111e",
+        "rev": "8e18f10703112e6c33e1c0d8b93e8305f6f0a75c",
         "type": "github"
       },
       "original": {
@@ -278,11 +279,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730974437,
+        "lastModified": 1732279449,
-        "narHash": "sha256-qRE1YPO1vmvEnt8Re+9Fhj/wLzum27dqnuYDRKnUErc=",
+        "narHash": "sha256-LL1wSvrdTIuOEfGjBEQFbYTE+BmaiioQl9S1ZxRL1oQ=",
         "owner": "ryanccn",
         "repo": "spdx-gen",
-        "rev": "85245f610b7c7341dde620db2608e5b21f9438b7",
+        "rev": "4238a0e3e07f035529b4a5368b31093dad5b45b8",
         "type": "github"
       },
       "original": {
@@ -291,6 +292,21 @@
         "type": "github"
       }
     },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "vivid-zsh": {
       "flake": false,
       "locked": {

flake.nix

@@ -77,6 +77,10 @@
       url = "github:ryanccn/vivid-zsh";
       flake = false;
     };
+
+    systems = {
+      url = "github:nix-systems/default";
+    };
   };
 
   outputs =
@@ -84,32 +88,18 @@
       self,
       nixpkgs,
       nix-darwin,
-      home-manager,
+      systems,
-      nix-index-database,
-      darwin-custom-icons,
       ...
     }@inputs:
     let
       inherit (nixpkgs) lib;
-      systems = [
+      forAllSystems = lib.genAttrs (import systems);
-        "x86_64-linux"
-        "aarch64-linux"
-        "x86_64-darwin"
-        "aarch64-darwin"
-      ];
-
-      forAllSystems = lib.genAttrs systems;
     in
     {
       darwinConfigurations = {
         Ryans-MacBook-Pro = nix-darwin.lib.darwinSystem {
           modules = [
             ./modules/_module.nix
-
-            home-manager.darwinModules.home-manager
-            nix-index-database.darwinModules.nix-index
-            darwin-custom-icons.darwinModules.default
-
             ./system.nix
           ];
 

home/apps/vscode.nix

@@ -1,8 +1,8 @@
 {
   pkgs,
   lib,
-  # self,
   config,
+  # self,
   ...
 }:
 let
@@ -194,9 +194,9 @@ in
       "nix.enableLanguageServer" = true;
       "nix.serverPath" = lib.getExe pkgs.nil;
       "nix.serverSettings" = {
-        nil = {
+        "nil" = {
           formatting.command = [ (lib.getExe pkgs.nixfmt-rfc-style) ];
-          # nixpkgs.expr = "(builtins.getFlake \"${self}\").pkgs";
+          # nixpkgs.expr = "import (builtins.getFlake \"${self}\").inputs.nixpkgs { }";
         };
       };
 

home/default.nix

@@ -1,10 +1,15 @@
-{ config, inputs, ... }:
+{
+  config,
+  inputs,
+  ...
+}:
 {
   programs.home-manager.enable = true;
 
   imports = [
     inputs.catppuccin.homeManagerModules.catppuccin
     inputs.am.homeManagerModules.default
+    inputs.nix-index-database.hmModules.nix-index
 
     ./variables.nix
     ./fonts.nix
@@ -35,6 +40,8 @@
     logFile = "${config.home.homeDirectory}/Library/Logs/am-discord-rich-presence.log";
   };
 
+  programs.nix-index-database.comma.enable = true;
+
   catppuccin.flavor = "frappe";
   catppuccin.accent = "sapphire";
 

home/fonts.nix

@@ -4,11 +4,17 @@
     inter
     public-sans
 
-    flake'.packages.ibm-plex-compat
+    (flake'.packages.ibm-plex-compat.override {
+      families = [
+        "sans"
+        "serif"
+        "mono"
+      ];
+    })
+
     flake'.packages.ryan-mono-bin
 
-    # Install the variable fonts for Cascadia Code (which
+    # Install variable fonts for Cascadia Code instead of static fonts
-    # are recommended) instead of the static fonts
     (cascadia-code.overrideAttrs {
       installPhase = ''
         runHook preInstall
@@ -17,8 +23,6 @@
       '';
     })
 
-    (nerdfonts.override {
+    nerd-fonts.symbols-only
-      fonts = [ "NerdFontsSymbolsOnly" ];
-    })
   ];
 }

modules/nix.nix

@@ -50,6 +50,4 @@
     config.allowUnfree = true;
     hostPlatform = "aarch64-darwin";
   };
-
-  programs.nix-index-database.comma.enable = true;
 }

modules/packages.nix

@@ -1,4 +1,11 @@
-{ pkgs, inputs', ... }:
+{
+  pkgs,
+  inputs',
+  ...
+}:
+let
+  defaultPackage = name: inputs'.${name}.packages.default;
+in
 {
   environment.systemPackages = with pkgs; [
     nixfmt-rfc-style
@@ -25,8 +32,8 @@
     dprint
 
     # google-cloud-sdk
-    railway
+    # railway
-    cloudflared
+    # cloudflared
     # flyctl
 
     # btop
@@ -49,14 +56,14 @@
     xh
 
     typst
-    packwiz
-    # spicetify-cli
     exiftool
+    # packwiz
+    # spicetify-cli
 
-    inputs'.nrr.packages.default
+    (defaultPackage "nrr")
-    inputs'.am.packages.default
+    (defaultPackage "am")
-    inputs'.nyoom.packages.default
+    (defaultPackage "nyoom")
-    inputs'.morlana.packages.default
+    (defaultPackage "morlana")
-    inputs'.spdx-gen.packages.default
+    (defaultPackage "spdx-gen")
   ];
 }

packages/ibm-plex-compat.nix

@@ -1,23 +1,21 @@
 {
   ibm-plex,
-  fd,
   python312Packages,
+  families ? [ ],
 }:
-ibm-plex.overrideAttrs (_: {
+(ibm-plex.override { inherit families; }).overrideAttrs (_: {
   pname = "ibm-plex-compat";
 
   postInstall = ''
     set -eo pipefail
-    PATH="${fd}/bin:${python312Packages.fonttools}/bin:$PATH"
+    PATH="${python312Packages.fonttools}/bin:$PATH"
 
     cd "$out/share/fonts/opentype"
 
     ansi_green="\033[32m"
     ansi_reset="\033[0m"
 
-    medium_fonts=$(fd --extension=otf Medium)
+    for medium_font in $(find . -type f -name '*.otf' -and -name '*Medium*'); do
-
-    for medium_font in $medium_fonts; do
       echo -e "''${ansi_green}Patching''${ansi_reset} $medium_font (Medm -> Medium)"
 
       ttx_path="''${medium_font%.*}.ttx"
@@ -28,9 +26,7 @@ ibm-plex.overrideAttrs (_: {
       rm "$ttx_path"
     done
 
-    semibold_fonts=$(fd --extension=otf SemiBold)
+    for semibold_font in $(find . -type f -name '*.otf' -and -name '*SemiBold*'); do
-
-    for semibold_font in $semibold_fonts; do
       echo -e "''${ansi_green}Patching''${ansi_reset} $semibold_font (SmBld -> Semibold)"
 
       ttx_path="''${semibold_font%.*}.ttx"

packages/ryan-mono-bin.nix

@@ -1,63 +1,43 @@
 {
-  callPackage,
+  lib,
-  symlinkJoin,
+  stdenvNoCC,
+  fetchzip,
 }:
 let
-  version = "2024.05.26";
+  version = "2024.11.18";
 
-  mkFontVariant =
+  hashes = {
-    { variant, hash }:
+    "RyanMono" = "sha256-c+NRiWMMZEmX2ImFpvSboPEKYPuBahYsjAzddsYi1Lo=";
-    callPackage (
+    "RyanTerm" = "sha256-uYqK1ktgZPbhAOX3FyFWKDUSBDBQX6KtepT3PGcGuB0=";
-      {
+    # "RyanMonoNerdFont" = "sha256-CKBgRHXw6U3PjXruHCE+YsksHn+hJGjwWwtS9CbGcXg=";
-        lib,
+    # "RyanTermNerdFont" = "sha256-4GYYuZ//Ekk7jNi2zjxTMziaOOx4f2K17xcYIzOYAWc=";
-        fetchzip,
+  };
-        stdenvNoCC,
+in
-      }:
+stdenvNoCC.mkDerivation {
-      stdenvNoCC.mkDerivation {
+  pname = "ryan-mono-bin";
-        pname = variant;
   inherit version;
 
-        src = fetchzip {
+  srcs = lib.mapAttrsToList (
-          url = "https://github.com/ryanccn/ryan-mono/releases/download/v${version}/${variant}.tar.xz";
+    family: hash:
+    fetchzip {
+      url = "https://github.com/ryanccn/ryan-mono/releases/download/v${version}/${family}.tar.xz";
       inherit hash;
-        };
+    }
+  ) hashes;
+
+  sourceRoot = ".";
+  dontUnpack = true;
 
   installPhase = ''
     runHook preInstall
-          install -Dm644 *.ttf -t $out/share/fonts/truetype
+    find $srcs -type f -name '*.ttf' -exec install -Dm644 {} -t $out/share/fonts/truetype \;
     runHook postInstall
   '';
 
   meta = with lib; {
+    description = "Ryan's homemade Iosevka build";
     homepage = "https://github.com/ryanccn/ryan-mono";
     platforms = platforms.all;
     license = licenses.ofl;
   };
-      }
-    ) { };
-in
-symlinkJoin {
-  name = "ryan-mono-bin-${version}";
-
-  paths = [
-    (mkFontVariant {
-      variant = "RyanMono";
-      hash = "sha256-smlvBfpwVoD0qfmmHcJjsLdiblXjy5eevZfK4qDc9x8=";
-    })
-
-    (mkFontVariant {
-      variant = "RyanTerm";
-      hash = "sha256-12xaJqgR5R6SZnZ7vJeD5zg2TZbWEiUrdyK+ljekMvc=";
-    })
-
-    (mkFontVariant {
-      variant = "RyanMonoNerdFont";
-      hash = "sha256-n2d9K1rJuWCF2NgkRLQQCNCAxYfiBVv/jpn+BzqBvAI=";
-    })
-
-    (mkFontVariant {
-      variant = "RyanTermNerdFont";
-      hash = "sha256-yrzgNRD560FhHLSK1neHVSnB+ZiHP2bmKzD1pGTu9Ro=";
-    })
-  ];
 }

system.nix

@@ -7,6 +7,9 @@
 }:
 {
   imports = [
+    inputs.home-manager.darwinModules.home-manager
+    inputs.darwin-custom-icons.darwinModules.default
+
     ./modules/nix.nix
     ./modules/packages.nix
     ./modules/homebrew.nix