niri: modify config

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

options/custom/desktops/niri/binds.nix

@@ -12,6 +12,7 @@ with lib; let
   bash = "${pkgs.bash}/bin/bash";
   cat = "${pkgs.coreutils}/bin/cat";
   codium = "${config.home-manager.users.${config.custom.username}.programs.vscode.package}/bin/codium";
+  ghostty = "${hm.programs.ghostty.package}/bin/ghostty";
   hyprlock = "${config.home-manager.users.${config.custom.username}.programs.hyprlock.package}/bin/hyprlock";
   hyprpicker = "${pkgs.hyprpicker}/bin/hyprpicker";
   inhibit = config.home-manager.users.${config.custom.username}.home.file.".local/bin/inhibit".source;
@@ -60,11 +61,11 @@ in {
           };
 
           # Launch VM
-          vm = ''${remote} --vm --client xfreerdp --username Myned --password "$(${cat} ${config.age.secrets."desktop/vm/myndows.pass".path})" ${
+          vm = [
-              if config.custom.hidpi
+            bash
-              then "--scale 140"
+            "-c"
-              else ""
+            ''${remote} --vm --client sdl-freerdp --username Myned --password "$(${cat} ${config.age.secrets."desktop/vm/myndows.pass".path})" myndows''
-            } myndows'';
+          ];
         in
           listToAttrs (with hm.lib.niri.actions; [
             (key "0" "Mod" (spawn [swayosd-client "--output-volume" "mute-toggle"]))
@@ -147,8 +148,8 @@ in {
             (key "Slash" "Mod+Shift" show-hotkey-overlay)
             (key "Space" "Ctrl+Alt" (spawn ["lifx" "toggle"]))
             (key "Space" "Ctrl+Alt" (spawn ["lifx" "toggle"]))
-            (key "T" "Ctrl+Alt" (spawn [pkill "kitty"]))
+            (key "T" "Ctrl+Alt" (spawn [pkill "ghostty"]))
-            (key "T" "Mod" (spawn kitty))
+            (key "T" "Mod" (spawn ghostty))
             (key "Tab" "Mod" switch-focus-between-floating-and-tiling)
             (key "Up" "Mod" (spawn [swayosd-client "--brightness" "raise"]))
             (key "V" "Mod" (spawn virt-manager))

options/custom/desktops/niri/default.nix

@@ -97,6 +97,11 @@ in {
                   (leaf "open-floating" true)
                   (leaf "open-focused" false)
                 ])
+
+                (plain "window-rule" [
+                  (leaf "match" {app-id = "^(sdl-|wl|x)freerdp$";})
+                  (leaf "open-floating" false)
+                ])
               ]);
 
           # https://github.com/YaLTeR/niri/wiki/Configuration:-Debug-Options

options/custom/desktops/niri/layout.nix

@@ -32,7 +32,10 @@ in {
           #// center-focused-column = mkIf config.custom.ultrawide "always";
 
           # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingslayoutdefault-column-width
-          default-column-width.proportion = 3.0 / 10.0; # 30%
+          default-column-width.proportion =
+            if config.custom.ultrawide
+            then 0.3 # 30%
+            else 0.6; # 60%
 
           # TODO: Uncomment after next release > v1.10.1
           #// empty-workspace-above-first = true;
@@ -56,21 +59,21 @@ in {
 
           # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingslayoutpreset-column-widths
           preset-column-widths = [
-            {proportion = 3.0 / 10.0;} # 30%, default
+            {proportion = 0.3;} # 30%, default
-            {proportion = 4.0 / 10.0;} # 40%
+            {proportion = 0.4;} # 40%
-            {proportion = 5.0 / 10.0;} # 50%
+            {proportion = 0.5;} # 50%
-            {proportion = 6.0 / 10.0;} # 60%
+            {proportion = 0.6;} # 60%
-            {proportion = 7.0 / 10.0;} # 70%
+            {proportion = 0.7;} # 70%
           ];
 
           # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingslayoutpreset-window-heights
           preset-window-heights = [
-            {proportion = 7.0 / 10.0;} # 70%
+            {proportion = 0.7;} # 70%
-            {proportion = 6.0 / 10.0;} # 60%
+            {proportion = 0.6;} # 60%
-            {proportion = 5.0 / 10.0;} # 50%
+            {proportion = 0.5;} # 50%
-            {proportion = 4.0 / 10.0;} # 40%
+            {proportion = 0.4;} # 40%
-            {proportion = 3.0 / 10.0;} # 30%
+            {proportion = 0.3;} # 30%
-            {proportion = 10.0 / 10.0;} # 100%, default
+            {proportion = 1.0;} # 100%, default
           ];
 
           # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingslayoutstruts

options/custom/desktops/niri/rules.nix

@@ -63,6 +63,11 @@ in {
                 {app-id = "^vivaldi.*$";}
               ];
 
+              default-column-width.proportion =
+                if config.custom.ultrawide
+                then 0.4
+                else 0.7;
+
               #// open-on-workspace = "2";
             }