Fix app copying

work
mat ess 2022-11-07 20:14:52 -05:00
parent 978be501a3
commit 4656d61be4
2 changed files with 13 additions and 1 deletions

View File

@ -22,6 +22,11 @@
# Config "flag" for disabling homebrew # Config "flag" for disabling homebrew
homebrew-enabled.url = "github:boolean-option/true"; 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 # Extra sources
helix.url = "github:helix-editor/helix"; helix.url = "github:helix-editor/helix";
helix.inputs.nixpkgs.follows = "nixpkgs-unstable"; helix.inputs.nixpkgs.follows = "nixpkgs-unstable";
@ -277,6 +282,13 @@
kitty = import ./home/kitty.nix; kitty = import ./home/kitty.nix;
programs = import ./home/programs.nix; programs = import ./home/programs.nix;
starship = import ./home/starship.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 # modules
# TODO: migrate to helix # TODO: migrate to helix
# programs-kakoune-extras = import ./modules/home/programs/kakoune/extras.nix; # programs-kakoune-extras = import ./modules/home/programs/kakoune/extras.nix;

View File

@ -115,7 +115,7 @@ in
]; ];
home.activation = mkIf (pkgs.stdenv.isDarwin && cfg.fixIcon.enable) { 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} $DRY_RUN_CMD sudo /opt/homebrew/bin/fileicon set ${cfg.fixIcon.appPath} ${cfg.fixIcon.iconPath}
''; '';
}; };