update for niriHEADmaster

2 files changed, 70 insertions, 3 deletions

diff --git a/modules/desktop/niri.nix b/modules/desktop/niri.nix
new file mode 100644
index 0000000..1cf80e8
--- /dev/null
+++ b/modules/desktop/niri.nix
@@ -0,0 +1,67 @@
+{
+    config,
+    options,
+    lib,
+    pkgs,
+    ...
+}: let
+    niriConf = config.modules.desktop.niri;
+    device = config.modules.device;
+    defaultApps = config.modules.desktop.defaultApplications.apps;
+    configDir = config.nixosConfig.configDir;
+in {
+    options.modules.desktop.niri = {
+        enable = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+    };
+
+    config = lib.mkIf (niriConf.enable) (lib.mkMerge [
+    {
+        programs.niri.enable = true;
+        programs.waybar.enable = true;
+        programs.xwayland.enable = true;
+
+        home.manager.services.polkit-gnome.enable = true;
+        
+        home.packages = with pkgs; [
+            libnotify
+            killall
+            wdisplays
+            xwayland-satellite
+            wofi
+            mako
+            jq
+            swww
+        ];
+
+        modules.device.displayProtocol = "wayland";
+
+        environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+        home.manager.xdg.configFile."niri/config.kdl".source = "${configDir}/niri/${config.networking.hostName}.kdl";
+
+        system.userActivationScripts.linkwaybar.text = ''
+            if [[ ! -h "$HOME/.config/waybar" ]]; then
+                ln -s "${configDir}/waybar" "$HOME/.config/waybar"
+            fi
+        '';
+    }
+    (lib.mkIf (config.modules.desktop.greetd.enable) {
+        services.greetd.settings = {
+            default_session.command = ''
+                ${pkgs.greetd.tuigreet}/bin/tuigreet \
+                    --time \
+                    --asterisks \
+                    --user-menu \
+                    --cmd niri-session
+            '';
+        };
+
+        environment.etc."greetd/environments".text = ''
+            Niri
+        '';
+    })
+    ]);
+}
diff --git a/modules/hardware/gpu.nix b/modules/hardware/gpu.nix
index 72604a8..a71d9d3 100644
--- a/modules/hardware/gpu.nix
+++ b/modules/hardware/gpu.nix
@@ -25,11 +25,11 @@ in {
             boot.initrd.kernelModules = ["i915"];
             services.xserver.videoDrivers = ["modesetting"];
 
-            hardware.opengl.extraPackages = [
+            hardware.graphics.extraPackages = [
                 pkgs.intel-compute-runtime
                 pkgs.intel-media-driver
-                pkgs.vaapiIntel
-                pkgs.vaapiVdpau
+                pkgs.intel-vaapi-driver
+                pkgs.libva-vdpau-driver
                 pkgs.libvdpau-va-gl
             ];