diff --git a/hosts/jellyfish/default.nix b/hosts/jellyfish/default.nix index 1fb3616..d3a35d9 100644 --- a/hosts/jellyfish/default.nix +++ b/hosts/jellyfish/default.nix @@ -1,8 +1,11 @@ { self, davids-dotfiles, ... }: let myUsername = "davidszakallas"; in { - imports = - [ davids-dotfiles.darwinModules.default "${self}/users/${myUsername}" ]; + imports = [ + davids-dotfiles.darwinModules.default + davids-dotfiles.darwinModules.homeapps + "${self}/users/${myUsername}" + ]; nix.settings.trusted-users = [ "root" myUsername ]; } diff --git a/modules/darwin/default/default.nix b/modules/darwin/default/default.nix index 2771429..c93521c 100644 --- a/modules/darwin/default/default.nix +++ b/modules/darwin/default/default.nix @@ -6,6 +6,10 @@ services.nix-daemon.enable = true; + homebrew.enable = true; + + homebrew.casks = [ "gpg-suite" "iterm2" ]; + # Create /etc/zshrc that loads the nix-darwin environment. programs.zsh = { enable = true; # default shell on catalina diff --git a/modules/darwin/homeapps/default.nix b/modules/darwin/homeapps/default.nix new file mode 100644 index 0000000..de254c2 --- /dev/null +++ b/modules/darwin/homeapps/default.nix @@ -0,0 +1,12 @@ +{ + homebrew.casks = [ + "calibre" + "discord" + "google-drive" + "signal" + "slack" + "spotify" + "syncthing" + "zoom" + ]; +} diff --git a/modules/home/default/darwin/default.nix b/modules/home/default/darwin/default.nix index bb8e0bf..e2b9756 100644 --- a/modules/home/default/darwin/default.nix +++ b/modules/home/default/darwin/default.nix @@ -14,6 +14,31 @@ in { }; }; + config.targets.darwin.defaults = { + NSGlobalDomain = { + NSAutomaticCapitalizationEnabled = false; + NSAutomaticDashSubstitutionEnabled = false; + NSAutomaticPeriodSubstitutionEnabled = false; + NSAutomaticQuoteSubstitutionEnabled = false; + NSAutomaticSpellingCorrectionEnabled = false; + + AppleMetricUnits = true; + AppleLocale = "en_US"; + }; + + "com.apple.desktopservices" = { + DSDontWriteNetworkStores = true; + DSDontWriteUSBStores = true; + }; + + "com.apple.finder" = { + AppleShowAllFiles = true; + ShowPathBar = true; + ShowStatusBar = true; + }; + + }; + config.programs.zsh.envExtra = mkIf brew.enable '' export HOMEBREW_PREFIX="${brew.prefix}" export PATH="${brew.prefix}/bin:$PATH"