diff --git a/cask.nix b/cask.nix index 8ccdeea..c92e3f8 100644 --- a/cask.nix +++ b/cask.nix @@ -22,9 +22,11 @@ "balenaetcher" # Apps + "obsidian" "figma" "arc" "firefox" + "zen-browser" "bitwarden" "spotify" "vlc" diff --git a/darwin.nix b/darwin.nix index be32962..f71d15e 100644 --- a/darwin.nix +++ b/darwin.nix @@ -20,6 +20,13 @@ # Nix Darwin # https://daiderd.com/nix-darwin/manual/index.html + # networking.hosts = { + # "127.0.0.1" = [ + # "localhost" + # "dev.buena.com" + # ]; + # }; + system.defaults = { # Security screensaver.askForPassword = true; @@ -81,8 +88,12 @@ enable = true; casks = (import ./cask.nix) ++ (lib.attrByPath [ "extras" "casks" ] [ ] host); taps = [ "lihaoyun6/tap" ]; + global = { + autoUpdate = true; + }; onActivation = { autoUpdate = true; + upgrade = true; cleanup = "zap"; }; }; diff --git a/flake.lock b/flake.lock index 32d58d0..90f3b7a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1742246081, - "narHash": "sha256-1e4oFbtdOOb6NqauHevWWjEUXZnfZ6RUAJJjn9i4YBc=", + "lastModified": 1745764360, + "narHash": "sha256-GJEUJpZLkczMN6HXD0wdFX6KyDbvZe3v5orUhqEfK6w=", "owner": "nix-community", "repo": "home-manager", - "rev": "c657142e24a43ea1035889f0b0a7c24598e0e18a", + "rev": "50bb714a8259b0c29b6c3429099a3b837771dab4", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1742165923, - "narHash": "sha256-WKzuVsHXjuxYjS9KxKdpoPWpT37LofyS5llSssEw058=", + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "95eac71bf52b271523d0ca81dbbeb3182990fc24", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742206328, - "narHash": "sha256-q+AQ///oMnyyFzzF4H9ShSRENt3Zsx37jTiRkLkXXE0=", + "lastModified": 1745377448, + "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "096478927c360bc18ea80c8274f013709cf7bdcd", + "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c", "type": "github" }, "original": { diff --git a/home/pkgs.nix b/home/pkgs.nix index f99e983..f6d5f9b 100644 --- a/home/pkgs.nix +++ b/home/pkgs.nix @@ -21,6 +21,7 @@ with pkgs; woff2 bat rsync + yq # Dev devenv @@ -51,6 +52,7 @@ with pkgs; tex-fmt rustup shfmt + go # Fonts nerd-fonts.jetbrains-mono diff --git a/hosts/mac14.nix b/hosts/mac14.nix index c19b3ec..a544060 100644 --- a/hosts/mac14.nix +++ b/hosts/mac14.nix @@ -2,4 +2,15 @@ username = "cupcakearmy"; hostName = "mac14"; platform = "aarch64-darwin"; + + extras = { + casks = [ + "surfshark" + ]; + pkgs = + pkgs: with pkgs; [ + biome + infisical + ]; + }; } diff --git a/secrets/ssh/config b/secrets/ssh/config index c3abf7e..df88853 100644 Binary files a/secrets/ssh/config and b/secrets/ssh/config differ