diff --git a/modules/darwin/creative.nix b/modules/darwin/creative.nix index 47debaa..6e91da4 100644 --- a/modules/darwin/creative.nix +++ b/modules/darwin/creative.nix @@ -7,14 +7,22 @@ in with lib; { # Inkscape { name = "inkscape"; + greedy = true; } # 3dprinting { name = "ultimaker-cura"; + greedy = true; } # { name = "orcaslicer"; } - { name = "freecad"; } - { name = "solvespace"; } + { + name = "freecad"; + greedy = true; + } + { + name = "solvespace"; + greedy = true; + } ]; }; } diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index 91c0d7e..2d722cc 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -102,28 +102,77 @@ in { }; taps = [ "homebrew/cask-versions" "homebrew/services" ]; casks = lib.mkMerge [ - (lib.mkIf config.nathan.programs.firefox [{ name = "firefox"; }]) - (lib.mkIf config.nathan.programs.virtualization [{ name = "utm"; }]) - (lib.mkIf config.nathan.programs.devel.python [{ name = "miniconda"; }]) + (lib.mkIf config.nathan.programs.firefox [{ + name = "firefox"; + greedy = true; + }]) + (lib.mkIf config.nathan.programs.virtualization [{ + name = "utm"; + greedy = true; + }]) + (lib.mkIf config.nathan.programs.devel.python [{ + name = "miniconda"; + greedy = true; + }]) (lib.mkIf config.nathan.programs.communications.enable [ - { name = "discord"; } - { name = "betterdiscord-installer"; } - { name = "signal"; } - { name = "orangedrangon-android-messages"; } - { name = "messenger"; } - { name = "whalebird"; } - { name = "slack"; } - { name = "zulip"; } + { + name = "discord"; + greedy = true; + } + { + name = "betterdiscord-installer"; + greedy = true; + } + { + name = "signal"; + greedy = true; + } + { + name = "orangedrangon-android-messages"; + greedy = true; + } + { + name = "messenger"; + greedy = true; + } + { + name = "whalebird"; + greedy = true; + } + { + name = "slack"; + greedy = true; + } + { + name = "zulip"; + greedy = true; + } ]) # Unconditionally install core utilites [ - { name = "keepingyouawake"; } - { name = "flux"; } - { name = "iterm2"; } - { name = "gpg-suite"; } - { name = "amethyst"; } + { + name = "keepingyouawake"; + greedy = true; + } + { + name = "flux"; + greedy = true; + } + { + name = "iterm2"; + greedy = true; + } + { + name = "gpg-suite"; + greedy = true; + } + { + name = "amethyst"; + greedy = true; + } { name = "podman-desktop"; + greedy = true; } # Original is unmaintaned, wait for this fork # https://github.com/UeharaYou/HiddenBar diff --git a/modules/darwin/games.nix b/modules/darwin/games.nix index e589dd0..44b9655 100644 --- a/modules/darwin/games.nix +++ b/modules/darwin/games.nix @@ -2,5 +2,10 @@ let np = config.nathan.programs; in with lib; { # Install media applications - config = mkIf np.games.enable { homebrew.casks = [{ name = "steam"; }]; }; + config = mkIf np.games.enable { + homebrew.casks = [{ + name = "steam"; + greedy = true; + }]; + }; } diff --git a/modules/darwin/media.nix b/modules/darwin/media.nix index e77cdec..7f88601 100644 --- a/modules/darwin/media.nix +++ b/modules/darwin/media.nix @@ -4,10 +4,22 @@ in with lib; { # Install media applications config = mkIf np.media.enable { homebrew.casks = [ - { name = "eqmac"; } - { name = "deadbeef-nightly"; } - { name = "jellyfin-media-player"; } - { name = "spotify"; } + { + name = "eqmac"; + greedy = true; + } + { + name = "deadbeef-nightly"; + greedy = true; + } + { + name = "jellyfin-media-player"; + greedy = true; + } + { + name = "spotify"; + greedy = true; + } ]; }; }