diff --git a/flake.lock b/flake.lock index f742241..3e63118 100644 --- a/flake.lock +++ b/flake.lock @@ -14,11 +14,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1720546205, - "narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=", + "lastModified": 1722339003, + "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=", "owner": "ryantm", "repo": "agenix", - "rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6", + "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7", "type": "github" }, "original": { @@ -372,11 +372,11 @@ ] }, "locked": { - "lastModified": 1722203588, - "narHash": "sha256-91V5FMSQ4z9bkhTCf0f86Zjw0bh367daSf0mzCIW0vU=", + "lastModified": 1722321190, + "narHash": "sha256-WeVWVRqkgrbLzmk6FfJoloJ7Xe7HWD27Pv950IUG2kI=", "owner": "nix-community", "repo": "home-manager", - "rev": "792757f643cedc13f02098d8ed506d82e19ec1da", + "rev": "4fcd54df7cbb1d79cbe81209909ee8514d6b17a4", "type": "github" }, "original": { @@ -420,6 +420,26 @@ "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0.tar.gz" } }, + "mkalias": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1678761502, + "narHash": "sha256-tL3C/b2BPOGQpV287wECDCDWmKwwPvezAAN3qz7N07M=", + "owner": "reckenrode", + "repo": "mkalias", + "rev": "8a5478cdb646f137ebc53cb9d235f8e5892ea00a", + "type": "github" + }, + "original": { + "owner": "reckenrode", + "repo": "mkalias", + "type": "github" + } + }, "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat_4", @@ -436,11 +456,11 @@ ] }, "locked": { - "lastModified": 1722299518, - "narHash": "sha256-0hRxk6iKiPeSNAxIauHtr3oDSoHcDkt4Ia3XXuGwy60=", + "lastModified": 1722378708, + "narHash": "sha256-MxG/Hfm7+BHIKXOAAoNJmTYvQ+EO0ezACqUYR55eQ4w=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "cbf1a4829aad170bcf35ca417617d3ff29f76267", + "rev": "e84a246c521f0c6348a0d01da3dfe0cd611f078a", "type": "github" }, "original": { @@ -533,11 +553,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1722278305, - "narHash": "sha256-xLBAegsn9wbj+pQfbX07kykd5VBV3Ywk3IbObVAAlWA=", + "lastModified": 1722332872, + "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "eab049fe178c11395d65a858ba1b56461ba9652d", + "rev": "14c333162ba53c02853add87a0000cbd7aa230c2", "type": "github" }, "original": { @@ -549,11 +569,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722264024, - "narHash": "sha256-gomyYQrlOltr2/prDRikRDQoPz+J5Qq6SEJrqVC5x2c=", + "lastModified": 1722309256, + "narHash": "sha256-Eqlu/hisMWE51b9YeKqehNaHLPhZOmkFkrx+VzI5YcM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fc5e08c73022f96cfeaefa2e087e8b713d47d201", + "rev": "3fcada1050e3820241590679838954bacf7d38f8", "type": "github" }, "original": { @@ -643,6 +663,7 @@ "git-hooks": "git-hooks", "home-manager": "home-manager", "lix-module": "lix-module", + "mkalias": "mkalias", "neovim-nightly-overlay": "neovim-nightly-overlay", "nifoc-overlay": "nifoc-overlay", "nix-darwin": "nix-darwin", @@ -754,11 +775,11 @@ ] }, "locked": { - "lastModified": 1721769617, - "narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=", + "lastModified": 1722330636, + "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009", + "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e791d24..6323456 100644 --- a/flake.nix +++ b/flake.nix @@ -80,6 +80,11 @@ flake-parts.follows = "flake-parts"; }; }; + + mkalias = { + url = "github:reckenrode/mkalias"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs@{ flake-parts, lix-module, deploy-rs, ... }: @@ -87,7 +92,7 @@ flake = let Styx = import ./system/flakes/Styx.nix { - inherit (inputs) nixpkgs home-manager nix-darwin agenix neovim-nightly-overlay nifoc-overlay; + inherit (inputs) nixpkgs home-manager nix-darwin agenix neovim-nightly-overlay mkalias nifoc-overlay; inherit lix-module; }; diff --git a/home/programs/amethyst.nix b/home/programs/amethyst.nix index f6d239d..1c19e6f 100644 --- a/home/programs/amethyst.nix +++ b/home/programs/amethyst.nix @@ -41,6 +41,7 @@ let "com.eltima.elmedia-setapp" "com.jonny.mona" "com.kapeli.dash-setapp" + "com.runningwithcrayons.Alfred" "com.sindresorhus.Dato-setapp" "com.tapbots.Ivory" ]; diff --git a/system/darwin/fake-homebrew.nix b/system/darwin/fake-homebrew.nix new file mode 100644 index 0000000..813f833 --- /dev/null +++ b/system/darwin/fake-homebrew.nix @@ -0,0 +1,14 @@ +{ pkgs, lib, ... }: + +{ + system.activationScripts.postUserActivation.text = + '' + echo "setting up fake Homebrew binaries..." + + current_user="$USER" + sudo -H mkdir -p /opt/homebrew/bin + sudo -H chown $current_user:staff /opt/homebrew/bin + + sudo -H -u "$current_user" ln -sfn ${lib.getExe pkgs.python3} /opt/homebrew/bin/python3 + ''; +} diff --git a/system/flakes/Styx.nix b/system/flakes/Styx.nix index 5219ac4..3bac504 100644 --- a/system/flakes/Styx.nix +++ b/system/flakes/Styx.nix @@ -1,9 +1,10 @@ -{ nixpkgs, lix-module, home-manager, nix-darwin, agenix, neovim-nightly-overlay, nifoc-overlay }: +{ nixpkgs, lix-module, home-manager, nix-darwin, agenix, neovim-nightly-overlay, mkalias, nifoc-overlay }: let default-system = "aarch64-darwin"; overlay-x86 = _: _: { pkgs-x86 = import nixpkgs { system = "x86_64-darwin"; }; }; + overlay-mkalias = _: _: { inherit (mkalias.packages.${default-system}) mkalias; }; nixpkgsConfig = { overlays = [ @@ -11,6 +12,7 @@ let agenix.overlays.default neovim-nightly-overlay.overlays.default nifoc-overlay.overlay + overlay-mkalias ]; config = { diff --git a/system/hosts/Styx.nix b/system/hosts/Styx.nix index 3691c80..69468e9 100644 --- a/system/hosts/Styx.nix +++ b/system/hosts/Styx.nix @@ -13,6 +13,7 @@ in ../darwin/attic.nix ../darwin/mas.nix + ../darwin/fake-homebrew.nix ]; nix = {