new wm, hyprland gone

hosts/goopnet-interface/apple-macbook-air-9-1.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 {
   # support power features such as suspend to ram
   powerManagement.enable = true;
@@ -14,35 +14,8 @@
   # better performance than the actual intel driver
   services.xserver.videoDrivers = [ "modesetting" ];
 
-  # needed for our broadcom/brcm 4377b chip to work
-  hardware.firmware = with pkgs; [
-    my.apple-firmware
-  ];
-
-  # handle suspend issues (fuck you broadcom!)
-  powerManagement.powerDownCommands = ''
-    ${pkgs.kmod}/bin/modprobe -r brcmfmac_wcc
-    ${pkgs.kmod}/bin/modprobe -r brcmfmac
-    ${pkgs.kmod}/bin/modprobe -r hci_bcm4377
-  '';
-  powerManagement.resumeCommands = ''
-    ${pkgs.kmod}/bin/modprobe hci_bcm4377
-    ${pkgs.kmod}/bin/modprobe brcmfmac
-    ${pkgs.kmod}/bin/modprobe brcmfmac_wcc
-  '';
-
-  # VA-API and opengl
-  hardware.graphics = {
-    extraPackages = with pkgs; [
-      intel-media-driver
-      libvdpau-va-gl
-    ];
-
-    extraPackages32 = with pkgs.pkgsi686Linux; [
-      intel-media-driver
-      libvdpau-va-gl
-    ];
-  };
+  hardware.apple-t2.kernelChannel = "latest";
+  hardware.apple-t2.firmware.enable = true;
 
   environment.variables = {
     LIBVA_DRIVER_NAME= "iHD";

hosts/goopnet-interface/default.nix

@@ -19,7 +19,7 @@
     # debug
     strace ltrace lsof helvum
     # apps
-    firefox qalculate-gtk krita inkscape onlyoffice-desktopeditors vlc nicotine-plus transmission_4-gtk font-manager obs-studio imhex kdePackages.kdenlive
+    firefox qalculate-gtk krita inkscape onlyoffice-desktopeditors vlc nicotine-plus transmission_4-gtk font-manager obs-studio imhex pwvucontrol nautilus gnome-disk-utility gnome-text-editor baobab file-roller gnome-system-monitor loupe gnome-weather kdePackages.kdenlive
     # compatibility
     wineWowPackages.waylandFull winetricks
     # misc
@@ -28,9 +28,6 @@
     prismlauncher
   ] ++ (with pkgs.my; [
     # none yet
-  ]) ++ (with pkgs.gnome; [
-    # yay gnomeware!!!!!!!!!!!!!! yum
-    nautilus gnome-disk-utility pkgs.gnome-text-editor pkgs.baobab file-roller gnome-system-monitor loupe pkgs.gnome-weather
   ]);
 
   modules = {
@@ -41,6 +38,7 @@
       pipewire.enable = true;
       print.enable = true;
       pointer.enable = true;
+      tablet.enable = true;
     };
     dev = {
       enable = true;
@@ -49,28 +47,37 @@
       # set to `x11` or `wayland`, improves compat
       envProto = "wayland";
 
-      hyprland.enable = true;
+      # window manager / desktop environment
+      niri.enable = true;
+
+      # accessories
       hyprlock.enable = true;
       hypridle.enable = true;
-
       swww.enable = true;
       gnome-keyring.enable = true;
       mate-polkit.enable = true;
       dunst.enable = true;
       rofi.enable = true;
-      nwg-drawer.enable = true;
+      fuzzel.enable = true;
       waybar.enable = true;
       batsignal.enable = true;
       wob.enable = true;
       gammastep.enable = true;
-      clipse.enable = true;
+      cliphist.enable = true;
+      xwayland-satellite.enable = true;
+      wl-clip-persist.enable = true;
 
-      # display manager + boot splash
-      sddm.enable = true;
-      plymouth.enable = true;
+      # display manager
+      regreet.enable = true;
 
       # theme, see `modules/desktop/themes`
       themes.active = "catppuccin";
+
+      # monitors, see `modules/desktop/monitors`
+      monitors.enable = true;
+      monitors.monitors = [
+        { name = "eDP-1"; scale = 2.0; }
+      ];
     };
     software = {
       # system

hosts/goopnet-interface/hardware.nix

@@ -3,13 +3,10 @@
 {
   imports =
     [
+      inputs.hardware.nixosModules.apple-t2
       inputs.hardware.nixosModules.common-cpu-intel
       inputs.hardware.nixosModules.common-pc-laptop-ssd
       inputs.hardware.nixosModules.common-pc-laptop
-      # this will override your kernel!!!
-      # use this on macs with t2 chips to get screen, keyboard, trackpad,
-      # camera, touchbar, and experimental suspend and audio
-      inputs.hardware.nixosModules.apple-t2
 
       (modulesPath + "/installer/scan/not-detected.nix")