diff --git a/common/darwin/default.nix b/common/darwin/default.nix index 78f9b7b..2b03ddf 100644 --- a/common/darwin/default.nix +++ b/common/darwin/default.nix @@ -25,4 +25,60 @@ fonts.packages = with pkgs; [ nerd-fonts.jetbrains-mono ]; + + system = { + primaryUser = "reboot"; + + defaults = { + dock = { + # IF I WANTED MRU, I'D USE THE SAME FUCKIN' DESKTOP, APPLE. + mru-spaces = false; + }; + + trackpad = { + Clicking = true; + Dragging = true; + }; + + controlcenter = { + BatteryShowPercentage = true; + }; + + finder = { + ShowStatusBar = true; + NewWindowTarget = "Home"; + AppleShowAllFiles = true; + AppleShowAllExtensions = true; + }; + }; + }; + + homebrew = { + enable = true; + enableZshIntegration = true; + + casks = [ + # Web + "firefox@developer-edition" + + # Dev + "zed" + + # Security + "keepassxc" + + # Sync + "syncthing-app" + "tailscale-app" + + # Util + "vorssaint" + ]; + + brews = [ + "wget" + "neovim" + "tmux" + ]; + }; } diff --git a/common/home/dotfiles/.zshrc b/common/home/dotfiles/.zshrc index 4b9858c..99defcd 100644 --- a/common/home/dotfiles/.zshrc +++ b/common/home/dotfiles/.zshrc @@ -14,12 +14,6 @@ if [ -e /run/current-system/sw/bin ]; then PATH="$PATH:/run/current-system/sw/bin" fi -if [ -x /opt/homebrew/bin/brew ]; then - eval "$(/opt/homebrew/bin/brew shellenv)" -elif [ -d /opt/homebrew/bin ]; then - PATH="/opt/homebrew/bin:$PATH" -fi - if [ -e ~/dev/scripts/remind.sh ]; then source ~/dev/scripts/remind.sh fi diff --git a/darwin/mba15-thor-osx/default.nix b/darwin/mba15-thor-osx/default.nix index c157af7..9c6ea88 100644 --- a/darwin/mba15-thor-osx/default.nix +++ b/darwin/mba15-thor-osx/default.nix @@ -1 +1,21 @@ -{ ... }: {} +{ ... }: { + homebrew = { + casks = [ + # Dev + "utm" + "lm-studio" + "antigravity-cli" + + # Coms + "zoom" + "vesktop" + + # Object creation + "freecad" + "orcaslicer" + + # Games + "prismlauncher" + ]; + }; +}