i like yaoi

12 files changed, 64 insertions, 181 deletions

diff --git a/.config/hypr/config.d/colors.conf b/.config/hypr/config.d/colors.conf
new file mode 100644
index 0000000..9d31302
--- /dev/null
+++ b/.config/hypr/config.d/colors.conf
@@ -0,0 +1,5 @@
+
+
+$active_color =	rgb(4d4754)
+$base_color = rgb(14171d)
+$text_color = rgb(ffffff)
diff --git a/.config/hypr/config.d/input.conf b/.config/hypr/config.d/input.conf
index 69fe174..363c473 100644
--- a/.config/hypr/config.d/input.conf
+++ b/.config/hypr/config.d/input.conf
@@ -1,7 +1,6 @@
 monitor= eDP-1, highres, auto, $scale
 
 env = GDK_SCALE,1.25
-env = XCURSOR_SIZE, 24
 
 input {
     kb_layout = us
diff --git a/.config/hypr/config.d/keybinds.conf b/.config/hypr/config.d/keybinds.conf
index bbb1af6..4c24083 100644
--- a/.config/hypr/config.d/keybinds.conf
+++ b/.config/hypr/config.d/keybinds.conf
@@ -10,7 +10,7 @@ bind = $mod, L, exec, hyprlock
 bind = $mod SHIFT, L, exec, killall Hyprland
 
 bind = $mod SHIFT, Q, killactive
-bind = $mod, F5, exec, killall waybar && waybar --config ~/.config/waybar/config.hypr --style ~/.config/waybar/style.hypr.css
+bind = $mod, F5, exec, sh -c 'killall waybar; waybar --config ~/.config/waybar/config.hypr'
 
 binde =, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+
 binde =, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
diff --git a/.config/hypr/config.d/theme.conf b/.config/hypr/config.d/theme.conf
index 0de56bd..80ceae7 100644
--- a/.config/hypr/config.d/theme.conf
+++ b/.config/hypr/config.d/theme.conf
@@ -7,29 +7,45 @@ general {
     extend_border_grab_area = 20
 
     border_size = $border
-    col.active_border = rgb(74777d)
-    col.inactive_border = rgb(14171d)
+    col.active_border = $active_color
+    col.inactive_border = $base_color
 }
 
 plugin {
     hy3 {
         tabs {
-            height = 20
-            text_height = 11
-            padding = 0
+            height = 24
+            text_height = 9
+            text_padding = 10
+            padding = 2
             render_text = true
-            rounding = 0
+            text_font = JetBrains Mono Nerd Font Mono Bold
+            rounding = $radius
 
-            col.active = rgb(24272d)
-            col.inactive = rgb(14171d)
-            col.text.active = rgb(ffffff)
-            col.text.inactive = rgb(ffffff)
+            col.active = $active_color
+            col.inactive = $base_color
+            col.text.active = $text_color
+            col.text.inactive = $text_color
         }
 
         autotile {
             enable = true
         }
     }
+
+    hyprbars {
+        bar_height = 24
+        bar_color = $base_color
+        col.text = $text_color
+        bar_text_size = 9
+        bar_text_font = JetBrains Mono Nerd Font Mono Bold
+        bar_button_padding = 12
+        bar_padding = 10
+        bar_precedence_over_border = true
+        hyprbars-button = rgb(000000), 16, , hyprctl dispatch killactive
+        hyprbars-button = rgb(000000), 16, , hyprctl dispatch fullscreen 2
+        hyprbars-button = rgb(000000), 16, , hyprctl dispatch togglefloating
+   }
 }
 
 decoration {
diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf
index 6c42e94..d0a977a 100644
--- a/.config/hypr/hypridle.conf
+++ b/.config/hypr/hypridle.conf
@@ -1,4 +1,4 @@
-leneral {
+general {
     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 bbb70ea..0c1b55a 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -6,18 +6,19 @@ $menu = wofi --allow-images --show drun --prompt "Search Program"
 
 $scale = 1.25
 
-$radius = 0
-$border = 1
+$radius = 5
+$border = 2
 
 $browser = librewolf
 
 exec-once = ~/.config/hypr/scripts.d/systemd.sh
+exec-once = hyprpm reload -n
 
+source = ~/.config/hypr/config.d/colors.conf
 source = ~/.config/hypr/config.d/keybinds.conf
 source = ~/.config/hypr/config.d/theme.conf
 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/user-dirs.dirs b/.config/user-dirs.dirs
index 8f61014..894aa91 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -4,10 +4,10 @@
 # Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
 # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
 # absolute path. No other format is supported.
-# 
+#
 XDG_DESKTOP_DIR="$HOME/"
-XDG_DOCUMENTS_DIR="$HOME/"
-XDG_DOWNLOAD_DIR="$HOME/"
+XDG_DOCUMENTS_DIR="$HOME/documents"
+XDG_DOWNLOAD_DIR="$HOME/downloads/"
 XDG_MUSIC_DIR="$HOME/"
 XDG_PICTURES_DIR="$HOME/"
 XDG_PUBLICSHARE_DIR="$HOME/"
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 5d43bf5..0d159fd 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,5 +1,5 @@
 * {
-    font-family: "Fira Mono", "Font Awesome 6 Pro", monospace;
+    font-family: "JetBrains Mono", "Font Awesome 6 Pro", monospace;
     font-size: 13.5px;
     transition: none;
     margin: 0;
@@ -11,9 +11,10 @@ window#waybar {
 }
 
 window#waybar > box {
+    margin: 10px;
+    margin-bottom: 0px;
+    padding: 0;
     color: #c7c6c3;
-    box-shadow: 1px 1px 3px 1px #151515;
-    background-color: rgba(30, 30, 46, 0.85);
 }
 
 button {
@@ -21,34 +22,40 @@ button {
     border-radius: 0;
 }
 
-.modules-left {
-    margin-left: -4px;
+.modules-left,
+.modules-right {
+    margin: 0;
+    padding: 2px 0px;
+    background-color: #14171d;
+    border-radius: 4px;
+}
+
+#workspaces {
+    padding: 0px 0px;
 }
 
 #workspaces button {
     all: initial;
-    padding: 0px 8px;
+    box-shadow: inherit;
+    text-shadow: inherit;
     color: #c7c6c3;
-    background-color: rgba(0, 0, 0, 0);
+    background-color: transparent;
+    border-radius: 4px;
+    padding: 2px 8px;
 }
 
 #workspaces button:hover {
-    box-shadow: inherit;
-    text-shadow: inherit;
+    background-color: #1a2a3a;
 }
 
 #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,
diff --git a/.config/waybar/style.hypr.css b/.config/waybar/style.hypr.css
deleted file mode 100644
index be2f0bb..0000000
--- a/.config/waybar/style.hypr.css
+++ /dev/null
@@ -1,146 +0,0 @@
-* {
-    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;
-}
diff --git a/.gtkrc-2.0 b/.gtkrc-2.0
index d517ea9..69a808e 100644
--- a/.gtkrc-2.0
+++ b/.gtkrc-2.0
@@ -5,7 +5,7 @@ include "/home/freya/.gtkrc-2.0.mine"
 gtk-theme-name="Mint-Y-Dark-Pink"
 gtk-icon-theme-name="Mint-Y-Pink"
 gtk-font-name="Noto Sans,  10"
-gtk-cursor-theme-name="wii"
+gtk-cursor-theme-name="Adwaita"
 gtk-cursor-theme-size=24
 gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
diff --git a/.zprofile b/.zprofile
index 5b9aa60..72c679e 100644
--- a/.zprofile
+++ b/.zprofile
@@ -34,6 +34,8 @@ export LD=$(which gcc)
 # theming
 export QT_QPA_PLATFORMTHEME=gtk2
 export GTK_THEME=Mint-Y-Dark-Pink
+export XCURSOR_THEME=Adwaita
+export XCURSOR_SIZE=24
 
 if [ -n "$TMUX" ]; then
     return
diff --git a/packages b/packages
index 9ad3f5e..b079de3 100644
--- a/packages
+++ b/packages
@@ -79,7 +79,6 @@ mesa-utils
 mesa-vdpau
 mpv
 nasm
-nautilus
 neofetch
 neovim
 network-manager-applet
@@ -130,7 +129,7 @@ traceroute
 tree
 tree-sitter-cli
 ttf-dejavu
-ttf-fira-code
+ttf-jetbrains-mono
 ufw
 unzip
 valgrind