fix some hyprland stuff

systems/aarch64-linux/macbook-pro-nixos/boot.nix

@@ -4,7 +4,7 @@
   boot = {
     loader = {
       systemd-boot = {
-        enable = true;
+        enable = lib.mkForce true;
         configurationLimit = 15;
         consoleMode = lib.mkDefault "max";
       };

systems/aarch64-linux/macbook-pro-nixos/default.nix

@@ -2,9 +2,15 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
-{ pkgs, lib, ... }:
+{ pkgs, lib, namespace, ... }:
 let
   plasma = false;
+  # Displays
+  display = {
+    input = "eDP-1";
+    resolution = "3456x2234";
+    refreshRate = "60.00000";
+  };
 in
 {
   imports = [
@@ -21,9 +27,43 @@ in
     setupAsahiSound = true;
   };
 
-  hardware.graphics.enable32Bit = lib.mkForce false;
+  ${namespace} = {
+    desktop = {
+      hyprland = {
+        enable = true;
+        primaryDisplay = "eDP-1";
+
+        display1 = {
+          input = "eDP-1";
+          resolution = "3456x2234";
+          refreshRate = "60.00000";
+        };
+
+        wallpaper = [
+          "${display.input}, /run/wallpaper.jpg"
+        ];
+
+        monitor = [
+          "${display.input},${display.resolution}@${display.refreshRate},0x0,1.25,bitdepth,10,cm,hdr,sdrbrightness,1.2,sdrsaturation,0.98"
+        ];
+
+        workspace = [
+          "name:firefox, monitor:${display.input}, default:false, special, class:(.*firefox.*)"
+          "name:discord, monitor:${display.input}, default:true, special, title:(.*vesktop.*), title:(.*Apple Music.*)"
+          "name:steam, monitor:${display.input}, default:false, special, class:(.*[Ss]team.*)"
+        ];
+
+
+        windowRule = [
+          "size 2160 3356, tag:horizonrdp"
+        ];
+      };
+    };
+    network = {
+      hostName = "macbook-pro-nixos";
+    };
+  };
 
-  nixpkgs.config.allowUnfree = true;
   nixpkgs.config.allowUnsupportedSystem = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
@@ -59,12 +99,20 @@ in
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
+    aria
+    asahi-bless
+    asahi-btsync
+    asahi-nvram
+    asahi-wifisync
+    cabextract
     micro
+    unzip
     vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     wget
   ];
 
   environment.sessionVariables = {
     DBX_CONTAINER_MANAGER = "podman";
+    GSK_RENDERER = "opengl";
   };
 }

systems/aarch64-linux/macbook-pro-nixos/hardware-configuration.nix

@@ -60,12 +60,12 @@
       options = [ "fmask=0022" "dmask=0022" ];
     };
 
-  swapDevices = [
-    {
-      device = "/tmp/swapfile";
-      randomEncryption.enable = true;
-    }
-  ];
+  # swapDevices = [
+  #   {
+  #     device = "/tmp/swapfile";
+  #     randomEncryption.enable = true;
+  #   }
+  # ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

systems/aarch64-linux/macbook-pro-nixos/services.nix

@@ -8,19 +8,18 @@
         charger = {
           # see available governors by running: cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors
           # preferred governor
-          governor = "performance";
+          governor = "schedutil";
 
           # minimum cpu frequency (in kHz)
           # example: for 800 MHz = 800000 kHz --> scaling_min_freq = 800000
+          # Available: 912 MHz, 1284 MHz, 1752 MHz, 2004 MHz, 2256 MHz, 2424 MHz
+          # 702000 948000 1188000 1452000 1704000 1968000 2208000 2400000 2568000 2724000 2868000 3000000 3132000 3264000 
           # see conversion info: https://www.rapidtables.com/convert/frequency/mhz-to-hz.html
           # to use this feature, uncomment the following line and set the value accordingly
-          # scaling_min_freq = 800000
-
-          # maximum cpu frequency (in kHz)
-          # example: for 1GHz = 1000 MHz = 1000000 kHz -> scaling_max_freq = 1000000
-          # see conversion info: https://www.rapidtables.com/convert/frequency/mhz-to-hz.html
-          # to use this feature, uncomment the following line and set the value accordingly
-          # scaling_max_freq = 1000000
+          scaling_min_freq = 912000;
+          scaling_max_freq = 2424000;
+          # scaling_min_freq = 702000;
+          # scaling_max_freq = 1968000;
 
           # turbo boost setting. possible values: always, auto, never
           turbo = "auto";
@@ -29,19 +28,16 @@
         battery = {
           # see available governors by running: cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors
           # preferred governor
-          governor = "schedutil";
+          governor = "powersave";
 
           # minimum cpu frequency (in kHz)
           # example: for 800 MHz = 800000 kHz --> scaling_min_freq = 800000
+          # Available: 912 MHz, 1284 MHz, 1752 MHz, 2004 MHz, 2256 MHz, 2424 MHz
+          # 702000 948000 1188000 1452000 1704000 1968000 2208000 2400000 2568000 2724000 2868000 3000000 3132000 3264000 
           # see conversion info: https://www.rapidtables.com/convert/frequency/mhz-to-hz.html
           # to use this feature, uncomment the following line and set the value accordingly
-          # scaling_min_freq = 800000
-
-          # maximum cpu frequency (in kHz)
-          # see conversion info: https://www.rapidtables.com/convert/frequency/mhz-to-hz.html
-          # example: for 1GHz = 1000 MHz = 1000000 kHz -> scaling_max_freq = 1000000
-          # to use this feature, uncomment the following line and set the value accordingly
-          # scaling_max_freq = 1000000
+          scaling_min_freq = 912000;
+          scaling_max_freq = 2004000;
 
           # turbo boost setting (always, auto, or never)
           turbo = "auto";
@@ -81,7 +77,7 @@
     gvfs.enable = true;
 
     keyd = {
-      enable = true;
+      enable = false;
       keyboards = {
         default = {
           ids = [ "*" ];