From 361959d426e45bf44077e0d49f54a034395a36e3 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Tue, 29 Apr 2025 18:38:38 -0700 Subject: don't install packages via homebrew We can install everything through nix at this point. Add a helper function to check the type of the machine so we can install some packages for work vs. personal. --- nix/machines/darwin-shared.nix | 12 ++---------- nix/machines/hq-kwny2vh41p/default.nix | 5 +---- nix/machines/mba-m2/default.nix | 8 +------- 3 files changed, 4 insertions(+), 21 deletions(-) (limited to 'nix/machines') diff --git a/nix/machines/darwin-shared.nix b/nix/machines/darwin-shared.nix index 03239b2..5f46ce8 100644 --- a/nix/machines/darwin-shared.nix +++ b/nix/machines/darwin-shared.nix @@ -80,6 +80,8 @@ services.nix-daemon.enable = true; + environment.shells = [ pkgs.fish ]; + programs.fish.enable = true; programs.fish.shellInit = '' # Nix @@ -119,16 +121,6 @@ cleanup = "uninstall"; upgrade = true; }; - - brews = [ - "repomix" - ]; - - casks = [ - "docker" - "iterm2" - "vlc" - ]; }; programs.ssh.knownHosts = { diff --git a/nix/machines/hq-kwny2vh41p/default.nix b/nix/machines/hq-kwny2vh41p/default.nix index 5910d09..1ae15f2 100644 --- a/nix/machines/hq-kwny2vh41p/default.nix +++ b/nix/machines/hq-kwny2vh41p/default.nix @@ -1,9 +1,6 @@ -{ pkgs, ... }: +{ ... }: { imports = [ ../darwin-shared.nix ]; system.stateVersion = 5; - - programs.fish.enable = true; - environment.shells = [ pkgs.fish ]; } diff --git a/nix/machines/mba-m2/default.nix b/nix/machines/mba-m2/default.nix index 04c5780..2e7faf6 100644 --- a/nix/machines/mba-m2/default.nix +++ b/nix/machines/mba-m2/default.nix @@ -1,14 +1,8 @@ -{ pkgs, ... }: +{ ... }: { imports = [ ../darwin-shared.nix ]; system.stateVersion = 5; networking.hostName = "mba-m2"; - - programs.fish.enable = true; - environment.shells = [ pkgs.fish ]; - - # brew packages I only want to get installed on this machine - homebrew.casks = [ "zoom" ]; } -- cgit v1.2.3