Added apple silicon support

config/hyprland.nix

@@ -2,14 +2,11 @@
   lib,
   username,
   host,
-  inputs,
-  pkgs,
   config,
   ...
 }:
 
 let
-  hyprplugins = inputs.hyprland-plugins.packages.${pkgs.system};
   inherit (import ../hosts/${host}/variables.nix)
     browser
     terminal
@@ -23,9 +20,6 @@ with lib;
     enable = true;
     xwayland.enable = true;
     systemd.enable = true;
-    # plugins = [
-    #   hyprplugins.hyprtrails
-    # ];
     extraConfig =
       let
         modifier = "SUPER";
@@ -69,8 +63,9 @@ with lib;
             kb_options = caps:super
             follow_mouse = 1
             touchpad {
-              natural_scroll = false
+              natural_scroll = true
               disable_while_typing = true
+              scroll_factor = 0.8
             }
             sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
             accel_profile = flat

flake.lock

@@ -186,11 +186,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722630065,
+        "lastModified": 1723015306,
-        "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=",
+        "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "afc892db74d65042031a093adb6010c4c3378422",
+        "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e",
         "type": "github"
       },
       "original": {
@@ -223,11 +223,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1722421184,
+        "lastModified": 1722813957,
-        "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
+        "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
+        "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
         "type": "github"
       },
       "original": {
@@ -276,11 +276,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1722295291,
+        "lastModified": 1722946882,
-        "narHash": "sha256-3XpT9GMw50NCGT1Gd2YAwEjrEcFtDqnuQ7sRUcuU/Pc=",
+        "narHash": "sha256-mxtnMye8gs82tdQbVC+g6v3aPOZlH150f9WyntHIkTg=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "feb2973dfa8232c07efbd2b48f11a5cfa2276570",
+        "rev": "5853f1a8bd072f2ebabfc3de3973084353cf6f1e",
         "type": "github"
       },
       "original": {

hosts/nixbook/config.nix

@@ -12,10 +12,10 @@ let
 in
 {
   imports = [
-    ../../modules/apple-silicon-support
     ./hardware.nix
     ./users.nix
     ../../modules/amd-drivers.nix
+    ../../modules/apple-silicon-support
     ../../modules/nvidia-drivers.nix
     ../../modules/nvidia-prime-drivers.nix
     ../../modules/intel-drivers.nix
@@ -113,6 +113,9 @@ in
   drivers.intel.enable = false;
   vm.guest-services.enable = false;
   local.hardware-clock.enable = false;
+  # Apple Hardware
+  hardware.asahi.useExperimentalGPUDriver = true;
+  hardware.asahi.peripheralFirmwareDirectory = ../../modules/firmware;
 
   # Enable networking
   networking.wireless.iwd = {
@@ -403,10 +406,6 @@ in
   services.blueman.enable = true;
   hardware.pulseaudio.enable = false;
   
-  # Apple Hardware
-  hardware.asahi.useExperimentalGPUDriver = true;
-  hardware.asahi.peripheralFirmwareDirectory = ./firmware;
-
   # Security / Polkit
   security.rtkit.enable = true;
   security.polkit.enable = true;

hosts/nixbook/users.nix

@@ -24,6 +24,7 @@ in
       ignoreShellProgramCheck = true;
       packages = with pkgs; [
         webcord
+        zeroad
       ];
     };
     # "newuser" = {

hosts/nixbook/variables.nix

@@ -4,7 +4,9 @@
   gitEmail = "tylerzanekelley@gmail.com";
 
   # Hyprland Settings
-  extraMonitorSettings = "";
+  extraMonitorSettings = "
+monitor=eDP-1,2560x1600@60,0x0,1.25
+    ";
 
   # Waybar Settings
   clock24h = false;