fix: combine all brews and resolve finder/dock entries

profiles/shared/modules/default.nix

@@ -12,7 +12,7 @@
  type = types.str;
  };
 
- modules = { };
+ programs = { };
  };
  };
 }

profiles/shared/modules/dock.nix

@@ -76,23 +76,21 @@ in
  in
  {
  home = {
- packages = with pkgs; [
- dockutil
- ];
+ activation = {
+ updateDockEntries = ''
+ echo >&2 "Setting up dock items..."
+ haveURIs="$(${pkgs.dockutil}/bin/dockutil --list | ${pkgs.coreutils}/bin/cut -f2)"
+ if ! diff -wu <(echo -n "$haveURIs") <(echo -n '${wantURIs}') >&2; then
+ echo >&2 "Resetting dock"
+ ${pkgs.dockutil}/bin/dockutil --no-restart --remove all
+ ${createEntries}
+ killall Dock
+ else
+ echo >&2 "Dock is how we want it"
+ fi
+ '';
+ };
  };
-
- system.activationScripts.postUserActivation.text = ''
- echo >&2 "Setting up dock items..."
- haveURIs="$(${pkgs.dockutil}/bin/dockutil --list | ${pkgs.coreutils}/bin/cut -f2)"
- if ! diff -wu <(echo -n "$haveURIs") <(echo -n '${wantURIs}') >&2; then
- echo >&2 "Resetting dock"
- ${pkgs.dockutil}/bin/dockutil --no-restart --remove all
- ${createEntries}
- killall Dock
- else
- echo >&2 "Dock is how we want it"
- fi
- '';
  }
  );
 }

profiles/shared/modules/finder.nix

@@ -55,22 +55,20 @@ in
  in
  {
  home = {
- packages = with pkgs; [
- mysides
- ];
+ activation = {
+ updateFinderEntries = ''
+ echo >&2 "Setting up finder items..."
+ haveURIs="$(${pkgs.mysides}/bin/mysides list | ${pkgs.coreutils}/bin/cut -d' ' -f3)"
+ if ! diff -wu <(echo -n "$haveURIs") <(echo -n '${wantURIs}') >&2; then
+ echo >&2 "Resetting finder"
+ ${pkgs.mysides}/bin/mysides remove all
+ ${createEntries}
+ else
+ echo >&2 "Finder is how we want it"
+ fi
+ '';
+ };
  };
-
- system.activationScripts.postUserActivation.text = ''
- echo >&2 "Setting up finder items..."
- haveURIs="$(${pkgs.mysides}/bin/mysides list | ${pkgs.coreutils}/bin/cut -d' ' -f3)"
- if ! diff -wu <(echo -n "$haveURIs") <(echo -n '${wantURIs}') >&2; then
- echo >&2 "Resetting finder"
- ${pkgs.mysides}/bin/mysides remove all
- ${createEntries}
- else
- echo >&2 "Finder is how we want it"
- fi
- '';
  }
  );
 }

profiles/shared/programs/default.nix

@@ -2,40 +2,14 @@
 
 {
  imports = [
- # ./act.nix
- # ./alfred.nix
- # ./alttab.nix
- # ./appcleaner.nix
- # ./browser.nix
- # ./chat.nix
- # ./clouds.nix
- # ./develop.nix
- # ./docker.nix
- # ./etcher.nix
- # ./gaming.nix
- # ./gnupg.nix
- # ./golang.nix
- # ./graphics.nix
- # ./hammerspoon.nix
- # ./ice.nix
- # ./itsycal.nix
- # ./joplin.nix
- # ./kube.nix
- # ./kya.nix
- # ./macdown.nix
- # ./music.nix
- # ./nextcloud.nix
- # ./ngrok.nix
- # ./office.nix
- # ./onlyswitch.nix
- # ./password.nix
- # ./rectangle.nix
- # ./stats.nix
- # ./streaming.nix
- # ./terminal.nix
- # ./utm.nix
- # ./work.nix
- # ./yubikey.nix
+ ./act.nix
+ ./clouds.nix
+ ./develop.nix
+ ./gnupg.nix
+ ./golang.nix
+ ./hammerspoon.nix
+ ./kube.nix
+ ./ngrok.nix
  ];
 
  options = with lib; {