22 files changed, 284 insertions, 79 deletions
diff --git a/.config/Trolltech.conf b/.config/Trolltech.conf
new file mode 100644
index 0000000..e148896
--- /dev/null
+++ b/.config/Trolltech.conf
@@ -0,0 +1,2 @@
+[Qt]
+style=GTK+
diff --git a/.config/gtk-2.0/gtkfilechooser.ini b/.config/gtk-2.0/gtkfilechooser.ini
index 2d60b26..e1aabf7 100644
--- a/.config/gtk-2.0/gtkfilechooser.ini
+++ b/.config/gtk-2.0/gtkfilechooser.ini
@@ -2,8 +2,8 @@
 LocationMode=path-bar
 ShowHidden=false
 ShowSizeColumn=true
-GeometryX=0
-GeometryY=0
+GeometryX=805
+GeometryY=486
 GeometryWidth=948
 GeometryHeight=656
 SortColumn=name
diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
index 3a5d8d7..a1e7f00 100644
--- a/.config/gtk-3.0/settings.ini
+++ b/.config/gtk-3.0/settings.ini
@@ -1,10 +1,10 @@
 [Settings]
-gtk-theme-name=Adwaita
-gtk-icon-theme-name=Adwaita
+gtk-theme-name=Mint-Y-Dark-Pink
+gtk-icon-theme-name=Mint-Y-Pink
 gtk-font-name=Noto Sans,  10
-gtk-cursor-theme-name=Adwaita
+gtk-cursor-theme-name=wii
 gtk-cursor-theme-size=24
-gtk-toolbar-style=3
+gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
 gtk-button-images=0
 gtk-menu-images=0
@@ -12,7 +12,7 @@ gtk-enable-event-sounds=1
 gtk-enable-input-feedback-sounds=0
 gtk-xft-antialias=1
 gtk-xft-hinting=1
-gtk-xft-hintstyle=hintslight
+gtk-xft-hintstyle=hintfull
 gtk-xft-rgba=rgb
 gtk-application-prefer-dark-theme=1
 gtk-decoration-layout=icon:minimize,maximize,close
diff --git a/.config/hypr/config.d/keybinds.conf b/.config/hypr/config.d/keybinds.conf
index 815f7d2..bbb1af6 100644
--- a/.config/hypr/config.d/keybinds.conf
+++ b/.config/hypr/config.d/keybinds.conf
@@ -1,30 +1,30 @@
 
+bind = $mod SHIFT, SPACE, togglefloating
 bind = $mod, Return, exec, $term
 bind = $mod, W, exec, $browser
-bind = $mod SHIFT, SPACE, togglefloating
 bind = $mod, D, exec, $menu
 bind = $mod, J, togglesplit
-bind = $mod SHIFT, C, togglegroup
 bind = $mod, F, fullscreen
-bind = $mod SHIFT, B, exec, killall waybar && waybar --config ~/.config/waybar/config.hypr
-bind = $mod SHIFT, Q, killactive
+
 bind = $mod, L, exec, hyprlock
 bind = $mod SHIFT, L, exec, killall Hyprland
-bind = $mod, TAB, changegroupactive
+
+bind = $mod SHIFT, Q, killactive
+bind = $mod, F5, exec, killall waybar && waybar --config ~/.config/waybar/config.hypr --style ~/.config/waybar/style.hypr.css
 
 binde =, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+
 binde =, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
 binde =, XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
 binde =, XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
 
-binde =, XF86MonBrightnessDown, exec, brightnessctl set 5%-
-binde =, XF86MonBrightnessUp, exec, brightnessctl set 5%+
-
 binde =, XF86AudioPlay, exec, playerctl play-pause
 binde =, XF86AudioNext, exec, playerctl next
 binde =, XF86AudioPrev, exec, playerctl previous
 
+binde =, XF86MonBrightnessDown, exec, brightnessctl set 5%-
+binde =, XF86MonBrightnessUp, exec, brightnessctl set 5%+
+
 bind = $mod SHIFT, s, exec, grim -g "$(slurp)" - | wl-copy -t image/png && notify-send -t 3000 "Hyprland" "Screenshot copied to clipboard"
 bind = , Print, exec, grim - | wl-copy -t iamge/png && notify-send -t 3000 "Hyprland" "Full screen copied to clipboard"
