4 files changed, 96 insertions, 34 deletions
diff --git a/.config/gtk-2.0/gtkrc-2.0 b/.config/gtk-2.0/gtkrc-2.0
index 67ecc7f..62f9aee 100644
--- a/.config/gtk-2.0/gtkrc-2.0
+++ b/.config/gtk-2.0/gtkrc-2.0
@@ -5,7 +5,7 @@ include "/home/krolyxon/.gtkrc-2.0.mine"
 gtk-theme-name="Arc-Dark"
 gtk-icon-theme-name="Papirus-Dark"
 gtk-font-name="JetBrainsMonoNL Nerd Font Thin 11"
-gtk-cursor-theme-name="WhiteSur-cursors"
+gtk-cursor-theme-name="Adwaita"
 gtk-cursor-theme-size=0
 gtk-toolbar-style=GTK_TOOLBAR_BOTH
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index ef7f7c3..80ad822 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -9,7 +9,7 @@ autogenerated = 0
 $terminal = alacritty
 $fileManager = pcmanfm
 # $menu = rofi -show drun
-$menu = wofi --show drun
+$menu = rofi -show drun
 $browser = brave
 
 
@@ -67,8 +67,8 @@ permission = /usr/(bin|local/bin)/hyprpm, plugin, allow
 ### LOOK AND FEEL ###
 #####################
 general {
-    gaps_in = 10
-    gaps_out = 10
+    gaps_in = 5
+    gaps_out = 5
     border_size = 2
     resize_on_border = false
     allow_tearing = false
@@ -186,7 +186,7 @@ bind = $mainMod SHIFT, R, togglefloating,
 bind = $mainMod, R, exec, $menu
 bind = $mainMod SHIFT, P, pseudo, # dwindle
 bind = $mainMod, J, togglesplit, # dwindle
-bind = $mainMod, tab, cyclenext, prev
+binde = $mainMod, tab, cyclenext, prev
 bind = $mainMod, b, exec, killall waybar || waybar
 
 # Applications
@@ -195,14 +195,17 @@ bind = $mainMod, W, exec, $browser
 # Music Controls
 bind = $mainMod, m, exec, $terminal -e "ncmpcpp"
 bind = $mainMod, p, exec, mpc toggle
-bind = $mainMod, comma, exec, mpc seek -10
-bind = $mainMod, period, exec, mpc seek -10
-
-# Move focus with mainMod + arrow keys
-bind = $mainMod, h, movefocus, l
-bind = $mainMod, j, movefocus, r
-bind = $mainMod, k, movefocus, u
-bind = $mainMod, l, movefocus, d
+binde = $mainMod, comma, exec, mpc seek -10
+binde = $mainMod, period, exec, mpc seek +10
+
+# Swap current focused window with master
+bind = $mainMod, space, layoutmsg, swapwithmaster
+
+# Resize windows with h/j/k/l
+binde = $mainMod, h, resizeactive, -30 0
+binde = $mainMod, l, resizeactive, 30 0
+binde = $mainMod, k, resizeactive, 0 -30
+binde = $mainMod, j, resizeactive, 0 30
 
 # Switch workspaces with mainMod + [0-9]
 bind = $mainMod, 1, split-workspace, 1
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index abaced1..ebd88ad 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -13,7 +13,6 @@
     "modules-center" : [
     ],
     "modules-right": [
-        "mpd",
         "pulseaudio",
         "battery",
         "cpu",
@@ -133,13 +132,4 @@
         },
         "on-click": "pavucontrol",
     },
-    "mpd": {
-        "format": "Playing ",
-        "format-paused": "Paused ",
-        "format-stopped": "Stopped ",
-        "max-length": 20,
-        "tooltip": false,
-        "tooltip-format": "{title}\n{artist}\n{album}",
-        "tooltip": true
-    },
 }
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index a2f0c3e..aad1d25 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,19 +1,88 @@
-* {
+/*
+*
+* Catppuccin Mocha palette
+* Maintainer: rubyowo
+*
+*/
+
+@define-color base   #1e1e2e;
+@define-color mantle #181825;
+@define-color crust  #11111b;
+
+@define-color text     #cdd6f4;
+@define-color subtext0 #a6adc8;
+@define-color subtext1 #bac2de;
+
+@define-color surface0 #313244;
+@define-color surface1 #45475a;
+@define-color surface2 #585b70;
+
+@define-color overlay0 #6c7086;
+@define-color overlay1 #7f849c;
+@define-color overlay2 #9399b2;
+
+@define-color blue      #89b4fa;
+@define-color lavender  #b4befe;
+@define-color sapphire  #74c7ec;
+@define-color sky       #89dceb;
+@define-color teal      #94e2d5;
+@define-color green     #a6e3a1;
+@define-color yellow    #f9e2af;
+@define-color peach     #fab387;
+@define-color maroon    #eba0ac;
+@define-color red       #f38ba8;
+@define-color mauve     #cba6f7;
+@define-color pink      #f5c2e7;
+@define-color flamingo  #f2cdcd;
+@define-color rosewater #f5e0dc;
+
+
+
+
+/* * { */
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: JetBrains Mono Nerd Font, FontAwesome;
-    font-size: 13px;
-    font-weight: bold;
-}
+/*     font-family: JetBrains Mono Nerd Font, FontAwesome; */
+/*     font-size: 13px; */
+/*     font-weight: bold; */
+/* } */
+
+* {
+font-family: "JetBrainsMono Nerd Font";
+font-weight: bold;
+min-height: 0;
+/* set font-size to 100% if font scaling is set to 1.00 using nwg-look */
+font-size: 97%;
+font-feature-settings: '"zero", "ss01", "ss02", "ss03", "ss04", "ss05", "cv31"';
+padding: 0.03125rem;
+}
+
+/* window#waybar { */
+/*     background-color: rgba(0, 0, 0, 0); */
+/*     color: #e3e3e3; */
+/*     transition-property: background-color; */
+/*     transition-duration: .5s; */
+/*     border: none; */
+/*     border-radius: 0; */
+/* } */
 
 window#waybar {
-    background-color: rgba(0, 0, 0, 0);
-    color: #e3e3e3;
-    transition-property: background-color;
-    transition-duration: .5s;
-    border: none;
-    border-radius: 0;
+  transition-property: background-color;
+  transition-duration: 0.5s;
+  background: transparent;
+  /*border: 2px solid @overlay0;*/
+  /*background: @theme_base_color;*/
+  border-radius: 10px;
 }
 
+window#waybar.hidden {
+  opacity: 0.2;
+}
+
+#waybar.empty #window {
+  background: none;
+}
+
+
 /**************/
 /* Workspaces */
 /**************/