From 5effa69f8e7facafdd97f0dd1f101cc07444759e Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Thu, 20 Apr 2023 14:49:20 +0200 Subject: [PATCH 1/5] [nix] Add some system packages --- nix/darwin-configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nix/darwin-configuration.nix b/nix/darwin-configuration.nix index 639a2b9..e0c0bd4 100644 --- a/nix/darwin-configuration.nix +++ b/nix/darwin-configuration.nix @@ -12,6 +12,9 @@ libtool pcre pkg-config + patchelf + gnutls + gsasl # CLI tools act From 8c48ec955e0afda2a5facff9a8ef3d4af2e91ca2 Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Thu, 20 Apr 2023 14:49:40 +0200 Subject: [PATCH 2/5] [nix] Fix the annoying brew issue --- nix/darwin-configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/darwin-configuration.nix b/nix/darwin-configuration.nix index e0c0bd4..ddfc4d8 100644 --- a/nix/darwin-configuration.nix +++ b/nix/darwin-configuration.nix @@ -84,6 +84,7 @@ brews = [ "composer" "ddev" + "mkcert" "pkg-config" "sdl2" ]; @@ -101,7 +102,6 @@ "google-chrome" "itch" "iterm2" - "nss" "obs" "raycast" "sequel-ace" From 748e9750837f73df1f653e6873cfd7904b700dd3 Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Thu, 20 Apr 2023 14:50:03 +0200 Subject: [PATCH 3/5] [nix] Fix nix flags not applying --- nix/darwin-configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nix/darwin-configuration.nix b/nix/darwin-configuration.nix index ddfc4d8..c11d659 100644 --- a/nix/darwin-configuration.nix +++ b/nix/darwin-configuration.nix @@ -122,6 +122,9 @@ settings = { experimental-features = [ "nix-command" "flakes" ]; }; + extraOptions = '' + experimental-features = nix-command flakes + ''; gc = { automatic = true; options = "--delete-older-than 8d"; From 5552c1bb4339eaaff7125502dd476c00584c25cd Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Thu, 20 Apr 2023 14:50:31 +0200 Subject: [PATCH 4/5] [nix] Add some of the infra tools --- nix/darwin-configuration.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nix/darwin-configuration.nix b/nix/darwin-configuration.nix index c11d659..522f618 100644 --- a/nix/darwin-configuration.nix +++ b/nix/darwin-configuration.nix @@ -20,6 +20,7 @@ act bat bitwarden-cli + cloudflared delta exa ffmpeg @@ -28,10 +29,12 @@ gitui gnupg jq + kubectl mosh neovim nixpkgs-fmt ripgrep + sops vim wget From eac1886b6ed24eb39e2588f24ed5bf5c310cecc0 Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Thu, 20 Apr 2023 14:51:17 +0200 Subject: [PATCH 5/5] [nix] Misc software --- nix/darwin-configuration.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nix/darwin-configuration.nix b/nix/darwin-configuration.nix index 522f618..21dc483 100644 --- a/nix/darwin-configuration.nix +++ b/nix/darwin-configuration.nix @@ -25,6 +25,7 @@ exa ffmpeg fzf + gh git gitui gnupg @@ -39,6 +40,7 @@ wget # Programs + jetbrains.idea-ultimate jetbrains.phpstorm jetbrains.rider rectangle