diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 40c744c..cb5efa1 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,3 +9,7 @@ updates: directory: "/" schedule: interval: "weekly" + groups: + github-actions: + patterns: + - "*" diff --git a/.github/workflows/install-nix.sh b/.github/workflows/install-nix.sh index 4bea722..db62f10 100755 --- a/.github/workflows/install-nix.sh +++ b/.github/workflows/install-nix.sh @@ -48,7 +48,7 @@ installer_args=(install) case "$OSTYPE" in linux*) installer_args+=(linux) ;; darwin*) installer_args+=(macos) ;; - *) echo "unknown: $OSTYPE" ;; + *) echo "Aborting: unsupported OSTYPE $OSTYPE"; exit 1 ;; esac if [[ ! ($OSTYPE =~ darwin || -e /run/systemd/system) ]]; then diff --git a/flake.lock b/flake.lock index 9d83820..10c17d0 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1758956381, - "narHash": "sha256-ROUw5E8CibG3jEy6oHjrkF6/P60eiaUJmc2s2ecC/LM=", + "lastModified": 1760692571, + "narHash": "sha256-SgqC+B7F7hHDKug+zRUL83vhibCSknzhRl0+OxUYjn4=", "owner": "catppuccin", "repo": "nix", - "rev": "02dee881c3e644e2b561f407742f1fd927c40b83", + "rev": "8a084b86b6a4b2a1575e8cc67e07c4a687fce276", "type": "github" }, "original": { @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1760813311, + "narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8", "type": "github" }, "original": { @@ -105,11 +105,11 @@ ] }, "locked": { - "lastModified": 1758928860, - "narHash": "sha256-ZqaRdd+KoR54dNJPtd7UX4O0X+02YItnTpQVu28lSVI=", + "lastModified": 1760809591, + "narHash": "sha256-OxGcFcQdfOK8veZkPdQuqXIotFYiy4sBQB58dMNLeHY=", "owner": "nix-community", "repo": "home-manager", - "rev": "bc2afee55bc5d3b825287829d6592b9cc1405aad", + "rev": "870883ba11ba1c84f756c0c1f9fa74cdb2a16c1e", "type": "github" }, "original": { @@ -168,11 +168,11 @@ ] }, "locked": { - "lastModified": 1758805352, - "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=", + "lastModified": 1760721282, + "narHash": "sha256-aAHphQbU9t/b2RRy2Eb8oMv+I08isXv2KUGFAFn7nCo=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c", + "rev": "c3211fcd0c56c11ff110d346d4487b18f7365168", "type": "github" }, "original": { @@ -188,11 +188,11 @@ ] }, "locked": { - "lastModified": 1758427679, - "narHash": "sha256-xwjWRJTKDCjQ0iwfh7WhDhgcS0Wt3d1Yscg83mKBCn4=", + "lastModified": 1760846226, + "narHash": "sha256-xmU8kAsRprJiTGBTaGrwmjBP3AMA9ltlrxHKFuy5JWc=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "fd2569ca2ef7d69f244cd9ffcb66a0540772ff85", + "rev": "5024e1901239a76b7bf94a4cd27f3507e639d49e", "type": "github" }, "original": { @@ -203,18 +203,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758763312, - "narHash": "sha256-puBMviZhYlqOdUUgEmMVJpXqC/ToEqSvkyZ30qQ09xM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e57b3b16ad8758fd681511a078f35c416a8cc939", - "type": "github" + "lastModified": 315532800, + "narHash": "sha256-p66Sh7S87h/8T8cpSN6kW0ng+dp70X1tFZVahoCcYs0=", + "rev": "36226520e9f7a35bf341cbe3b6a1ff9047bec6d9", + "type": "tarball", + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre879700.36226520e9f7/nixexprs.tar.xz" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "tarball", + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" } }, "nrr": { @@ -283,11 +280,11 @@ ] }, "locked": { - "lastModified": 1758940228, - "narHash": "sha256-sTS04L9LKqzP1oiVXYDwcMzfFSF0DnSJQFzZBpEgLFE=", + "lastModified": 1760841560, + "narHash": "sha256-NVOl5Lk1QD+i4I4My4f85yjXBinu+OXOUWskPNtzKHs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5bfedf3fbbf5caf8e39f7fcd62238f54d82aa1e2", + "rev": "a9121dc4ccd63e0309426b91bd7a494189516274", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3d4aba3..1553555 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,7 @@ inputs = { nixpkgs = { - url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"; }; flake-parts = { diff --git a/packages/default.nix b/packages/default.nix index b0e52b9..f03caaa 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -8,7 +8,6 @@ { packages = { helix-with-lsps = pkgs.callPackage ./helix-with-lsps.nix { }; - ibm-plex-compat = pkgs.callPackage ./ibm-plex-compat.nix { }; ryan-mono-bin = pkgs.callPackage ./ryan-mono-bin.nix { }; }; }; diff --git a/packages/ibm-plex-compat.nix b/packages/ibm-plex-compat.nix deleted file mode 100644 index a551e1b..0000000 --- a/packages/ibm-plex-compat.nix +++ /dev/null @@ -1,46 +0,0 @@ -# SPDX-FileCopyrightText: 2025 Ryan Cao -# -# SPDX-License-Identifier: Apache-2.0 - -{ - ibm-plex, - python313Packages, - families ? [ ], -}: -(ibm-plex.override { inherit families; }).overrideAttrs (_: { - pname = "ibm-plex-compat"; - - postInstall = '' - set -eo pipefail - PATH="${python313Packages.fonttools}/bin:$PATH" - - cd "$out/share/fonts/opentype" - - ansi_green="\033[32m" - ansi_reset="\033[0m" - - for medium_font in $(find . -type f -name '*.otf' -and -name '*Medium*'); do - echo -e "''${ansi_green}Patching''${ansi_reset} $medium_font (Medm -> Medium)" - - ttx_path="''${medium_font%.*}.ttx" - - ttx "$medium_font" - substituteInPlace "$ttx_path" --replace-fail 'Medm' 'Medium' - ttx -f "$ttx_path" - rm "$ttx_path" - done - - for semibold_font in $(find . -type f -name '*.otf' -and -name '*SemiBold*'); do - echo -e "''${ansi_green}Patching''${ansi_reset} $semibold_font (SmBld -> Semibold)" - - ttx_path="''${semibold_font%.*}.ttx" - - ttx "$semibold_font" - substituteInPlace "$ttx_path" --replace-fail 'SmBld' 'Semibold' - ttx -f "$ttx_path" - rm "$ttx_path" - done - - echo -e "''${ansi_green}Done!''${ansi_reset}" - ''; -}) diff --git a/systems/caladan/nix.nix b/systems/caladan/nix.nix index 21d0ec9..3322598 100644 --- a/systems/caladan/nix.nix +++ b/systems/caladan/nix.nix @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -{ pkgs, ... }: +{ pkgs, lib, ... }: { nix.package = pkgs.nixVersions.latest; @@ -41,8 +41,9 @@ ]; nixpkgs = { - config.allowUnfree = true; hostPlatform = "aarch64-darwin"; + # config.allowUnfree = true; + config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ ]; }; environment.variables = { diff --git a/users/ryan/catppuccin.nix b/users/ryan/catppuccin.nix index 6778786..ad99e04 100644 --- a/users/ryan/catppuccin.nix +++ b/users/ryan/catppuccin.nix @@ -4,8 +4,8 @@ { catppuccin = { - flavor = "macchiato"; - accent = "sapphire"; + flavor = "frappe"; + accent = "blue"; bat.enable = true; eza.enable = true; diff --git a/users/ryan/fonts.nix b/users/ryan/fonts.nix index ac2c81c..a5c3275 100644 --- a/users/ryan/fonts.nix +++ b/users/ryan/fonts.nix @@ -11,7 +11,7 @@ in pkgs.inter pkgs.lxgw-wenkai - (pkgs'.ibm-plex-compat.override { + (pkgs.ibm-plex.override { families = [ "sans" "serif" diff --git a/users/ryan/variables.nix b/users/ryan/variables.nix index 532a802..07aa905 100644 --- a/users/ryan/variables.nix +++ b/users/ryan/variables.nix @@ -15,8 +15,6 @@ HF_HUB_DISABLE_TELEMETRY = "1"; STORYBOOK_DISABLE_TELEMETRY = "1"; - FNM_RESOLVE_ENGINES = "true"; - DENO_NO_UPDATE_CHECK = "1"; CSC_IDENTITY_AUTO_DISCOVERY = "false"; @@ -25,9 +23,12 @@ LESSHISTFILE = "${config.xdg.stateHome}/less/history"; NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc"; + NPM_CONFIG_INIT_MODULE = "${config.xdg.configHome}/npm/config/npm-init.js"; + NPM_CONFIG_CACHE = "${config.xdg.cacheHome}/npm"; CARGO_HOME = "${config.xdg.dataHome}/cargo"; DOCKER_CONFIG = "${config.xdg.configHome}/docker"; FLY_CONFIG_DIR = "${config.xdg.stateHome}/fly"; GRADLE_USER_HOME = "${config.xdg.dataHome}/gradle"; + GNUPGHOME = "${config.xdg.dataHome}/gnupg"; }; }