From 2725aa33e341f77762f23d29d589ac7c6d66cb27 Mon Sep 17 00:00:00 2001
From: Tobias Ostner <tobias.ostner@gmail.com>
Date: Thu, 21 Sep 2023 21:29:00 +0200
Subject: [PATCH] Delete yabai & skhd, install amethyst

---
 .config/nix/modules/darwin/default.nix       | 54 ++++++--------------
 .config/nix/modules/home-manager/default.nix |  6 +++
 2 files changed, 23 insertions(+), 37 deletions(-)

diff --git a/.config/nix/modules/darwin/default.nix b/.config/nix/modules/darwin/default.nix
index 8bf92e2..17714e0 100644
--- a/.config/nix/modules/darwin/default.nix
+++ b/.config/nix/modules/darwin/default.nix
@@ -21,58 +21,38 @@
     experimental-features = nix-command flakes
   '';
   services.nix-daemon.enable = true;
-  services.yabai = {
-    enable = true;
-    package = pkgs.yabai;
-    enableScriptingAddition = true;
-    config = {
-      layout = "bsp";
-      window_placement = "second_child";
-      top_padding = 8;
-      bottom_padding = 8;
-      left_padding = 8;
-      right_padding = 8;
-      window_gap = 8;
-      mouse_follows_focus = "on";
-      mouse_modifier = "alt";
-      mouse_action1 = "move";
-      mouse_action2 = "resize";
-      mouse_drop_action = "swap";
-    };
-    extraConfig = ''
-      yabai -m rule --add app="^System Settings$" manage=off
-    '';
-  };
-  services.skhd = {
-    enable = true;
-    skhdConfig = ''
-      alt - h : yabai -m window --focus west
-      alt - l : yabai -m window --focus east
-      alt  - j : yabai -m window --focus south
-      alt - k : yabai -m window --focus north
-      alt - p : yabei -m display --focus west
-      alt - n : yabei -m display --focus east
-      alt - y : yabai -m space --mirror x-axis
-      alt - m : yabai -m window --toggle zoom-fullscreen
-    '';
-  };
-  system.defaults = {  
+  system.defaults = {
     dock.autohide = true;
+    dock.autohide-time-modifier = 0.1;
+    dock.expose-animation-duration = 0.0;
     dock.mru-spaces = false;
     dock.orientation = "right";
     NSGlobalDomain.InitialKeyRepeat = 14;
     NSGlobalDomain.KeyRepeat = 1;
-    NSGlobalDomain.AppleFontSmoothing = 1;
+    NSGlobalDomain.AppleShowAllExtensions = true;
+    NSGlobalDomain.AppleShowAllFiles = true;
+    NSGlobalDomain."com.apple.mouse.tapBehavior" = 1;
     finder.AppleShowAllExtensions = true;
     finder.AppleShowAllFiles = true;
     finder.CreateDesktop = false;
+    finder.FXPreferredViewStyle = "Nlsv";
+    finder.QuitMenuItem = true;
+    finder._FXShowPosixPathInTitle = true;
+    menuExtraClock.ShowDate = 0;
+    menuExtraClock.ShowDayOfWeek = false;
   };
+  users.users.tobi.description = "Tobias Ostner";
   users.users.tobi.home = "/Users/tobi";
+  users.users.tobi.shell = pkgs.zshInteractive;
   homebrew = {
     enable = true;
     brews = [
       "imagemagick"
       "trippy"
     ];
+    casks = [
+      "firefox"
+      "amethyst"
+    ];
   };
 })
diff --git a/.config/nix/modules/home-manager/default.nix b/.config/nix/modules/home-manager/default.nix
index 63db22a..21d5d1f 100644
--- a/.config/nix/modules/home-manager/default.nix
+++ b/.config/nix/modules/home-manager/default.nix
@@ -48,4 +48,10 @@
       decorations = "Buttonless";
     };
   };
+  xdg.configFile."amethyst/amethyst.yml".text = ''
+    window-margins: true
+    window-margin-size: 10
+    mouse-swaps-windows: true
+    mouse-resizes-windows: true
+  '';
 }