diff --git a/darwin/default.nix b/darwin/default.nix index b616312..41c45d2 100644 --- a/darwin/default.nix +++ b/darwin/default.nix @@ -57,6 +57,7 @@ home = "/Users/${user}"; }; + system.primaryUser = user; system.defaults = { CustomUserPreferences = { NSGlobalDomain = { diff --git a/darwin/homebrew.nix b/darwin/homebrew.nix index 3ee69e3..9c075a9 100644 --- a/darwin/homebrew.nix +++ b/darwin/homebrew.nix @@ -44,6 +44,10 @@ rectangle = mkEnableOption "Enable Rectangle"; rectangle-pro = mkEnableOption "Enable Rectangle Pro"; emacs = mkEnableOption "Enable Emacs"; + drawio = mkEnableOption "Enable draw.io"; + parsify = mkEnableOption "Enable Parsify"; + soulver = mkEnableOption "Enable Soulver"; + pika = mkEnableOption "Enable Pika"; }; config = lib.mkMerge [ @@ -249,5 +253,25 @@ "emacs-plus" ]; }) + (lib.mkIf config.custom.brew.drawio { + homebrew.casks = [ + "drawio" + ]; + }) + (lib.mkIf config.custom.brew.parsify { + homebrew.casks = [ + "parsify" + ]; + }) + (lib.mkIf config.custom.brew.soulver { + homebrew.casks = [ + "soulver" + ]; + }) + (lib.mkIf config.custom.brew.pika { + homebrew.casks = [ + "pika" + ]; + }) ]; } diff --git a/flake.lock b/flake.lock index d3cabfe..060ed22 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1746795192, - "narHash": "sha256-Cv+RXuzmn2iGBY2Ny/nXBTH+LFKDWIvMxf9a+btKI6M=", + "lastModified": 1748148946, + "narHash": "sha256-srnyYAqGD27NeBDaEU3hchJdkeOQ2vRe3kWurihFYT8=", "owner": "Homebrew", "repo": "brew", - "rev": "6f39076b3c2251994419215279d0525ef667fc31", + "rev": "dc0f9d50fd170492a33fd7234d06de1b94df363c", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "4.5.2", + "ref": "4.5.3", "repo": "brew", "type": "github" } @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1746729224, - "narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=", + "lastModified": 1748225455, + "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", "owner": "nix-community", "repo": "disko", - "rev": "85555d27ded84604ad6657ecca255a03fd878607", + "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", "type": "github" }, "original": { @@ -55,11 +55,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -143,17 +143,16 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs": "nixpkgs", "zig": "zig", "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1746806042, - "narHash": "sha256-Hx92i3f5IjHaWpReyCKvGdqG55bZFU3wxGzA3wv9VLA=", + "lastModified": 1748372068, + "narHash": "sha256-JeZWDzY1f//amtQSU7TmwAqG8qeyBIdx7JBfgzhEkdY=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "7f9bb3c0e54f585e11259bc0c9064813d061929c", + "rev": "ad632f10687c087bc45319aad6c8ee272269e5f9", "type": "github" }, "original": { @@ -171,11 +170,11 @@ ] }, "locked": { - "lastModified": 1746537231, - "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -212,11 +211,11 @@ ] }, "locked": { - "lastModified": 1746892839, - "narHash": "sha256-0b9us0bIOgA1j/s/6zlxVyP3m97yAh0U+YwKayJ6mmU=", + "lastModified": 1748391243, + "narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=", "owner": "nix-community", "repo": "home-manager", - "rev": "12e67385964d9c9304daa81d0ad5ba3b01fdd35e", + "rev": "f5b12be834874f7661db4ced969a621ab2d57971", "type": "github" }, "original": { @@ -249,11 +248,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1746902608, - "narHash": "sha256-sQ/jlqwzmdB8TMC95QWoSGZlYJyHVX6F3lIROJheXEs=", + "lastModified": 1748396468, + "narHash": "sha256-/Gj7CaN6FbNclLAH42y7nEz8YR2kfbwK2vgtAqddYs8=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "031905379a385a18fc9d2a9bb43b29520b09c182", + "rev": "114665418ef815540022339b1b6c5da345b7b2de", "type": "github" }, "original": { @@ -265,11 +264,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1746900684, - "narHash": "sha256-dSY5hgqWx5OPEBXXFAvxZ6S4V7oprlRM32TAoHPhMZg=", + "lastModified": 1748398569, + "narHash": "sha256-krLoQwSftJtLQtoofa03EEYu7uP3xGt12qGA3MIrI0M=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "c538a4745d0187387ede7cddfb5cc5d2bdc8bd40", + "rev": "e6a55e76d313f884c2ef8d00df842a1062e4850e", "type": "github" }, "original": { @@ -315,7 +314,7 @@ "cl-nix-lite": "cl-nix-lite", "flake-compat": "flake-compat_3", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "systems": "systems_2" }, "locked": { @@ -339,11 +338,11 @@ ] }, "locked": { - "lastModified": 1746708654, - "narHash": "sha256-GeC99gu5H6+AjBXsn5dOhP4/ApuioGCBkufdmEIWPRs=", + "lastModified": 1748352827, + "narHash": "sha256-sNUUP6qxGkK9hXgJ+p362dtWLgnIWwOCmiq72LAWtYo=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "6cb36e8327421c61e5a3bbd08ed63491b616364a", + "rev": "44a7d0e687a87b73facfe94fba78d323a6686a90", "type": "github" }, "original": { @@ -353,36 +352,16 @@ "type": "github" } }, - "nix-darwin_2": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1716329735, - "narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-homebrew": { "inputs": { - "brew-src": "brew-src", - "nix-darwin": "nix-darwin_2", - "nixpkgs": "nixpkgs_3" + "brew-src": "brew-src" }, "locked": { - "lastModified": 1746844491, - "narHash": "sha256-69KEURmqcFU0db6LkSiaxxdRhgkTXLVGskuR5RLOvk4=", + "lastModified": 1748379893, + "narHash": "sha256-7zvNSdEA4KhKA3vosAU3QdzGgSBKxTR2iUEredA8tLc=", "owner": "zhaofengli", "repo": "nix-homebrew", - "rev": "fae199aa8b9a259aa8500aefea9e62b23d5ff007", + "rev": "77517445732b9ae0b413e4580b1c8e88f804da1c", "type": "github" }, "original": { @@ -398,11 +377,11 @@ ] }, "locked": { - "lastModified": 1746330942, - "narHash": "sha256-ShizFaJCAST23tSrHHtFFGF0fwd72AG+KhPZFFQX/0o=", + "lastModified": 1748145500, + "narHash": "sha256-t9fx0l61WOxtWxXCqlXPWSuG/0XMF9DtE2T7KXgMqJw=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "137fd2bd726fff343874f85601b51769b48685cc", + "rev": "a98adbf54d663395df0b9929f6481d4d80fc8927", "type": "github" }, "original": { @@ -413,11 +392,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746814339, - "narHash": "sha256-hf2lICJzwACWuzHCmZn5NI6LUAOgGdR1yh8ip+duyhk=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3c5e12673265dfb0de3d9121420c0c2153bf21e0", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -428,6 +407,37 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1748189127, + "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz" + } + }, + "nixpkgs-firefox-darwin": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1748394362, + "narHash": "sha256-XDEHo8SjRuGSzGqvGG4iRShLDa8yL65iRM2+hi1bZeQ=", + "owner": "bandithedoge", + "repo": "nixpkgs-firefox-darwin", + "rev": "7d37224d9b7b8e315d37095772ca732df7ea40b6", + "type": "github" + }, + "original": { + "owner": "bandithedoge", + "repo": "nixpkgs-firefox-darwin", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1732617236, "narHash": "sha256-PYkz6U0bSEaEB1al7O1XsqVNeSNS+s3NVclJw7YC43w=", @@ -443,102 +453,23 @@ "type": "github" } }, - "nixpkgs-firefox-darwin": { - "inputs": { - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1746891730, - "narHash": "sha256-AAJdk2IG+azEVm4Uy7RhkDMbTaoQ87XbnkuCnbXdrYo=", - "owner": "bandithedoge", - "repo": "nixpkgs-firefox-darwin", - "rev": "4a2ba4462b5aa95fd26079a7e755618fb6d3b9a9", - "type": "github" - }, - "original": { - "owner": "bandithedoge", - "repo": "nixpkgs-firefox-darwin", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1741992157, - "narHash": "sha256-nlIfTsTrMSksEJc1f7YexXiPVuzD1gOfeN1ggwZyUoc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "da4b122f63095ca1199bd4d526f9e26426697689", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1741865919, - "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1687274257, - "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", - "path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source", - "rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5", - "type": "path" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_3": { "locked": { - "lastModified": 1746328495, - "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", - "owner": "NixOS", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { - "locked": { - "lastModified": 1746663147, - "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1746683680, "narHash": "sha256-+5zk+UbG0+GQlKt+gIKm+OhlYvHmkAHFXvf7hl1HDeM=", @@ -569,7 +500,7 @@ "nix-homebrew": "nix-homebrew", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-firefox-darwin": "nixpkgs-firefox-darwin", "sops-nix": "sops-nix", "treefmt-nix": "treefmt-nix", @@ -583,11 +514,11 @@ ] }, "locked": { - "lastModified": 1746485181, - "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -633,11 +564,11 @@ ] }, "locked": { - "lastModified": 1746216483, - "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", + "lastModified": 1748243702, + "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", + "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", "type": "github" }, "original": { @@ -654,11 +585,11 @@ ] }, "locked": { - "lastModified": 1746901443, - "narHash": "sha256-fG5B8lWJqtVPgebXtjoPLhPESkzOnqsM0omKY85/A1M=", + "lastModified": 1748387888, + "narHash": "sha256-f3O26vbN1r8ylC7KtEwjzAmKRRFu+jK+vVuQF2ynTsQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "954c70bb7b27882cccf7e282d304ef894344eee8", + "rev": "a5bf612551ffd48cbae957c386203d1175dba3cf", "type": "github" }, "original": { @@ -678,15 +609,15 @@ ], "nixpkgs": [ "ghostty", - "nixpkgs-stable" + "nixpkgs" ] }, "locked": { - "lastModified": 1741825901, - "narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=", + "lastModified": 1748261582, + "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "0b14285e283f5a747f372fb2931835dd937c4383", + "rev": "aafb1b093fb838f7a02613b719e85ec912914221", "type": "github" }, "original": { @@ -703,7 +634,7 @@ ], "nixpkgs": [ "ghostty", - "nixpkgs-unstable" + "nixpkgs" ] }, "locked": { diff --git a/home/emacs/config/pre-early-init.el b/home/emacs/config/pre-early-init.el index 18def29..c3d247e 100644 --- a/home/emacs/config/pre-early-init.el +++ b/home/emacs/config/pre-early-init.el @@ -27,3 +27,11 @@ (frame-resize-pixelwise . t))) ;; (setq default-frame-alist '((ns-appearance . dark) ;; (ns-transparent-titlebar . t))) + +(setenv "LIBRARY_PATH" + (mapconcat 'identity + '( + "/opt/homebrew/opt/gcc/lib/gcc/14" + "/opt/homebrew/opt/libgccjit/lib/gcc/14" + "/opt/homebrew/opt/gcc/lib/gcc/14/gcc/aarch64-apple-darwin24/14") + ":")) diff --git a/hosts/dango/default.nix b/hosts/dango/default.nix index 5d3dea8..ece2c87 100644 --- a/hosts/dango/default.nix +++ b/hosts/dango/default.nix @@ -49,6 +49,9 @@ swish = true; rectangle = false; emacs = true; + drawio = true; + soulver = true; + pika = true; }; };