diff options
author | Alan Pearce | 2024-11-30 21:38:39 +0100 |
---|---|---|
committer | Alan Pearce | 2024-11-30 21:38:39 +0100 |
commit | de1e5ecf311a20b28846563854b3cc544e5fcca3 (patch) | |
tree | abcb4eef80e6c23a44c3aceea255dfaa215565a4 | |
parent | a17bae694d7157ae231ab1d3e2315a24a5c0cdee (diff) | |
download | nixfiles-de1e5ecf311a20b28846563854b3cc544e5fcca3.tar.lz nixfiles-de1e5ecf311a20b28846563854b3cc544e5fcca3.tar.zst nixfiles-de1e5ecf311a20b28846563854b3cc544e5fcca3.zip |
update flake inputs, nerd-fonts renamed
-rw-r--r-- | flake.lock | 48 | ||||
-rw-r--r-- | user/settings/user-interface.nix | 16 |
2 files changed, 29 insertions, 35 deletions
diff --git a/flake.lock b/flake.lock index f2ca9a4c..de8cebf0 100644 --- a/flake.lock +++ b/flake.lock @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1732420287, - "narHash": "sha256-CzvYF4x6jUh/+NEEIFrIY5t1W/N3IA2bNZJiMXu9GTo=", + "lastModified": 1732603785, + "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "3c52583b99666a349a6219dc1f0dd07d75c82d6a", + "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a", "type": "github" }, "original": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1732216375, - "narHash": "sha256-gFDjpoaVV7QoMTvxVN/W58e5mh2+5zagNBAK4IPBgpQ=", + "lastModified": 1732907966, + "narHash": "sha256-59DP0vcqNjY8ct3rmMhD9D4y+yYR2j7hg2D/z14iO/M=", "owner": "tailscale", "repo": "golink", - "rev": "43d714d264ac76d2048c9fdcfdd4a98bb5c16d51", + "rev": "2ecf9ef4d51e9b3d27cb0c2ab0fb8a0ef4543b6e", "type": "github" }, "original": { @@ -311,11 +311,11 @@ ] }, "locked": { - "lastModified": 1732453510, - "narHash": "sha256-mAOaLu++YRwOxCJ135Bhgf78WYhIKWHL2aGWCAoXoBg=", + "lastModified": 1732884235, + "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd58a1132e9b7f121f65313bc662ad6c8a05f878", + "rev": "819f682269f4e002884702b87e445c82840c68f2", "type": "github" }, "original": { @@ -351,11 +351,11 @@ ] }, "locked": { - "lastModified": 1732461762, - "narHash": "sha256-3SMxtkXlmzPmF4NXCt6lLF2IkdyAmO824PlScUKVhB0=", + "lastModified": 1732519917, + "narHash": "sha256-AGXhwHdJV0q/WNgqwrR2zriubLr785b02FphaBtyt1Q=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "bedc30c64442579943c1c6e7579db263d810884f", + "rev": "f4a5ca5771ba9ca31ad24a62c8d511a405303436", "type": "github" }, "original": { @@ -366,11 +366,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1732483221, + "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", "type": "github" }, "original": { @@ -397,11 +397,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1732446744, - "narHash": "sha256-yXqgr+GiC/RBr8n/6Bn9eRagitXbKXNcoSaZUCovuwI=", + "lastModified": 1732951447, + "narHash": "sha256-ndq0dD5E6FkqwmNYFS1wUAHa/5HixS3jLjulogM+7/E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2570b87e71ea16daadf0a93f1eae2d3ad4478a94", + "rev": "57feb2a16f705eeffb075888d92a986e66473012", "type": "github" }, "original": { @@ -477,11 +477,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { @@ -493,11 +493,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1732758367, - "narHash": "sha256-RzaI1RO0UXqLjydtz3GAXSTzHkpb/lLD1JD8a0W4Wpo=", + "lastModified": 1718530797, + "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa42b5a5f401aab8a32bd33c9a4de0738180dc59", + "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "type": "github" }, "original": { diff --git a/user/settings/user-interface.nix b/user/settings/user-interface.nix index 5e1337ba..e46abb98 100644 --- a/user/settings/user-interface.nix +++ b/user/settings/user-interface.nix @@ -28,17 +28,11 @@ in [ inter input-fonts - # see https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/data/fonts/nerdfonts/shas.nix - (nerdfonts.override { - fonts = [ - "JetBrainsMono" - "IBMPlexMono" - "ZedMono" - "Recursive" - "NerdFontsSymbolsOnly" - ]; - }) - ] + ] ++ (with pkgs.nerd-fonts; [ + blex-mono + jetbrains-mono + recursive-mono + ]) ++ lib.optionals (!stdenv.isDarwin) (with pkgs; [ (discord.override { withOpenASAR = true; }) |