Merge branch 'main' of https://gitea.base.jeditemple.com/joshuaelm/NixOS-Configs

hosts/mac-laptop/configuration.nix

@@ -10,10 +10,13 @@
       ./hardware-configuration.nix
     ];
   powerManagement.enable = true;
+  hardware.asahi.extractPeripheralFirmware = true;
   hardware.asahi.peripheralFirmwareDirectory = ./firmware;
   hardware.asahi.enable = true;
   services.upower.enable = true;
   
+  hardware.apple.touchBar.enable = true;
+  hardware.apple.touchBar.package = pkgs.tiny-dfr;
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
@@ -112,6 +115,7 @@
   };
 
   hardware.asahi.useExperimentalGPUDriver = true;
+  hardware.asahi.experimentalGPUInstallMode = "replace";
 
   # Configure keymap in X11
   services.xserver.xkb = {

hosts/mac-laptop/home.nix

@@ -15,9 +15,10 @@
     pkgs.signal-desktop-bin
     pkgs.supersonic
     pkgs.adw-gtk3
+    pkgs.xfce.thunar
     ];
 
-  programs.hyprlock.enable = false;
+  programs.hyprlock.enable = true;
   programs.kitty.enable = true;
   programs.cava.enable = true;
   programs.btop.enable = true;

modules/hypr/hyprland_laptop.nix

@@ -16,7 +16,7 @@ exec-once = hyprctl dispatch workspace 1
 #exec-once = linux-wallpaperengine --screen-root HDMI-A-1 --silent --fps 60 3000562427
 exec-once = hyprlock
 # exec-once = waybar
-exec-once = ashell 
+exec-once = WGPU_BACKEND=gl ashell 
 exec-once = systemctl --user start hyprpolkitagent
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more