From e2c2928585561be61347d322492b51e328026af9 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Tue, 14 Mar 2023 09:52:31 +0100
Subject: [PATCH] Move some packages around on Mac

---
 config.nix            |  7 ++++-
 darwin/brew.nix       | 66 +++++++++++++++++++++----------------------
 home/kakoune/kak.nix  |  2 +-
 home/macbook-home.nix |  2 +-
 4 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/config.nix b/config.nix
index 69baf10..8fc40c3 100644
--- a/config.nix
+++ b/config.nix
@@ -1 +1,6 @@
-{ allowUnfree = true; }
+{
+  allowUnfree = true;
+  permittedInsecurePackages = [
+    "libressl-3.4.3"
+  ];
+}
diff --git a/darwin/brew.nix b/darwin/brew.nix
index 7245cb1..82a8524 100644
--- a/darwin/brew.nix
+++ b/darwin/brew.nix
@@ -25,52 +25,52 @@ with lib;
   ];
 
   homebrew.casks = [
-    "anki"
     "blackhole-2ch"
-    "eloston-chromium"
     "finicky"
     "inkscape"
     "yt-music"
+    "eloston-chromium"
 
     # CLI, but doesn't yet work on Nix
     # "sage"
   ];
 
+  # We don't really need to keep track of all these
   homebrew.masApps = {
-    # Safari Extensions
-    "Keepa - Price Tracker" = 1533805339;
-    "Vimari" = 1480933944;
-    "Bitwarden" = 1352778147;
-    "Save to Pocket" = 1477385213;
-    "AdGuard for Safari" = 1440147259;
-    "Refined GitHub" = 1519867270;
+    # # Safari Extensions
+    # "Keepa - Price Tracker" = 1533805339;
+    # "Vimari" = 1480933944;
+    # "Bitwarden" = 1352778147;
+    # "Save to Pocket" = 1477385213;
+    # "AdGuard for Safari" = 1440147259;
+    # "Refined GitHub" = 1519867270;
 
-    # Productivity
-    # "GoodNotes" = 1444383602;
-    "Amphetamine" = 937984704; # Turns off auto display dimming and sleep for some time
-    "Session Pal" = 1515213004;
-    "Flow" = 1423210932;
-    # "Taskheat" = 1431995750; # Always shown outdated!
-    "Hidden Bar" = 1452453066;
+    # # Productivity
+    # # "GoodNotes" = 1444383602;
+    # "Amphetamine" = 937984704; # Turns off auto display dimming and sleep for some time
+    # "Session Pal" = 1515213004;
+    # "Flow" = 1423210932;
+    # # "Taskheat" = 1431995750; # Always shown outdated!
+    # "Hidden Bar" = 1452453066;
 
-    # Development
-    "Developer" = 640199958;
-    # "Xcode" = 497799835;
+    # # Development
+    # "Developer" = 640199958;
+    # # "Xcode" = 497799835;
 
-    # Chat
-    "Messenger" = 1480068668;
-    "LINE" = 539883307;
-    "Slack" = 803453959;
+    # # Chat
+    # "Messenger" = 1480068668;
+    # "LINE" = 539883307;
+    # "Slack" = 803453959;
 
-    # Office
-    "Keynote" = 409183694;
-    "Microsoft Excel" = 462058435;
-    "The Unarchiver" = 425424353;
-    "Numbers" = 409203825;
-    "Pages" = 409201541;
-    ## Multimedia
-    "DaVinci Resolve" = 571213070;
-    "GarageBand" = 682658836;
-    "iMovie" = 408981434;
+    # # Office
+    # "Keynote" = 409183694;
+    # "Microsoft Excel" = 462058435;
+    # "The Unarchiver" = 425424353;
+    # "Numbers" = 409203825;
+    # "Pages" = 409201541;
+    # ## Multimedia
+    # "DaVinci Resolve" = 571213070;
+    # "GarageBand" = 682658836;
+    # "iMovie" = 408981434;
   };
 }
diff --git a/home/kakoune/kak.nix b/home/kakoune/kak.nix
index a3cce06..0df5ce2 100644
--- a/home/kakoune/kak.nix
+++ b/home/kakoune/kak.nix
@@ -35,7 +35,7 @@ let
     src = pkgs.sources.kak-lsp;
     buildInputs = (with pkgs;
       lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration CoreServices ])
-    ) ++ (with pkgs; [ libiconv libgcc ]);
+    ) ++ (with pkgs; [ libiconv ]);
   };
 
 in
diff --git a/home/macbook-home.nix b/home/macbook-home.nix
index e4d322b..6a0ac4e 100644
--- a/home/macbook-home.nix
+++ b/home/macbook-home.nix
@@ -13,7 +13,7 @@
 
   # Additional packages to be used only on this MacBook.
   home.packages = with pkgs; [
-    pkgs.x86.anki-bin
+    anki-bin
   ];
 
   # Additional settings for programs