From 7a7b9cc01b6e00b6029c72ff6d744d52ad0c2aed Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Thu, 25 Sep 2025 15:30:04 -0500
Subject: [PATCH] fixes

---
 modules/home/programs/hyprland/default.nix    | 48 +++++++++----------
 modules/home/programs/hyprland/options.nix    |  2 +-
 modules/home/programs/nwg-panel/options.nix   |  2 +-
 .../aarch64-linux/macbook-pro-nixos/boot.nix  |  2 +
 .../macbook-pro-nixos/default.nix             |  2 +
 5 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/modules/home/programs/hyprland/default.nix b/modules/home/programs/hyprland/default.nix
index 9763e17..1653529 100644
--- a/modules/home/programs/hyprland/default.nix
+++ b/modules/home/programs/hyprland/default.nix
@@ -58,7 +58,7 @@ in
       polkit_gnome
       qt5.qtwayland
       qt6.qtwayland
-      rofi-wayland
+      rofi
       waybar
       wayland-protocols
       wayland-utils
@@ -207,7 +207,7 @@ in
       systemd.enable = true;
 
       plugins = with pkgs.hyprlandPlugins; [
-        hyprgrass
+        # hyprgrass
       ];
 
       settings = {
@@ -498,37 +498,37 @@ in
               send_cancel = "0";
             };
 
-            hyprgrass-bind = [
-              # swipe left from right edge
-              ", edge:r:l, workspace, +1"
+            # hyprgrass-bind = [
+            #   # swipe left from right edge
+            #   ", edge:r:l, workspace, +1"
 
-              # swipe up from bottom edge
-              ", edge:d:u, exec, ${cfg.defaultApps.browser.pname}"
+            #   # swipe up from bottom edge
+            #   ", edge:d:u, exec, ${cfg.defaultApps.browser.pname}"
 
-              # swipe down from left edge
-              ", edge:l:d, exec, pactl set-sink-volume @DEFAULT_SINK@ -4%"
+            #   # swipe down from left edge
+            #   ", edge:l:d, exec, pactl set-sink-volume @DEFAULT_SINK@ -4%"
 
-              # swipe down with 4 fingers
-              ", swipe:4:d, killactive"
+            #   # swipe down with 4 fingers
+            #   ", swipe:4:d, killactive"
 
-              # swipe diagonally left and down with 3 fingers
-              # l (or r) must come before d and u
-              ", swipe:3:ld, exec, foot"
+            #   # swipe diagonally left and down with 3 fingers
+            #   # l (or r) must come before d and u
+            #   ", swipe:3:ld, exec, foot"
 
-              # tap with 3 fingers
-              ", tap:3, exec, foot"
+            #   # tap with 3 fingers
+            #   ", tap:3, exec, foot"
 
-              # longpress can trigger mouse binds:
-              ", longpress:2, movewindow"
-              ", longpress:3, resizewindow"
-            ];
+            #   # longpress can trigger mouse binds:
+            #   ", longpress:2, movewindow"
+            #   ", longpress:3, resizewindow"
+            # ];
           };
         };
 
-        gestures = {
-          workspace_swipe = true;
-          workspace_swipe_cancel_ratio = "0.15";
-        };
+        # gestures = {
+        #   workspace_swipe = true;
+        #   workspace_swipe_cancel_ratio = "0.15";
+        # };
 
         input = {
           kb_layout = "us";
diff --git a/modules/home/programs/hyprland/options.nix b/modules/home/programs/hyprland/options.nix
index fbec5be..d7e219d 100644
--- a/modules/home/programs/hyprland/options.nix
+++ b/modules/home/programs/hyprland/options.nix
@@ -113,7 +113,7 @@ with lib;
           };
           fileExplorer = mkOption {
             type = types.package;
-            default = pkgs.nemo;
+            default = pkgs.nautilus;
             description = "Default file explorer";
           };
           visual = mkOption {
diff --git a/modules/home/programs/nwg-panel/options.nix b/modules/home/programs/nwg-panel/options.nix
index 7fdf6e4..ca695ab 100644
--- a/modules/home/programs/nwg-panel/options.nix
+++ b/modules/home/programs/nwg-panel/options.nix
@@ -17,7 +17,7 @@ with lib;
           };
           fileExplorer = mkOption {
             type = types.package;
-            default = pkgs.nemo;
+            default = pkgs.nautilus;
           };
           visual = mkOption {
             type = types.package;
diff --git a/systems/aarch64-linux/macbook-pro-nixos/boot.nix b/systems/aarch64-linux/macbook-pro-nixos/boot.nix
index cfdf2a4..a7540ba 100644
--- a/systems/aarch64-linux/macbook-pro-nixos/boot.nix
+++ b/systems/aarch64-linux/macbook-pro-nixos/boot.nix
@@ -19,5 +19,7 @@
       options hid_apple iso_layout=0
     '';
     m1n1CustomLogo = ./NixOS.png;
+
+    supportedFilesystems = [ "apfs" ];
   };
 }
diff --git a/systems/aarch64-linux/macbook-pro-nixos/default.nix b/systems/aarch64-linux/macbook-pro-nixos/default.nix
index 8c6a41a..4cd9c2e 100755
--- a/systems/aarch64-linux/macbook-pro-nixos/default.nix
+++ b/systems/aarch64-linux/macbook-pro-nixos/default.nix
@@ -114,6 +114,8 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
+    apfs-fuse
+    apfsprogs
     aria
     asahi-bless
     asahi-btsync