This commit is contained in:
Mars 2024-10-02 17:46:56 -04:00
parent ee5244c63f
commit a1115d88b4
Signed by: pupbrained
GPG key ID: 874E22DF2F9DFCB5
3 changed files with 52 additions and 35 deletions

View file

@ -137,11 +137,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1727746579, "lastModified": 1727832939,
"narHash": "sha256-DUfc08Zry3EJi9SutWopIEdADWm0lzcmnDIXEIFoYGU=", "narHash": "sha256-D6GX9ryYbP3Ocdo+6XMl5d81q1rLq1PGZ4ko4/l9ieQ=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "074bbcc4e3fa9ce4bee100de64506c3662c62299", "rev": "aa19665f9be0a5c30b97646b15c42366f8fa7cc1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -223,11 +223,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1727638677, "lastModified": 1727897618,
"narHash": "sha256-VIsBA23C9rtOa7SUj4qdkMeOz64i/7yIeJ6+X6o5H64=", "narHash": "sha256-/kDwhjXE7QIBP9vq6NyabnaTKuNzXO38jI2c0DsYWos=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "44737fec37903d8d2dbabf0df0ba3e1580757c03", "rev": "f48f46fe1fb69d8fb0e019cec2410a45e37c6e26",
"revCount": 23, "revCount": 26,
"type": "git", "type": "git",
"url": "https://git.pupbrained.xyz/pupbrained/nixmacs.git" "url": "https://git.pupbrained.xyz/pupbrained/nixmacs.git"
}, },
@ -803,11 +803,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727383923, "lastModified": 1727817100,
"narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ffe2d07e771580a005e675108212597e5b367d2d", "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -880,11 +880,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1727714556, "lastModified": 1727860939,
"narHash": "sha256-l4cPDA3xGtGdQmdSCAO2VyWg9xwW6//KwDYefdWtovQ=", "narHash": "sha256-ZRYHQ/ZduCPxthuCFDYSDjKoSReYZy95rSm6ut8l/qE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "5c6c300abfea2539ffad9bcbf857325eec5ab765", "rev": "e2426942e5716a742ea353d2a1de7d7760fbbb41",
"revCount": 5285, "revCount": 5286,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@ -1265,11 +1265,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1727540905, "lastModified": 1727672256,
"narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fbca5e745367ae7632731639de5c21f29c8744ed", "rev": "1719f27dd95fd4206afb9cec9f415b539978827e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1374,9 +1374,10 @@
}, },
"nixpkgs_15": { "nixpkgs_15": {
"locked": { "locked": {
"lastModified": 0, "lastModified": 1727634051,
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
"path": "/nix/store/r2hk87rfvc5fpfbl2bj64a3x7mcq9f6c-source", "path": "/nix/store/r2hk87rfvc5fpfbl2bj64a3x7mcq9f6c-source",
"rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -1400,9 +1401,10 @@
}, },
"nixpkgs_17": { "nixpkgs_17": {
"locked": { "locked": {
"lastModified": 0, "lastModified": 1727634051,
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
"path": "/nix/store/r2hk87rfvc5fpfbl2bj64a3x7mcq9f6c-source", "path": "/nix/store/r2hk87rfvc5fpfbl2bj64a3x7mcq9f6c-source",
"rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -1524,11 +1526,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1727634051, "lastModified": 1727802920,
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1707,11 +1709,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727663505, "lastModified": 1727749966,
"narHash": "sha256-83j/GrHsx8GFUcQofKh+PRPz6pz8sxAsZyT/HCNdey8=", "narHash": "sha256-DUS8ehzqB1DQzfZ4bRXVSollJhu+y7cvh1DJ9mbWebE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "c2099c6c7599ea1980151b8b6247a8f93e1806ee", "rev": "00decf1b4f9886d25030b9ee4aed7bfddccb5f66",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2032,11 +2034,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1727634051, "lastModified": 1727802920,
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -21,7 +21,7 @@
userSettings = { userSettings = {
"files.autoSave" = "afterDelay"; "files.autoSave" = "afterDelay";
"editor.fontFamily" = "Maple Mono NF"; "editor.fontFamily" = "Iosevka Comfy";
"editor.fontLigatures" = true; "editor.fontLigatures" = true;
"editor.fontSize" = "editor.fontSize" =
if pkgs.hostPlatform.isDarwin if pkgs.hostPlatform.isDarwin

View file

@ -6,12 +6,27 @@
}: { }: {
environment.variables.FLAKE = "/Users/marshall/nix-config"; environment.variables.FLAKE = "/Users/marshall/nix-config";
fonts.packages = with pkgs; [ fonts.packages = with pkgs; ([
etBook
font-awesome font-awesome
inter inter
maple-mono maple-mono
nerdfonts 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 = { networking = {
computerName = "MacBook Air"; computerName = "MacBook Air";