From 5507d25639f7e4b64afc7246d7860d2e3ea6a550 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Fri, 8 Sep 2023 16:49:45 -0400 Subject: [PATCH] Setup Homebrew stuff for macOS --- flake.nix | 4 +- modules/darwin/default.nix | 111 ++++++++++++++++++++++++++++--------- 2 files changed, 89 insertions(+), 26 deletions(-) diff --git a/flake.nix b/flake.nix index 575a9d0..2ae8573 100644 --- a/flake.nix +++ b/flake.nix @@ -66,7 +66,9 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - users."gene.liverman".imports = [ ./modules/home-manager ]; + users."gene.liverman".imports = [ + ./modules/home-manager + ]; }; } ]; # end modules diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index a02e0f3..0f9427d 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -1,23 +1,6 @@ { pkgs, ... }: { - nix.extraOptions = '' - # Generated by https://github.com/DeterminateSystems/nix-installer, version 0.11.0. - extra-nix-path = nixpkgs=flake:nixpkgs - experimental-features = nix-command flakes auto-allocate-uids - build-users-group = nixbld - bash-prompt-prefix = (nix:$name)\040 - ''; - - fonts.fontDir.enable = false; # True will uninstall other fonts, false installs, but doesn't uninstall - fonts.fonts = [ (pkgs.nerdfonts.override { fonts = [ - "Hack" - "SourceCodePro" - ]; }) ]; - - programs.zsh.enable = true; - - services.nix-daemon.enable = true; system.stateVersion = 4; - users.users."gene.liverman".home = "/Users/gene.liverman"; + environment = { shells = with pkgs; [ bash zsh ]; loginShell = pkgs.zsh; @@ -27,23 +10,19 @@ ]; systemPackages = with pkgs; [ coreutils - #adr-tools chart-testing colordiff dog dos2unix - # dust - + du-dust subversion # git-svn - gotop # helm hub hugo - kopia - # kubernetes-cli + # kubectl kubectx mas mtr @@ -57,5 +36,87 @@ yq ]; }; -} + fonts.fontDir.enable = false; # True will uninstall other fonts, false installs, but doesn't uninstall + fonts.fonts = [ (pkgs.nerdfonts.override { fonts = [ + "Hack" + "SourceCodePro" + ]; }) ]; + + homebrew = { + enable = true; + onActivation = { + autoUpdate = true; + cleanup = "zap"; + upgrade = true; + }; + taps = [ + "hashicorp/tap" + # "homebrew/bundle" + # "homebrew/cask-fonts" + # "jandedobbeleer/oh-my-posh" + "null-dev/firefox-profile-switcher" + "puppetlabs/puppet" + ]; + brews = [ + "adr-tools" + ]; + casks = [ + "1password" + "amethyst" + "audacity" + "cakebrew" + "elgato-stream-deck" + "firefox" + # "font-hack-nerd-font" + # "font-inconsolata-g-for-powerline" + # "font-source-code-pro-for-powerline" + "google-drive" + "iterm2" + "keepingyouawake" + "kopiaui" + "libreoffice" + "logseq" + "meld" + "nextcloud" + "obs" + "onlyoffice" + "pdk" + "puppet-bolt" + "qmk-toolbox" + "raycast" + "signal" + "slack" + "tailscale" + "thunderbird" + "vagrant" + "virtualbox" + "visual-studio-code" + "vivaldi" + "vlc" + "whatsapp" + "zenmap" + "zoom" + ]; + }; + + nix = { + settings = { + bash-prompt-prefix = "(nix:$name)\040"; + build-users-group = "nixbld"; + experimental-features = [ + "auto-allocate-uids" + "flakes" + "nix-command" + ]; + }; + extraOptions = '' + # Generated by https://github.com/DeterminateSystems/nix-installer, version 0.11.0. + extra-nix-path = nixpkgs=flake:nixpkgs + ''; + }; + + services.nix-daemon.enable = true; + + users.users."gene.liverman".home = "/Users/gene.liverman"; +}