niri: modify window size binds

Signed-off-by: Myned <dev@bjork.tech>

configuration.nix

@@ -56,11 +56,6 @@
           inherit stable unstable staging-next;
 
           ### Packages
-          # TODO: Remove when GTK > 4.16 in unstable
-          # BUG: v5.4 is not compatible with GTK < 4.16
-          # https://github.com/lassekongo83/adw-gtk3/releases/tag/v5.4
-          adw-gtk3 = stable.adw-gtk3;
-
           # BUG: Build tests often fail on unstable
           # https://github.com/NixOS/nixpkgs/issues/333946
           fprintd = stable.fprintd;
@@ -69,19 +64,6 @@
           # https://github.com/FreeRDP/FreeRDP/issues/10784
           freerdp3 = stable.freerdp3;
 
-          # TODO: Exclusively use module packages instead of overlays where possible
-          ### Hypr*
-          # hypridle = inputs.hypridle.packages.${prev.system}.default;
-          # hyprland = inputs.hyprland.packages.${prev.system}.default;
-          # hyprlock = inputs.hyprlock.packages.${prev.system}.default;
-
-          # hyprlandPlugins = {
-          #   hyprbars = inputs.hyprland-plugins.packages.${prev.system}.hyprbars;
-          # };
-
-          ### Sway
-          sway = unstable.swayfx;
-
           ### Development
           #// ciscoPacketTracer8 = local.ciscoPacketTracer8;
         }

machines/mynix/default.nix

@@ -30,10 +30,10 @@
 
       vm.passthrough = {
         enable = true;
+        blacklist = true;
         driver = "amdgpu";
         guest = "myndows";
         id = "1002:73df";
-        init = true;
         intel = true;
         node = "pci_0000_03_00_0";
       };

options/custom/desktops/niri/binds.nix

@@ -163,11 +163,13 @@ in {
             (key "WheelScrollRight" "Mod+Shift" move-column-right-or-to-monitor-right)
             (key "WheelScrollUp" "Mod" focus-window-or-workspace-up)
             (key "WheelScrollUp" "Mod+Shift" move-window-up-or-to-workspace-up)
-            #// (key "X" "Mod" switch-preset-column-width)
             (key "X" "Mod" (set-column-width "+10%"))
+            (key "X" "Mod+Ctrl" (set-column-width "100%"))
+            (key "X" "Mod+Ctrl+Shift" (set-window-height "100%"))
             (key "X" "Mod+Shift" (set-window-height "+10%"))
-            #// (key "Z" "Mod" switch-preset-window-height)
             (key "Z" "Mod" (set-column-width "-10%"))
+            (key "Z" "Mod+Ctrl" (set-column-width "30%"))
+            (key "Z" "Mod+Ctrl+Shift" (set-window-height "30%"))
             (key "Z" "Mod+Shift" (set-window-height "-10%"))
 
             # BUG: Release binds execute with all binds involving that modifier

options/custom/desktops/sway/swayfx.nix

@@ -11,6 +11,8 @@ in {
 
   config.home-manager.users.${config.custom.username} = mkIf cfg.enable {
     # https://github.com/WillPower3309/swayfx
+    programs.sway.package = pkgs.swayfx;
+
     wayland.windowManager.sway = {
       # BUG: DRM build failure
       # https://github.com/nix-community/home-manager/issues/5379
@@ -19,7 +21,7 @@ in {
       # Polyfill home-manager wrappers
       # https://github.com/nix-community/home-manager/blob/master/modules/services/window-managers/i3-sway/sway.nix#L334
       package = with config.home-manager.users.${config.custom.username}.wayland.windowManager.sway;
-        pkgs.sway.override {
+        config.programs.sway.package.override {
           extraSessionCommands = extraSessionCommands;
           extraOptions = extraOptions;
           withBaseWrapper = wrapperFeatures.base;

options/custom/programs/onlyoffice.nix

@@ -5,7 +5,7 @@
   ...
 }:
 with lib; let
-  hyprctl = "${pkgs.hyprland}/bin/hyprctl";
+  hyprctl = "${config.programs.hyprland.package}/bin/hyprctl";
   onlyoffice-desktopeditors = "${pkgs.onlyoffice-bin}/bin/onlyoffice-desktopeditors --system-title-bar --xdg-desktop-portal";
 
   cfg = config.custom.programs.onlyoffice;

options/custom/services/swaync/default.nix

@@ -42,13 +42,13 @@ in {
       settings = {
         control-center-height = builtins.floor (config.custom.height / 2);
         control-center-positionY = "bottom";
-        control-center-width = builtins.floor (1000 / config.custom.scale);
+        control-center-width = builtins.floor (750 * config.custom.scale);
         fit-to-screen = false;
         hide-on-clear = true;
         notification-2fa-action = false;
         notification-icon-size = 32;
         #// notification-inline-replies = true;
-        notification-window-width = builtins.floor (750 / config.custom.scale);
+        notification-window-width = builtins.floor (500 * config.custom.scale);
         positionX = "center";
         positionY = "top";
         timeout = 5; # normal

options/custom/settings/vm.nix

@@ -17,10 +17,10 @@ in {
 
     passthrough = {
       enable = mkOption {default = false;};
+      blacklist = mkOption {default = false;};
       driver = mkOption {default = null;}; #?? lspci -k
       guest = mkOption {default = null;}; #?? virsh list --all
       id = mkOption {default = null;}; #?? lspci -nn
-      init = mkOption {default = false;};
       intel = mkOption {default = false;};
       node = mkOption {default = null;}; #?? virsh nodedev-list
     };
@@ -156,7 +156,7 @@ in {
 
     boot = mkIf cfg.passthrough.enable {
       # https://wiki.archlinux.org/title/PCI_passthrough_via_OVMF#Isolating_the_GPU
-      blacklistedKernelModules = mkIf cfg.passthrough.init [cfg.passthrough.driver];
+      blacklistedKernelModules = mkIf cfg.passthrough.blacklist [cfg.passthrough.driver];
 
       # https://wiki.archlinux.org/title/PCI_passthrough_via_OVMF#Enabling_IOMMU
       kernelParams = mkIf cfg.passthrough.intel ["intel_iommu=on"];