From a1115d88b4395d216c28044db96da4f42ddbb0b8 Mon Sep 17 00:00:00 2001 From: Mars Date: Wed, 2 Oct 2024 17:46:56 -0400 Subject: [PATCH] isoevka --- flake.lock | 58 ++++++++++++------------ modules/home/vscode/default.nix | 2 +- systems/aarch64-darwin/canis/default.nix | 27 ++++++++--- 3 files changed, 52 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 93d970d..ef0149d 100644 --- a/flake.lock +++ b/flake.lock @@ -137,11 +137,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1727746579, - "narHash": "sha256-DUfc08Zry3EJi9SutWopIEdADWm0lzcmnDIXEIFoYGU=", + "lastModified": 1727832939, + "narHash": "sha256-D6GX9ryYbP3Ocdo+6XMl5d81q1rLq1PGZ4ko4/l9ieQ=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "074bbcc4e3fa9ce4bee100de64506c3662c62299", + "rev": "aa19665f9be0a5c30b97646b15c42366f8fa7cc1", "type": "github" }, "original": { @@ -223,11 +223,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727638677, - "narHash": "sha256-VIsBA23C9rtOa7SUj4qdkMeOz64i/7yIeJ6+X6o5H64=", + "lastModified": 1727897618, + "narHash": "sha256-/kDwhjXE7QIBP9vq6NyabnaTKuNzXO38jI2c0DsYWos=", "ref": "refs/heads/main", - "rev": "44737fec37903d8d2dbabf0df0ba3e1580757c03", - "revCount": 23, + "rev": "f48f46fe1fb69d8fb0e019cec2410a45e37c6e26", + "revCount": 26, "type": "git", "url": "https://git.pupbrained.xyz/pupbrained/nixmacs.git" }, @@ -803,11 +803,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1727817100, + "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", "type": "github" }, "original": { @@ -880,11 +880,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1727714556, - "narHash": "sha256-l4cPDA3xGtGdQmdSCAO2VyWg9xwW6//KwDYefdWtovQ=", + "lastModified": 1727860939, + "narHash": "sha256-ZRYHQ/ZduCPxthuCFDYSDjKoSReYZy95rSm6ut8l/qE=", "ref": "refs/heads/main", - "rev": "5c6c300abfea2539ffad9bcbf857325eec5ab765", - "revCount": 5285, + "rev": "e2426942e5716a742ea353d2a1de7d7760fbbb41", + "revCount": 5286, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1265,11 +1265,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1727540905, - "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", + "lastModified": 1727672256, + "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", + "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", "type": "github" }, "original": { @@ -1374,9 +1374,10 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 0, + "lastModified": 1727634051, "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "path": "/nix/store/r2hk87rfvc5fpfbl2bj64a3x7mcq9f6c-source", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "path" }, "original": { @@ -1400,9 +1401,10 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 0, + "lastModified": 1727634051, "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "path": "/nix/store/r2hk87rfvc5fpfbl2bj64a3x7mcq9f6c-source", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "path" }, "original": { @@ -1524,11 +1526,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -1707,11 +1709,11 @@ ] }, "locked": { - "lastModified": 1727663505, - "narHash": "sha256-83j/GrHsx8GFUcQofKh+PRPz6pz8sxAsZyT/HCNdey8=", + "lastModified": 1727749966, + "narHash": "sha256-DUS8ehzqB1DQzfZ4bRXVSollJhu+y7cvh1DJ9mbWebE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c2099c6c7599ea1980151b8b6247a8f93e1806ee", + "rev": "00decf1b4f9886d25030b9ee4aed7bfddccb5f66", "type": "github" }, "original": { @@ -2032,11 +2034,11 @@ }, "unstable": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { diff --git a/modules/home/vscode/default.nix b/modules/home/vscode/default.nix index e70ea85..a546c6a 100644 --- a/modules/home/vscode/default.nix +++ b/modules/home/vscode/default.nix @@ -21,7 +21,7 @@ userSettings = { "files.autoSave" = "afterDelay"; - "editor.fontFamily" = "Maple Mono NF"; + "editor.fontFamily" = "Iosevka Comfy"; "editor.fontLigatures" = true; "editor.fontSize" = if pkgs.hostPlatform.isDarwin diff --git a/systems/aarch64-darwin/canis/default.nix b/systems/aarch64-darwin/canis/default.nix index e3e0107..1e46ac4 100644 --- a/systems/aarch64-darwin/canis/default.nix +++ b/systems/aarch64-darwin/canis/default.nix @@ -6,12 +6,27 @@ }: { environment.variables.FLAKE = "/Users/marshall/nix-config"; - fonts.packages = with pkgs; [ - font-awesome - inter - maple-mono - nerdfonts - ]; + fonts.packages = with pkgs; ([ + etBook + font-awesome + inter + maple-mono + nerdfonts + ] + ++ (with iosevka-comfy; [ + comfy + comfy-duo + comfy-fixed + comfy-motion + comfy-motion-duo + comfy-motion-fixed + comfy-wide + comfy-wide-duo + comfy-wide-fixed + comfy-wide-motion + comfy-wide-motion-duo + comfy-wide-motion-fixed + ])); networking = { computerName = "MacBook Air";