-bind = , Shift Print, exec, slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy
+bind = SHIFT, Print, exec, slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy
 
diff --git a/.config/hypr/config.d/theme.conf b/.config/hypr/config.d/theme.conf
index ff284b2..0de56bd 100644
--- a/.config/hypr/config.d/theme.conf
+++ b/.config/hypr/config.d/theme.conf
@@ -1,55 +1,82 @@
 general {
-    gaps_in = 6
+    gaps_in = 5
     gaps_out = 10
-    border_size = $border
-    col.active_border = 0xffaaaaaa
-    col.inactive_border = 0xff777777
-    layout = dwindle
+    layout = hy3
+
     resize_on_border = yes
     extend_border_grab_area = 20
+
+    border_size = $border
+    col.active_border = rgb(74777d)
+    col.inactive_border = rgb(14171d)
 }
 
-group {
-    col.border_active = rgb(14171d) rgb(14171d) 0deg
-    col.border_inactive = rgb(14171d) rgb(14171d) 0deg
-    col.border_locked_active = rgb(14171d) rgb(14171d) 0deg
-    col.border_locked_inactive = rgb(14171d) rgb(14171d) 0deg
-    groupbar {
-        enabled = true
-        gradients = true
-        font_family = monospace
-        font_size = 12
-        height = 16
-        col.active = rgb(24272d) rgb(24272d) 0deg
-        col.inactive = rgb(14171d) rgb(14171d) 0deg
-        col.locked_active = rgb(14171d) rgb(14171d) 0deg
-        col.locked_inactive = rgb(14171d) rgb(14171d) 0deg
+plugin {
+    hy3 {
+        tabs {
+            height = 20
+            text_height = 11
+            padding = 0
+            render_text = true
+            rounding = 0
+
+            col.active = rgb(24272d)
+            col.inactive = rgb(14171d)
+            col.text.active = rgb(ffffff)
+            col.text.inactive = rgb(ffffff)
+        }
+
+        autotile {
+            enable = true
+        }
     }
 }
 
 decoration {
     rounding = $radius
-    drop_shadow = yes
-    shadow_range = 4
-    shadow_render_power = 3
-    col.shadow = rgba(1a1a1aee)
+    drop_shadow = no
 
     blur {
         enabled = true
-        size = 5
+        size = 4
         passes = 2
+        noise = 0.008
+        contrast = 0.8916
+        brightness = 0.8
     }
 }
 
 animations {
     enabled = yes
 
-    animation = windows, 1, 7, default
-    animation = windowsOut, 1, 7, default
+    bezier = windowIn, 0.06, 0.71, 0.25, 1
+    bezier = windowResize, 0.04, 0.67, 0.38, 1
+
+    animation = windowsIn, 1, 3, windowIn, slide #popin 20%
+    animation = windowsOut, 1, 3, windowIn, slide #popin 70%
+    animation = windowsMove, 1, 2.5, windowResize
     animation = border, 1, 10, default
     animation = borderangle, 1, 8, default
-    animation = fade, 1, 7, default
+    animation = fade, 1, 3, default
     animation = workspaces, 1, 6, default
+	animation = layers, 1, 5, windowIn, slide
+}
+
+gestures {
+    workspace_swipe = true
+    workspace_swipe_fingers = 3
+    workspace_swipe_forever = true
+    workspace_swipe_cancel_ratio = 0.15
+}
+
+misc {
+	disable_hyprland_logo = true
+	disable_splash_rendering = true
+    no_direct_scanout = false
+	key_press_enables_dpms = true
+    mouse_move_enables_dpms = true
+    middle_click_paste = true
+	vrr = 1
 }
 
 xwayland {
@@ -57,14 +84,5 @@ xwayland {
     use_nearest_neighbor = false
 }
 
-env = GDK_BACKEND,wayland,x11
-env = SDL_VIDEODRIVER,wayland
-env = CLUTTER_BACKEND,wayland
-
 env = XDG_CURRENT_DESKTOP,Hyprland
 env = XDG_SESSION_DESKTOP,Hyprland
-
-env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-env = QT_QPA_PLATFORM,wayland;xcb
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-env = QT_QPA_PLATFORMTHEME,gtk2
diff --git a/.config/hypr/config.d/workspaces.conf b/.config/hypr/config.d/workspaces.conf
index 2f3e81c..408b05f 100644
--- a/.config/hypr/config.d/workspaces.conf
+++ b/.config/hypr/config.d/workspaces.conf
@@ -1,6 +1,6 @@
 
 dwindle {
-    pseudotile = yes 
+    pseudotile = yes
     preserve_split = yes
 }
 
@@ -17,10 +17,10 @@ bind = $mod, down, movefocus, d
 
 # Move window across workspace with mod + arrow keys
 
-bind = $mod SHIFT, left, movewindow, l
-bind = $mod SHIFT, right, movewindow, r
-bind = $mod SHIFT, up, movewindow, u
-bind = $mod SHIFT, down, movewindow, d
+bind = $mod SHIFT, left, hy3:movewindow, l
+bind = $mod SHIFT, right, hy3:movewindow, r
+bind = $mod SHIFT, up, hy3:movewindow, u
+bind = $mod SHIFT, down, hy3:movewindow, d
 
 # Switch workspaces with mod + [0-9]
 
@@ -47,6 +47,27 @@ bind = $mod SHIFT, 8, movetoworkspacesilent, 8
 bind = $mod SHIFT, 9, movetoworkspacesilent, 9
 bind = $mod SHIFT, 0, movetoworkspacesilent, 10
 
+# Move to tab
+
+bind = $mod CONTROL, 1, hy3:focustab, index, 01
+bind = $mod CONTROL, 2, hy3:focustab, index, 02
+bind = $mod CONTROL, 3, hy3:focustab, index, 03
+bind = $mod CONTROL, 4, hy3:focustab, index, 04
+bind = $mod CONTROL, 5, hy3:focustab, index, 05
+bind = $mod CONTROL, 6, hy3:focustab, index, 06
+bind = $mod CONTROL, 7, hy3:focustab, index, 07
+bind = $mod CONTROL, 8, hy3:focustab, index, 08
+bind = $mod CONTROL, 9, hy3:focustab, index, 09
+bind = $mod CONTROL, 0, hy3:focustab, index, 10
+
+bindn = , mouse:272, hy3:focustab, mouse
+bindn = , mouse_down, hy3:focustab, l, require_hovered
+bindn = , mouse_up, hy3:focustab, r, require_hovered
+
+bind = $mod SHIFT, B, hy3:makegroup, h
+bind = $mod SHIFT, V, hy3:makegroup, v
+bind = $mod SHIFT, C, hy3:changegroup, toggletab
+
 # Scroll through existing workspaces with mod + scroll
 
 bind = $mod, mouse_down, workspace, e+1
diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf
index d0a977a..6c42e94 100644
--- a/.config/hypr/hypridle.conf
+++ b/.config/hypr/hypridle.conf
@@ -1,4 +1,4 @@
-general {
+leneral {
     lock_cmd = pidof hyprlock || hyprlock       # dbus/sysd lock command (loginctl lock-session)
     before_sleep_cmd = loginctl lock-session     # command ran before sleep
     after_sleep_cmd = hyprctl dispatch dpms on  # command ran after sleep
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 8674248..bbb70ea 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -7,7 +7,7 @@ $menu = wofi --allow-images --show drun --prompt "Search Program"
 $scale = 1.25
 
 $radius = 0
-$border = 0
+$border = 1
 
 $browser = librewolf
 
@@ -19,4 +19,5 @@ source = ~/.config/hypr/config.d/input.conf
 source = ~/.config/hypr/config.d/workspaces.conf
 source = ~/.config/hypr/monitors.conf
 
+exec-once = hyprpm reload -n
 exec-once = ~/.config/hypr/scripts.d/autostart.sh
diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
index 19ee788..c511be5 100644
--- a/.config/hypr/hyprlock.conf
+++ b/.config/hypr/hyprlock.conf
@@ -69,3 +69,4 @@ label {
     halign = center
     valign = center
 }
+
diff --git a/.config/hypr/monitors.conf b/.config/hypr/monitors.conf
index 045cac0..5448cc3 100644
--- a/.config/hypr/monitors.conf
+++ b/.config/hypr/monitors.conf
@@ -1,4 +1,4 @@
-# Generated by nwg-displays on 2024-06-05 at 18:46:28. Do not edit manually.
+# Generated by nwg-displays on 2024-06-18 at 20:22:23. Do not edit manually.
 
-monitor=eDP-1,2560x1600@90.0,2560x0,1.25
-monitor=DP-2,2560x1440@59.95,0x0,1.0
+monitor=eDP-1,2560x1600@90.0,0x0,1.25
+monitor=DP-2,2560x1440@59.95,2048x0,1.0
diff --git a/.config/hypr/scripts.d/autostart.sh b/.config/hypr/scripts.d/autostart.sh
index 7da98a9..0b782b7 100755
--- a/.config/hypr/scripts.d/autostart.sh
+++ b/.config/hypr/scripts.d/autostart.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-waybar --config $HOME/.config/waybar/config.hypr &
+waybar --config $HOME/.config/waybar/config.hypr --style $HOME/.config/waybar/style.hypr.css &
 
 nm-applet --indicator &
 
diff --git a/.config/hypr/workspaces.conf b/.config/hypr/workspaces.conf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.config/hypr/workspaces.conf
diff --git a/.config/sway/config b/.config/sway/config
index 79b2c6c..d8526ad 100755..100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -34,5 +34,8 @@ include /etc/sway/config.d/*
 # Local configs
 include $HOME/.config/sway/config.d/*
 
+# Nwg
+include $HOME/.config/sway/outputs
+
 # Autostart apps
 exec $HOME/.config/sway/scripts.d/auto.sh
diff --git a/.config/sway/config.d/idle b/.config/sway/config.d/idle
deleted file mode 100644
index 2b239fe..0000000
--- a/.config/sway/config.d/idle
+++ /dev/null
@@ -1,5 +0,0 @@
-# Turn off display after tiemout
-exec swayidle -w \
-    timeout 300 'swaylock' \
-    timeout 300 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
-    before-sleep 'swaylock'
diff --git a/.config/sway/config.d/input b/.config/sway/config.d/input
index 8ee6ba7..9cb7156 100644
--- a/.config/sway/config.d/input
+++ b/.config/sway/config.d/input
@@ -17,4 +17,4 @@ input type:touchpad {
 }
 
 # Screen settings
-output eDP-1 resolution 3072x1920 scale $scale
+# output eDP-1 resolution 3072x1920 scale $scale
diff --git a/.config/sway/config.d/workspaces b/.config/sway/config.d/workspaces
index 2d5b378..5fac86b 100644
--- a/.config/sway/config.d/workspaces
+++ b/.config/sway/config.d/workspaces
@@ -36,6 +36,7 @@ bindsym $mod+Shift+9 move container to workspace number 9
 # Layout stuff:
 
 # Set the new window positioning mode
+bindsym $mod+Shift+d layout default
 bindsym $mod+Shift+b layout splith
 bindsym $mod+Shift+v layout splitv
 bindsym $mod+Shift+c layout tabbed
diff --git a/.config/sway/outputs b/.config/sway/outputs
new file mode 100644
index 0000000..08b8c77
--- /dev/null
+++ b/.config/sway/outputs
@@ -0,0 +1,20 @@
+# Generated by nwg-displays on 2024-06-15 at 16:21:56. Do not edit manually.
+
+output "eDP-1" {
+    mode  2560x1600@90.003Hz
+    pos 2560 160
+    transform normal
+    scale 1.25
+    scale_filter linear
+    adaptive_sync off
+    dpms on
+}
+output "DP-2" {
+    mode  2560x1440@59.951Hz
+    pos 0 0
+    transform normal
+    scale 1.0
+    scale_filter linear
+    adaptive_sync off
+    dpms on
+}
diff --git a/.config/sway/scripts.d/auto.sh b/.config/sway/scripts.d/auto.sh
index b3456d0..07a61fd 100755
--- a/.config/sway/scripts.d/auto.sh
+++ b/.config/sway/scripts.d/auto.sh
@@ -1,14 +1,14 @@
 #!/usr/bin/env bash
 
 nm-applet --indicator &
-autotiling &
+autotiling-rs &
 
 /usr/bin/gnome-keyring-daemon --foreground &
 wl-clip-persist --clipboard both &
 
-gtk-launch discord &
-gtk-launch fluffychat &
-gtk-launch org.gajim.Gajim &
-gtk-launch org.mozilla.Thunderbird &
+#gtk-launch discord &
+#gtk-launch io.element.Element &
+#gtk-launch org.gajim.Gajim &
+#gtk-launch org.mozilla.Thunderbird &
 
 hypridle &
diff --git a/.config/sway/workspaces b/.config/sway/workspaces
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.config/sway/workspaces
diff --git a/.config/waybar/config.hypr b/.config/waybar/config.hypr
index d2d6322..7d9cabb 100644
--- a/.config/waybar/config.hypr
+++ b/.config/waybar/config.hypr
@@ -1,5 +1,5 @@
 {
-    "height": 30,
+    "height": 24,
     "position": "top",
     "layer": "top",
     "spacing": 4,
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index ca65862..5d43bf5 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -12,11 +12,8 @@ window#waybar {
 
 window#waybar > box {
     color: #c7c6c3;
-    margin-bottom: 8px;
     box-shadow: 1px 1px 3px 1px #151515;
     background-color: rgba(30, 30, 46, 0.85);
-    transition-property: background-color;
-    transition-duration: .5s;
 }
 
 button {
diff --git a/.config/waybar/style.hypr.css b/.config/waybar/style.hypr.css
new file mode 100644
index 0000000..be2f0bb
--- /dev/null
+++ b/.config/waybar/style.hypr.css
@@ -0,0 +1,146 @@
+* {
+    font-family: "Fira Mono", "Font Awesome 6 Pro", monospace;
+    font-size: 13.5px;
+    transition: none;
+    margin: 0;
+    padding: 0;
+}
+
+window#waybar {
+    background-color: transparent;
+}
+
+window#waybar > box {
+    color: #c7c6c3;
+    background-color: rgba(30, 30, 46, 0.85);
+    /*margin-bottom: 4px;
+    box-shadow: 1px 1px 3px 1px #151515;
+    transition-property: background-color;
+    transition-duration: .5s;*/
+}
+
+button {
+    border: none;
+    border-radius: 0;
+}
+
+.modules-left {
+    margin-left: -4px;
+}
+
+#workspaces button {
+    all: initial;
+    padding: 0px 8px;
+    color: #c7c6c3;
+    background-color: rgba(0, 0, 0, 0);
+}
+
+#workspaces button:hover {
+    box-shadow: inherit;
+    text-shadow: inherit;
+}
+
+#workspaces button.focused,
+#workspaces button.active {
+    background-color: #789ebf;
+    color: #14171d;
+    box-shadow: inherit;
+    text-shadow: inherit;
+}
+
+#workspaces button.urgent {
+    background-color: #cc5c5c;
+    box-shadow: inherit;
+    text-shadow: inherit;
+}
+
+#clock,
+#battery,
+#cpu,
+#memory,
+#disk,
+#temperature,
+#backlight,
+#network,
+#wireplumber,
+#custom-media,
+#tray,
+#mode,
+#idle_inhibitor,
+#scratchpad,
+#custom-cmus,
+#custom-newsboat,
+#mpd {
+    padding: 0 10px;
+    border-right: 1px solid #4d4754;
+    color: #c7c6c3;
+}
+
+#tray {
+    border: none;
+}
+
+#window {
+    padding: 0 10px;
+    border-left: 1px solid #4d4754;
+    color: #c7c6c3;
+}
+
+#window,
+#workspaces {
+    margin: 0 4px;
+}
+
+#battery {
+    color: #97bd5e;
+}
+
+#battery.warning:not(.charging) {
+    color: #f0c767;
+}
+
+#battery.critical:not(.charging) {
+    color: #cc5c5c;
+}
+
+#network.disconnected,
+#wireplumber.muted {
+    color: #cc5c5c;
+}
+
+#network.wifi,
+#network.ethernet {
+    color: #789ebf;
+}
+
+#wireplumber {
+    color: #E0DB5F;
+}
+
+#backlight {
+    color: #E05F91;
+}
+
+#cpu {
+    color: #789ebf;
+}
+
+#memory {
+    color: #a97fb3;
+}
+
+#temperature {
+    color: #97bd5e;
+}
+
+#temperature.critical {
+    color: #cc5c5c;
+}
+
+#tray > .passive {
+    -gtk-icon-effect: dim;
+}
+
+#tray > .needs-attention {
+    -gtk-icon-effect: highlight;
+}