From 4656d61be4ac20dd628d71d8f45c089ed534cfcd Mon Sep 17 00:00:00 2001 From: mat ess Date: Mon, 7 Nov 2022 20:14:52 -0500 Subject: [PATCH] Fix app copying --- flake.nix | 12 ++++++++++++ modules/home/programs/kitty/extras.nix | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index f31e34a..cd23165 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,11 @@ # Config "flag" for disabling homebrew homebrew-enabled.url = "github:boolean-option/true"; + # Module to workaround https://github.com/nix-community/home-manager/issues/1341 + home-manager-atemu.url = "github:Atemu/home-manager/darwin-copy-apps-fully-wip"; + home-manager-atemu.inputs.nixpkgs.follows = "nixpkgs-unstable"; + home-manager-atemu.inputs.utils.follows = "flake-utils"; + # Extra sources helix.url = "github:helix-editor/helix"; helix.inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -277,6 +282,13 @@ kitty = import ./home/kitty.nix; programs = import ./home/programs.nix; starship = import ./home/starship.nix; + install-apps = { + # fix app copying + imports = [ (import "${inputs.home-manager-atemu}/modules/targets/darwin.nix") ]; + disabledModules = [ "targets/darwin/linkapps.nix" ]; + darwin.installApps = true; + darwin.fullCopies = true; + }; # modules # TODO: migrate to helix # programs-kakoune-extras = import ./modules/home/programs/kakoune/extras.nix; diff --git a/modules/home/programs/kitty/extras.nix b/modules/home/programs/kitty/extras.nix index 286b2ed..0af2efe 100644 --- a/modules/home/programs/kitty/extras.nix +++ b/modules/home/programs/kitty/extras.nix @@ -115,7 +115,7 @@ in ]; home.activation = mkIf (pkgs.stdenv.isDarwin && cfg.fixIcon.enable) { - fixKittyIcon = lib.hm.dag.entryAfter [ "installPackages" "linkGeneration" ] '' + fixKittyIcon = lib.hm.dag.entryAfter [ "darwinApps" "linkGeneration" ] '' $DRY_RUN_CMD sudo /opt/homebrew/bin/fileicon set ${cfg.fixIcon.appPath} ${cfg.fixIcon.iconPath} ''; };