diff --git a/hosts/Rhizome/dock.nix b/hosts/Rhizome/dock.nix index 4614d2f6..fb422dab 100644 --- a/hosts/Rhizome/dock.nix +++ b/hosts/Rhizome/dock.nix @@ -19,7 +19,7 @@ "/Applications/Things3.app" "/Applications/Craft.app" "/System/Applications/Messages.app" - "${pkgs.slack}/Applications/Slack.app" + "/Applications/Slack.app" ]; }; } diff --git a/hosts/Rhizome/programs.nix b/hosts/Rhizome/programs.nix index 3a8eb057..a0925976 100644 --- a/hosts/Rhizome/programs.nix +++ b/hosts/Rhizome/programs.nix @@ -8,28 +8,16 @@ m-cli mas mochi - slack the-unarchiver - zoom-us ]; homebrew = { enable = true; casks = [ - { - name = "boltai"; - greedy = true; - } "dash" "legcord" "nook" - "plex" "textual" - "whatsapp" - - # Work apps - "linear-linear" - "notion" ]; # N.B.: Removed entries in `masApps` require manual uninstallation masApps = { @@ -108,9 +96,4 @@ enable = true; startOnActivation = true; }; - - programs.tailscale = { - enable = true; - startOnActivation = true; - }; } diff --git a/modules/base/unfree-packages.nix b/modules/base/unfree-packages.nix index 7850d1c3..89c20fda 100644 --- a/modules/base/unfree-packages.nix +++ b/modules/base/unfree-packages.nix @@ -13,11 +13,8 @@ "graphite-cli" "mochi" "open-webui" - "plexmediaserver" "roon-server" - "slack" "soundsource" "the-unarchiver" - "zoom" ]; } diff --git a/modules/darwin/programs/default.nix b/modules/darwin/programs/default.nix index e6aee576..2702813c 100644 --- a/modules/darwin/programs/default.nix +++ b/modules/darwin/programs/default.nix @@ -11,6 +11,5 @@ ./roon.nix ./scroll-reverser.nix ./soundsource.nix - ./tailscale.nix ]; } diff --git a/modules/darwin/programs/tailscale.nix b/modules/darwin/programs/tailscale.nix deleted file mode 100644 index 568a40d4..00000000 --- a/modules/darwin/programs/tailscale.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; let - cfg = config.programs.tailscale; -in { - options.programs.tailscale = { - enable = mkEnableOption "Tailscale"; - - startOnActivation = mkEnableOption "starting Tailscale on activation"; - }; - - config = mkIf cfg.enable { - homebrew.casks = [ - { - name = "tailscale-app"; - greedy = true; - } - ]; - system.disableUpdates = ["io.tailscale.ipn.macsys"]; - system.startOnActivation = mkIf cfg.startOnActivation { - "Tailscale" = "/Applications/Tailscale.app/"; - }; - }; -}