thats a lot of deletions

2 files changed, 63 insertions, 25 deletions

diff --git a/home-manager/laptop/hyprland/default.nix b/home-manager/laptop/hyprland/default.nix
index 9f911e1..5b10c11 100644
--- a/home-manager/laptop/hyprland/default.nix
+++ b/home-manager/laptop/hyprland/default.nix
@@ -14,14 +14,50 @@ in
   home.packages = with pkgs; [
     swww
     brightnessctl
-    slurp
-    grim
+    grimblast
     cliphist
-    xdg-desktop-portal-hyprland
+    polkit_gnome
+    xwaylandvideobridge
   ];
+
+  xdg.portal = {
+    enable = true;
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-hyprland
+    ];
+    configPackages = with pkgs; [
+      xdg-desktop-portal-hyprland
+    ];
+  };
+
+  programs.fish.loginShellInit = "Hyprland";
+  
   wayland.windowManager.hyprland = {
     enable = true;
     package = pkgs.hyprland;
     inherit extraConfig;
   };
+
+  programs.swaylock = {
+    enable = true;
+    package = pkgs.swaylock-effects;
+    settings = {
+      indicator-radius = 100;
+      ring-color = "000000ff";
+      layout-bg-color = "000000ff";
+      key-hl-color = "e0c69fff";
+      inside-color = "000000ff";
+      layout-border-color = "e0c69fff";
+      line-color = "ffffffff";
+      separator-color = "000000ff";
+      ring-ver-color = "000000ff";
+      line-ver-color = "000000ff";
+      inside-ver-color = "ffffff00";
+      text-ver-color = "e0c69fff";
+      inside-wrong-color = "ffffff00";
+      text-wrong-color = "e0c69fff";
+      ring-wrong-color = "762f20ff";
+      fade-in = 1;
+    };
+  };
 }
diff --git a/home-manager/laptop/hyprland/hyprland.conf b/home-manager/laptop/hyprland/hyprland.conf
index 81ef9eb..e60503a 100644
--- a/home-manager/laptop/hyprland/hyprland.conf
+++ b/home-manager/laptop/hyprland/hyprland.conf
@@ -1,7 +1,7 @@
-monitor=,preferred,auto,1
+monitor=,preferred,auto,1,mirror,eDP-1
 
 # Execute your favorite apps at launch
-exec-once = waybar & swww init
+exec-once = swww init
 
 # Set programs that you use
 $terminal = alacritty
@@ -11,12 +11,6 @@ $scripts=~/.config/hypr/scripts
 
 # Some default env vars.
 env = XCURSOR_SIZE,18
-env = QT_QPA_PLATFORMTHEME, gtk3
-env = QT_STYLE_OVERRIDE, gtk2
-env = QT_QPA_PLATFORM, wayland
-env = TERMINAL, "alacritty"
-env = BROWSER, "firefox"
-
 
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
@@ -30,7 +24,7 @@ input {
 
     touchpad {
         natural_scroll = yes
-	# disable_while_typing = no
+	disable_while_typing = no
     }
 
     sensitivity = 0.1 # -1.0 - 1.0, 0 means no modification.
@@ -109,9 +103,17 @@ windowrulev2 = noborder, title:^(Firefox — Sharing Indicator)$
 windowrulev2 = rounding 0, title:^(Firefox — Sharing Indicator)$
 windowrulev2 = float, title:^(firefox)$, title:^(Picture-in-Picture)$
 windowrulev2 = pin, title:^(firefox)$, title:^(Picture-in-Picture)$
+windowrulev2 = float, title:^(Save File)$
+windowrulev2 = pin, title:^(Save File)$
+windowrulev2 = float, title:^(Torrent Options)$
+windowrulev2 = pin, title:^(Torrent Options)$
+windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$
+windowrulev2 = noanim,class:^(xwaylandvideobridge)$
+windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$
+windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$
+windowrulev2 = noblur,class:^(xwaylandvideobridge)$
 layerrule = blur, waybar
 
-
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 $mainMod = SUPER
 
@@ -128,28 +130,28 @@ bind = $mainMod SHIFT, Q, killactive,
 bind = $mainMod SHIFT, E, exit,
 
 # Apps
-bind = $mainMod, B, exec, firefox
+bind = $mainMod, B, exec, brave --enable-features=TouchpadOverscrollHistoryNavigation
 bind = $mainMod, T, exec, telegram-desktop
 bind = $mainMod, E, exec, emacsclient -c -a "emacs"
 bind = $mainMod CONTROL, E, exec, emacs
 
 # Screenshooting
-bind = , Print, exec, $scripts/hshot -m
-bind = ALT, Print, exec, $scripts/hshot -w
-bind = SHIFT, Print, exec, $scripts/hshot -s
-bind = CONTROL, Print, exec, $scripts/hshot -m -c
-bind = ALT_CONTROL, Print, exec, $scripts/hshot -w -c
-bind = CONTROL_SHIFT, Print, exec, $scripts/hshot -s -c
+bind = , Print, exec, grimblast save screen
+bind = ALT, Print, exec, grimblast save active
+bind = SHIFT, Print, exec, grimblast save area
+bind = CONTROL, Print, exec, grimblast copy screen
+bind = ALT_CONTROL, Print, exec, grimblast copy active
+bind = CONTROL_SHIFT, Print, exec, grimblast copy area 
 
 # Volume
-$volDev = wpctl status | grep '*' -m 1 | awk '{print $3 - 0}' | xargs -I _
-bind = ,0x1008FF11,exec,$volDev wpctl set-volume _ 5%-
-bind = ,0x1008FF13,exec,$volDev wpctl set-volume _ 5%+
-bind = ,0x1008FF12,exec,$volDev wpctl set-mute _ toggle
+bind = ,0x1008FF11,exec,wpctl set-volume @DEFAULT_SINK@ 5%-
+bind = ,0x1008FF13,exec,wpctl set-volume @DEFAULT_SINK@ 5%+
+bind = ,0x1008FF12,exec,wpctl set-mute @DEFAULT_SINK@ toggle
+bind = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_SOURCE@ toggle
 
 # Brightness
 bind = ,XF86MonBrightnessUp,exec,brightnessctl s +5%
-bind = ,0x1008FF03,exec,brightnessctl s 5%-
+bind = ,XF86MonBrightnessDown,exec,brightnessctl s 5%-
 
 # Move focus with mainMod + arrow keys
 bind = $mainMod, J, movefocus, d