cleanup

common/graphics/sway.nix

@@ -83,18 +83,6 @@ in
       # sway_conf = pkgs.writeText "sway.conf" text;
     in
     with cfg; lib.mkIf (enable && sway.enable) {
-      nixpkgs.overlays = [
-        (final: prev: {
-          wlroots = prev.wlroots.overrideAttrs (o: {
-            patches = (o.patches or [ ]) ++ [
-              ./patches/lessflicker.patch
-              # ./patches/screenshare.patch 
-            ];
-          });
-        })
-      ];
-
-
       environment.etc."${conf_path}".text = sway_conf;
 
       environment.systemPackages = [
@@ -120,6 +108,8 @@ in
               ${config.programs.sway.package}/bin/swaymsg reload
             fi
           done
+
+          rm -rf /home/*/.cache/rmenu
         '';
         reloadTriggers = [ config.environment.etc."${conf_path}".source ];
       };
@@ -150,15 +140,15 @@ in
           "/etc/${conf_path}"
         ];
         extraSessionCommands = ''
-                  export XDG_CURRENT_DESKTOP=sway
-                  export SDL_VIDEODRIVER=wayland
-                  export QT_QPA_PLATFORM=wayland
-                  export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
-                  export _JAVA_AWT_WM_NONREPARENTING=1
-                  export MOZ_ENABLE_WAYLAND=1
-                  export WLR_RENDERER=vulkan
-                  export DRI_PRIME=1
-          #        export MESA_LOADER_DRIVER_OVERRIDE="zink"
+          export XDG_CURRENT_DESKTOP=sway
+          export SDL_VIDEODRIVER=wayland
+          export QT_QPA_PLATFORM=wayland
+          export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
+          export _JAVA_AWT_WM_NONREPARENTING=1
+          export MOZ_ENABLE_WAYLAND=1
+          export WLR_RENDERER=vulkan
+          export DRI_PRIME=1
+          export NIXOS_OZONE_WL=1
         '';
       };
     };

common/laptop_hardware.nix

@@ -31,7 +31,7 @@ in
         "pcie_aspm=off"
       ]; #  "vfio-pci.ids=10de:1aeb,10de:2191,10de:1aed,10de:1aec" ];
       kernelModules = [ "kvm-intel" "vfio_pci" "vfio_iommu_type1" "vfio" "i2c-dev" ];
-      blacklistedKernelModules = ["i2c_nvidia_gpu"];
+      blacklistedKernelModules = [ "i2c_nvidia_gpu" ];
     };
 
     services.power-profiles-daemon.enable = false;

common/network/bluetooth.nix

@@ -3,7 +3,7 @@ let
   cfg = config.grimmShared;
 in
 {
-  config = with cfg; lib.mkIf (enable && network && config.hardware.bluetooth.enable ) {
+  config = with cfg; lib.mkIf (enable && network && config.hardware.bluetooth.enable) {
     services.blueman.enable = lib.mkIf graphical true;
 
     environment.systemPackages = with pkgs; [

common/network/default.nix

@@ -7,7 +7,7 @@ in
     networking.networkmanager.enable = true;
     networking.useDHCP = lib.mkDefault true;
 
-    hardware.bluetooth.enable = lib.mkDefault laptop_hardware.enable; 
+    hardware.bluetooth.enable = lib.mkDefault laptop_hardware.enable;
 
     environment.systemPackages = with pkgs; [
       wireguard-tools

common/sound/default.nix

@@ -6,7 +6,7 @@ in
   config = with cfg; lib.mkIf (enable && sound) {
     sound.enable = true;
     hardware.pulseaudio.enable = false;
-    
+
     services.pipewire = {
       enable = true;
       alsa.enable = true;

flake.nix

@@ -51,6 +51,7 @@
             ./modules/users.nix
             ./modules/system-packages.nix
             ./modules/kvm.nix
+            ./overlays
             { environment.systemPackages = [ agenix.packages.${system}.default ]; }
           ];
         };

modules/users.nix

@@ -16,6 +16,7 @@
       geany
       webcord
       discord
+      obs-studio
       kwrited
       element-desktop
       ghidra

overlays/default.nix

@@ -0,0 +1,6 @@
+{ lib, config, ... }: {
+  nixpkgs.overlays = map (f: (final: prev: (import f { inherit final prev lib config;})))
+  [
+    ./wlr_flicker.nix
+  ];
+}

overlays/wlr_flicker.nix

@@ -0,0 +1,8 @@
+{ final, prev, ... }: {
+  wlroots = prev.wlroots.overrideAttrs (o: {
+    patches = (o.patches or [ ]) ++ [
+      # ./patches/lessflicker.patch
+      # ./patches/screenshare.patch 
+    ];
+  });
+}

specific/grimm-nixos-laptop/hardware-configuration.nix

@@ -47,6 +47,6 @@
     laptop_hardware.enable = true;
   };
 
-  
+
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

sway/bar/config

@@ -92,7 +92,7 @@
         // "format-good": "", // An empty format will hide the module
         // "format-full": "",
         "format-icons": ["", "", "", "", ""],
-	"on-click": "rmenu -r powermenu"
+	"on-click": "rmenu -r powermenu --single-click true"
     },
     "battery#bat2": {
         "bat": "BAT2"
@@ -104,7 +104,7 @@
         "format-linked": "{ifname} (No IP) ",
         "format-disconnected": "Disconnected ⚠",
         "format-alt": "{ifname}: {ipaddr}/{cidr}",
-	"on-click-right": "rmenu -r network"
+	"on-click-right": "rmenu -r network --single-click true"
     },
     "pulseaudio": {
         // "scroll-step": 1, // %, can be a float