From 7a52dff9eb07ec1964aabd469aef6b66d4bc862d Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Mon, 10 Jul 2023 21:54:41 +0100
Subject: [PATCH] Remove nix-index, add hyprland env vars

---
 home/desktop/hyprland.nix | 12 +++++++++++-
 home/env/bash.nix         |  1 -
 home/env/default.nix      |  1 -
 home/env/fish.nix         |  1 -
 home/env/zsh.nix          |  1 -
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/home/desktop/hyprland.nix b/home/desktop/hyprland.nix
index ea943d3a..d550abb6 100644
--- a/home/desktop/hyprland.nix
+++ b/home/desktop/hyprland.nix
@@ -61,6 +61,9 @@ in {
       env = GTK_THEME,Sweet-Dark
       env = XCURSOR_THEME,Catppuccin-Macchiato-Dark-Cursors
       env = XCURSOR_SIZE,24
+      env = QT_AUTO_SCREEN_SCALE_FACTOR=1
+      env = QT_QPA_PLATFORM=wayland;xcb
+      env = QT_WAYLAND_DISABLE_WINDOWDECORATION=1
 
       input {
           kb_layout = gb
@@ -78,7 +81,12 @@ in {
           col.group_border_active = $mauve
           col.inactive_border = $surface2
           col.group_border = $surface2
-          layout = dwindle
+          layout = master
+      }
+
+      master {
+        new_is_master = false
+        new_on_top = true
       }
 
       dwindle {
@@ -212,6 +220,8 @@ in {
       windowrule = float,(thunar)
       windowrule = center,(thunar)
 
+      windowrulev2 = float,title:^(Zoom|zoom).*
+      windowrulev2 = workspace 5,title:^(Zoom|zoom).*
       windowrulev2 = float,class:(Nxplayer.bin),title:^(NoMachine)$
       windowrulev2 = maximize,class:(Nxplayer.bin),title:^(NoMachine).+$
     '';
diff --git a/home/env/bash.nix b/home/env/bash.nix
index 306c37b6..4a764d53 100644
--- a/home/env/bash.nix
+++ b/home/env/bash.nix
@@ -11,7 +11,6 @@
     keychain.enableBashIntegration = true;
     starship.enableBashIntegration = true;
     direnv.enableBashIntegration = true;
-    nix-index.enableBashIntegration = true;
     fzf.enableBashIntegration = true;
   };
 }
diff --git a/home/env/default.nix b/home/env/default.nix
index bd7cb9ea..cc4488ed 100644
--- a/home/env/default.nix
+++ b/home/env/default.nix
@@ -19,5 +19,4 @@
     silver-searcher
     distrobox
   ];
-  programs.nix-index.enable = true;
 }
diff --git a/home/env/fish.nix b/home/env/fish.nix
index 87a7187a..5c97ee75 100644
--- a/home/env/fish.nix
+++ b/home/env/fish.nix
@@ -19,7 +19,6 @@
     };
     keychain.enableFishIntegration = true;
     starship.enableFishIntegration = true;
-    nix-index.enableFishIntegration = true;
     fzf.enableFishIntegration = true;
   };
 }
diff --git a/home/env/zsh.nix b/home/env/zsh.nix
index 023f0987..53b6edd3 100644
--- a/home/env/zsh.nix
+++ b/home/env/zsh.nix
@@ -14,7 +14,6 @@
     keychain.enableZshIntegration = true;
     starship.enableZshIntegration = true;
     direnv.enableZshIntegration = true;
-    nix-index.enableZshIntegration = true;
     fzf.enableZshIntegration = true;
   };
 }