From b042cb3358987ffc1b87796907ba24d52f108214 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Wed, 26 Apr 2023 04:59:37 +0200
Subject: [PATCH] feat(macos): remove sketchybar, add element

---
 home/apps/macos.nix          |  3 +--
 machines/sashimi/brew.nix    | 10 ++++++----
 machines/sashimi/default.nix | 12 ++----------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/home/apps/macos.nix b/home/apps/macos.nix
index df6685c..7ffe226 100644
--- a/home/apps/macos.nix
+++ b/home/apps/macos.nix
@@ -42,8 +42,7 @@ in {
           window_placement second_child \
           window_shadow float \
           active_window_border_color 0xfff5c2e7 \
-          normal_window_border_color 0xffcba6f7 \
-          external_bar all:32:0
+          normal_window_border_color 0xffcba6f7
 
         # auto-inject scripting additions
         yabai -m signal --add event=dock_did_restart action="sudo yabai --load-sa"
diff --git a/machines/sashimi/brew.nix b/machines/sashimi/brew.nix
index bced28e..1b9b897 100644
--- a/machines/sashimi/brew.nix
+++ b/machines/sashimi/brew.nix
@@ -2,12 +2,14 @@
   homebrew = {
     enable = true;
     caskArgs.require_sha = true;
-    onActivation.autoUpdate = true;
-    onActivation.upgrade = true;
+    onActivation = {
+      autoUpdate = true;
+      cleanup = "uninstall";
+      upgrade = true;
+    };
     brews = [
       "koekeishiya/formulae/yabai"
       "koekeishiya/formulae/skhd"
-      "felixkratz/formulae/sketchybar"
     ];
     casks = let
       skipSha = name: {
@@ -49,6 +51,7 @@
       (skipSha "affinity-designer")
       (skipSha "affinity-photo")
       (skipSha "affinity-publisher")
+      (skipSha "element")
       (skipSha "sizzy")
 
       # drivers
@@ -61,7 +64,6 @@
       "homebrew/cask-drivers"
       "homebrew/services"
       "koekeishiya/formulae"
-      "felixkratz/formulae"
     ];
   };
 }
diff --git a/machines/sashimi/default.nix b/machines/sashimi/default.nix
index ec07357..ca0be97 100644
--- a/machines/sashimi/default.nix
+++ b/machines/sashimi/default.nix
@@ -15,7 +15,6 @@
   in {
     computerName = name;
     hostName = name;
-    localHostName = name;
   };
 
   # Used for backwards compatibility, please read the changelog before changing.
@@ -25,13 +24,6 @@
   security.pam.enableSudoTouchIdAuth = true;
   system.defaults.alf.stealthenabled = 1;
 
-  services = {
-    # Auto upgrade nix package and the daemon service.
-    nix-daemon.enable = true;
-    dnsmasq = {
-      enable = true;
-      addresses."test" = "127.0.0.1";
-      bind = "127.0.0.1";
-    };
-  };
+  # Auto upgrade nix package and the daemon service.
+  services.nix-daemon.enable = true;
 }