diff --git a/flake.lock b/flake.lock index ef0149d..c38c4d5 100644 --- a/flake.lock +++ b/flake.lock @@ -72,11 +72,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1726952185, - "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=", + "lastModified": 1727910534, + "narHash": "sha256-IjdGPDnBNk3r5h02kiPTKUOfn+UiKNWlhy/ozC0NgyQ=", "owner": "catppuccin", "repo": "nix", - "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1", + "rev": "bad96d3fabf8d2e8f0bf0c2cb899a9fccf01ea03", "type": "github" }, "original": { @@ -94,11 +94,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1727734424, - "narHash": "sha256-COHPdJb8goIemave9L8kBKkQKEPHuilXZqR3nIBcQsM=", + "lastModified": 1728001451, + "narHash": "sha256-Ost5YHSZZE4ZIKBcWsXC1c7g7n3kIqaNNjs5ula/lAI=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "fed2d39a7c4614311e25a4281d056a7a2d36a6c8", + "rev": "25f420d9cf70929455ba14642b92ae715ae8d792", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1727832939, - "narHash": "sha256-D6GX9ryYbP3Ocdo+6XMl5d81q1rLq1PGZ4ko4/l9ieQ=", + "lastModified": 1728092141, + "narHash": "sha256-u+UxketRUX1z240OUChcypvxlyJni/9uE0hK1QdRZVg=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "aa19665f9be0a5c30b97646b15c42366f8fa7cc1", + "rev": "4e1154ed7ff31817fe4b9a753d3d481940b0baa8", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1727707210, - "narHash": "sha256-8XZp5XO2FC6INZEZ2WlwErtvFVpl45ACn8CJ2hfTA0Y=", + "lastModified": 1727999297, + "narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "f61d5f2051a387a15817007220e9fb3bbead57b3", + "rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b", "type": "github" }, "original": { @@ -223,11 +223,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727897618, - "narHash": "sha256-/kDwhjXE7QIBP9vq6NyabnaTKuNzXO38jI2c0DsYWos=", + "lastModified": 1727905604, + "narHash": "sha256-8yyapsIQLOfpSVc7ibHxbQAk8J2vlcOVIfv4PU6ovEk=", "ref": "refs/heads/main", - "rev": "f48f46fe1fb69d8fb0e019cec2410a45e37c6e26", - "revCount": 26, + "rev": "06ebe03fc23d38e4e18de82f8e13b1391590207f", + "revCount": 27, "type": "git", "url": "https://git.pupbrained.xyz/pupbrained/nixmacs.git" }, @@ -265,11 +265,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1727591515, - "narHash": "sha256-ar9oGR8kT3S5K3b0EJrcZp1LjfYQdzWl/bBLCp2o50Y=", + "lastModified": 1727937235, + "narHash": "sha256-Ih4RD65WZZDgtla9Uh8zm6gQJ1zgkXkiU4HKtEwQjvI=", "owner": "nix-community", "repo": "fenix", - "rev": "c31647aab5e8a16087da6283ef9b2e6a9aae6772", + "rev": "381781f96b880c2ced9019a9e2406b31ccea82b4", "type": "github" }, "original": { @@ -783,11 +783,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": { @@ -803,11 +803,11 @@ ] }, "locked": { - "lastModified": 1727817100, - "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", + "lastModified": 1728041527, + "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", + "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", "type": "github" }, "original": { @@ -880,11 +880,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1727860939, - "narHash": "sha256-ZRYHQ/ZduCPxthuCFDYSDjKoSReYZy95rSm6ut8l/qE=", + "lastModified": 1728142617, + "narHash": "sha256-iPiCwcslVd+s2z0IoqTOZtP2XPEVB3TCq5zFUrzNA8g=", "ref": "refs/heads/main", - "rev": "e2426942e5716a742ea353d2a1de7d7760fbbb41", - "revCount": 5286, + "rev": "0ec6072a290051a03ab66cfb9bc616b2f5540e64", + "revCount": 5298, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -1080,11 +1080,11 @@ ] }, "locked": { - "lastModified": 1727453186, - "narHash": "sha256-nZRCfVEZ9osWXsCD0xCpU66M8JkabMTukBzPRrD/CTA=", + "lastModified": 1727865565, + "narHash": "sha256-SBcqfosxb0XlKdIz6QGXCnK4W/TEVHLDZHkRHZ8Me60=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3390ff2632d0d8a14c92473db60fa52bf881f979", + "rev": "703c0ac8432f3758987e0788248ddc1a8e0bf412", "type": "github" }, "original": { @@ -1265,11 +1265,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1727672256, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "lastModified": 1727907660, + "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", "type": "github" }, "original": { @@ -1374,10 +1374,10 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", - "path": "/nix/store/r2hk87rfvc5fpfbl2bj64a3x7mcq9f6c-source", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "path": "/nix/store/lryfc8mhk1czqsa421di2y5nzz5c3b8m-source", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "path" }, "original": { @@ -1401,10 +1401,10 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", - "path": "/nix/store/r2hk87rfvc5fpfbl2bj64a3x7mcq9f6c-source", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "path": "/nix/store/lryfc8mhk1czqsa421di2y5nzz5c3b8m-source", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "path" }, "original": { @@ -1430,11 +1430,11 @@ }, "nixpkgs_2": { "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": { @@ -1526,11 +1526,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -1565,11 +1565,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1727746745, - "narHash": "sha256-EP95VHCvjYxfJUz8QGibSEbLIfWS3Qz37s1xfgDBjeI=", + "lastModified": 1727996880, + "narHash": "sha256-Hm3ECx7gOSxoTLzhN7ni71APK/B2G37DR405coJqdwM=", "owner": "pupbrained", "repo": "nvim-config", - "rev": "853926edd453a7faa6febdd669d70a51d1153311", + "rev": "bb4666783362d4be9f5c48c46d55b0b4ff18aef9", "type": "github" }, "original": { @@ -1687,11 +1687,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1727465975, - "narHash": "sha256-jrr8r2CT9jsi6XDTTX+E39/CakTcQ9RYRp6rWGzLkk0=", + "lastModified": 1727778987, + "narHash": "sha256-OTI1eKQ3WIkj6q8PROpPY1vhaxYRdiS1btSfBowQPps=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "546339a7be357b3e95fc4b79a8816dce540d477b", + "rev": "e1a76671af2fbc74c84c18ba18fcda5e653d7531", "type": "github" }, "original": { @@ -1709,11 +1709,11 @@ ] }, "locked": { - "lastModified": 1727749966, - "narHash": "sha256-DUS8ehzqB1DQzfZ4bRXVSollJhu+y7cvh1DJ9mbWebE=", + "lastModified": 1728008962, + "narHash": "sha256-MjGMCVKqafsrqLQYJHHKXJkvocTjkxKjadBfN952/Zw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "00decf1b4f9886d25030b9ee4aed7bfddccb5f66", + "rev": "862d0c1e5fe2348a22044f225afef39b75df8cf0", "type": "github" }, "original": { @@ -2019,11 +2019,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1727431250, - "narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=", + "lastModified": 1727984844, + "narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "879b29ae9a0378904fbbefe0dadaed43c8905754", + "rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64", "type": "github" }, "original": { @@ -2034,11 +2034,11 @@ }, "unstable": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { diff --git a/homes/aarch64-darwin/marshall@canis/default.nix b/homes/aarch64-darwin/marshall@canis/default.nix index a67c3cc..5b50d85 100644 --- a/homes/aarch64-darwin/marshall@canis/default.nix +++ b/homes/aarch64-darwin/marshall@canis/default.nix @@ -69,9 +69,14 @@ tealdeer.enable = false; wezterm.extraConfig = builtins.readFile ./wezterm.lua; - emacs = { + jujutsu = { enable = true; - package = inputs.emacs.packages.${pkgs.system}.default; + settings = { + user = { + email = "mars@pupbrained.xyz"; + name = "Mars"; + }; + }; }; git = { diff --git a/systems/aarch64-darwin/canis/default.nix b/systems/aarch64-darwin/canis/default.nix index 1e46ac4..211a1eb 100644 --- a/systems/aarch64-darwin/canis/default.nix +++ b/systems/aarch64-darwin/canis/default.nix @@ -99,8 +99,8 @@ package = pkgs.skhd; skhdConfig = '' - alt - return : wezterm - alt - w : open -na "Arc" + alt - return : open -na "WezTerm" + alt - w : open -a "Arc" cmd - space : yabai -m window --toggle float