ozone and waybar fix

.zshrc

@@ -0,0 +1,122 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
+
+# Path to your oh-my-zsh installation.
+export ZSH="$HOME/.oh-my-zsh"
+
+# Set name of the theme to load --- if set to "random", it will
+# load a random theme each time oh-my-zsh is loaded, in which case,
+# to know which specific one was loaded, run: echo $RANDOM_THEME
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
+ZSH_THEME="noctra"
+
+# Set list of themes to pick from when loading at random
+# Setting this variable when ZSH_THEME=random will cause zsh to load
+# a theme from this variable instead of looking in $ZSH/themes/
+# If set to an empty array, this variable will have no effect.
+# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion.
+# Case-sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment one of the following lines to change the auto-update behavior
+# zstyle ':omz:update' mode disabled  # disable automatic updates
+# zstyle ':omz:update' mode auto      # update automatically without asking
+# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
+
+# Uncomment the following line to change how often to auto-update (in days).
+# zstyle ':omz:update' frequency 13
+
+# Uncomment the following line if pasting URLs and other text is messed up.
+# DISABLE_MAGIC_FUNCTIONS="true"
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# You can also set it to another string to have that shown instead of the default red dots.
+# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
+# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load?
+# Standard plugins can be found in $ZSH/plugins/
+# Custom plugins may be added to $ZSH_CUSTOM/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(git)
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+#eval "$(atuin init zsh --disable-up-arrow)"
+
+# Created by `pipx` on 2024-11-26 12:08:30
+export PATH="$PATH:/home/catman/.local/bin"
+
+
+# custom
+alias bonsai="bonsai.sh -li"
+alias vaporeon='pokemonsay -D 134 -N "$(fortune -o)"'
+alias nv="nvim"
+alias install="sudo pacman -Sy"
+alias remove="sudo pacman -Rs"
+
+# neovim different configs
+#export NVIM_APPNAME=nvchad
+#alias nvdev="NVIM_APPNAME=nvdev nvim"
+
+# say pleeeeease
+#alias sudo="printf 'say please\n'"
+#alias please="/usr/bin/sudo"

hypridle.conf

@@ -0,0 +1,24 @@
+general {
+    lock_cmd = pidof hyprlock || hyprlock
+    before_sleep_cmd = loginctl lock-session
+    after_sleep_cmd = hyprctl dispatch dpms on
+}
+
+
+listener {
+    timeout = 300
+    on-timeout = brightnessctl -c backlight -s set 10%
+    on-resume = brightnessctl -c backlight -r
+}
+
+listener {
+    timeout = 360
+    on-timeout = hyprctl dispatch dpms off
+    on-resume = hyprctl dispatch dpms on
+}
+
+listener {
+    timeout = 420
+    on-timeout = systemctl suspend
+}
+

hyprland.conf

@@ -1,221 +1,327 @@
-source=~/.config/hypr/mocha.conf
+autogenerated = 0 
+debug:disable_logs = true
+misc:middle_click_paste = false
 
-# See https://wiki.hyprland.org/Configuring/Monitors/
-monitor=,highres,auto,auto
+################
+### MONITORS ###
+################
+# Builtin
 monitor=eDP-1,highres,0x0,1.566667
+# Home
+monitor=desc:HKC OVERSEAS LIMITED 27E1Q 0000000000001,2560x1440@144,2256x0,1
+monitor=desc:Acer Technologies GN276HL T6BEE0018501,1920x1080,4816x0,1,transform,3
+monitor=desc:HAT Kamvas 16 L56051794302,1920x1080,5896x0,1
+# Away
+monitor=desc:Samsung Electric Company SAMSUNG,1920x1080@60,2256x0,1
+monitor=desc:LG Electronics IPS225 Serial Number,1920x1080@60,-1920x0,1
+# Default
+monitor=,highres,auto,auto
 
-workspace = name:special:magic,monitor:eDP-1,gapsin:10,gapsout:100
 
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
-
-# Execute your favorite apps at launch
-# exec-once = waybar & hyprpaper & firefox
-exec-once = waybar -c ~/.config/waybar/hypr-config -s ~/.config/waybar/hypr-style.css
-exec-once = pypr  --config ~/.config/hypr/pyprland.toml
-exec-once = swayidle -w
-exec-once = nm-applet
-exec-once = blueman-applet
-exec-once = easyeffects --gapplication-service
+##########################
+### AUTOSTART SERVICES ###
+##########################
+exec-once = kanshi
 exec-once = hyprpaper
-exec-once = kdeconnect-indicator
-exec-once = playerctld daemon
+exec-once = hypridle
+exec-once = waybar &> ~/waybar_startup.log
+exec-once = easyeffects --gapplication-service
+exec-once = nm-applet --indicator
+exec-once = kdeconnectd
+exec-once = systemctl --user start hyprpolkitagent
 
-# Source a file (multi-file configs)
-# source = ~/.config/hypr/myColors.conf
 
-# Set programs that you use
-$terminal = kitty
-$browser = vivaldi-stable --enable-features=UseOzonePlatform --ozone-platform=wayland
-$music = tidal-hifi --enable-features=UseOzonePlatform --ozone-platform=wayland
-$fileManager = thunar
-$menu = wofi --show drun
-$powermenu = ~/.config/hypr/power-menu
-$lockscreen = swaylock -C ~/.config/swaylock/config
+###################
+### pavucontrol ###
+###################
+exec-once = [workspace 9 silent] pavucontrol
+exec-once = sleep 1.0 && killall pavucontrol
 
-# Some default env vars.
+##############################
+### AUTOSTART APPLICATIONS ###
+##############################
+exec-once = [workspace 4 silent] thunderbird
+
+
+#############
+### AUDIO ###
+#############
+exec-once = pactl set-sink-mute alsa_output.pci-0000_c1_00.6.analog-stereo true
+exec-once = pactl set-sink-volume alsa_output.pci-0000_c1_00.6.analog-stereo 0%
+
+
+####################
+### ENVIRONMENT  ###
+####################
 env = XCURSOR_SIZE,24
+env = HYPRCURSOR_SIZE,24
+env = HYPRCURSOR,Sweet-cursors-hyprcursor
+env = QT_QPA_PLATFORM,wayland
+env = ELECTRON_OZONE_PLATFORM_HINT,wayland
 env = GDK_SCALE,2
-env = QT_QPA_PLATFORMTHEME,qt5ct # change to qt6ct if you have that
 
-xwayland {
-  force_zero_scaling = true
+
+#################
+### DARK MODE ###
+#################
+env = QT_QPA_PLATFORMTHEME,qt6ct 
+exec-once = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
+exec-once = gsettings set org.gnome.desktop.interface gtk-theme "adw-gtk3"
+
+
+###################
+### PERMISSIONS ###
+###################
+ecosystem {
+  enforce_permissions = 1
 }
 
-# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
+permission = /usr/bin/hyprpicker, screencopy, allow
+permission = /usr/bin/grim, screencopy, allow
+permission = /usr/bin/hyprlock, screencopy, allow
+#permission = /usr/(bin|local/bin)/grim, screencopy, allow
+#permission = /usr/(lib|libexec|lib64)/xdg-desktop-portal-hyprland, screencopy, allow
+
+
+#####################
+### LOOK AND FEEL ###
+#####################
+
+# Refer to https://wiki.hyprland.org/Configuring/Variables/
+
+# https://wiki.hyprland.org/Configuring/Variables/#general
+general {
+    gaps_in = 2
+    gaps_out = 4
+
+    border_size = 1
+
+    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
+    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
+    col.inactive_border = rgba(595959aa)
+
+    # Set to true enable resizing windows by clicking and dragging on borders and gaps
+    resize_on_border = false
+
+    # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
+    allow_tearing = false
+
+    layout = dwindle
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#decoration
+decoration {
+    rounding = 2
+    rounding_power = 2
+
+    # Change transparency of focused and unfocused windows
+    active_opacity = 1.0
+    inactive_opacity = 1.0
+
+    shadow {
+        enabled = true
+        range = 4
+        render_power = 3
+        color = rgba(1a1a1aee)
+    }
+
+    # https://wiki.hyprland.org/Configuring/Variables/#blur
+    blur {
+        enabled = true
+        size = 3
+        passes = 1
+
+        vibrancy = 0.1696
+    }
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#animations
+animations {
+    enabled = yes, please :)
+
+    # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
+
+    bezier = easeOutQuint,0.23,1,0.32,1
+    bezier = easeInOutCubic,0.65,0.05,0.36,1
+    bezier = linear,0,0,1,1
+    bezier = almostLinear,0.5,0.5,0.75,1.0
+    bezier = quick,0.15,0,0.1,1
+
+    animation = global, 1, 10, default
+    animation = border, 1, 5.39, easeOutQuint
+    animation = windows, 1, 4.79, easeOutQuint
+    animation = windowsIn, 1, 4.1, easeOutQuint, popin 87%
+    animation = windowsOut, 1, 1.49, linear, popin 87%
+    animation = fadeIn, 1, 1.73, almostLinear
+    animation = fadeOut, 1, 1.46, almostLinear
+    animation = fade, 1, 3.03, quick
+    animation = layers, 1, 3.81, easeOutQuint
+    animation = layersIn, 1, 4, easeOutQuint, fade
+    animation = layersOut, 1, 1.5, linear, fade
+    animation = fadeLayersIn, 1, 1.79, almostLinear
+    animation = fadeLayersOut, 1, 1.39, almostLinear
+    animation = workspaces, 1, 1.94, almostLinear, fade
+    animation = workspacesIn, 1, 1.21, almostLinear, fade
+    animation = workspacesOut, 1, 1.94, almostLinear, fade
+}
+
+# Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/
+# "Smart gaps" / "No gaps when only"
+workspace = w[tv1], gapsout:0, gapsin:0
+workspace = f[1], gapsout:0, gapsin:0
+windowrule = border_size 0, match:float no, match:workspace w[tv1]
+windowrule = rounding 0, match:float no, match:workspace w[tv1]
+windowrule = border_size 0, match:float no, match:workspace f[1]
+windowrule = rounding 0, match:float no, match:workspace f[1]
+
+# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
+dwindle {
+    pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    preserve_split = true # You probably want this
+    force_split = 2
+}
+
+# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
+master {
+    new_status = master
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#misc
+misc {
+    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
+    disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
+}
+
+
+#############
+### INPUT ###
+#############
+
+# https://wiki.hyprland.org/Configuring/Variables/#input
 input {
     kb_layout = de
-    repeat_delay = 350
+    kb_variant =
+    kb_model =
+    kb_options =
+    kb_rules =
+
     repeat_rate = 25
+    repeat_delay = 280
+
 
     follow_mouse = 1
 
+    #sensitivity = -0.5 # -1.0 - 1.0, 0 means no modification.
+
     touchpad {
         natural_scroll = true
         scroll_factor = 0.4
     }
+}
 
+device {
+    name = razer-razer-deathadder-elite
+    sensitivity = 0
     accel_profile = flat
-    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
 
 device {
-  name = logitech-mx-ergo-multi-device-trackball-
-  sensitivity = -0.2
+    name = logitech-usb-receiver
+    sensitivity = -0.2
+    accel_profile = flat
 }
 
 device {
-  name = logitech-g703-ls-1
-  sensitivity = -0.1
+    name = logitech-usb-optical-mouse
+    sensitivity = -0.4
+    accel_profile = flat
 }
 
-general {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-
-    gaps_in = 0
-    gaps_out = 0
-    border_size = 1
-    col.active_border = $lavender
-    col.inactive_border = $surface0
-
-    layout = dwindle
-
-    # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
-    allow_tearing = false
-}
-
-decoration {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-
-    rounding = 0
-
-    blur {
-        enabled = true
-        size = 3
-        passes = 1
-        
-        vibrancy = 0.1696
-    }
-
-    drop_shadow = true
-    shadow_range = 4
-    shadow_render_power = 3
-    col.shadow = rgba(1a1a1aee)
-}
-
-animations {
-    enabled = false
-
-    # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
-
-    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
-
-    animation = windows, 1, 7, myBezier
-    animation = windowsOut, 1, 7, default, popin 80%
-    animation = border, 1, 10, default
-    animation = borderangle, 1, 8, default
-    animation = fade, 1, 7, default
-    animation = workspaces, 1, 6, default
-}
-
-dwindle {
-    # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
-    pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-    preserve_split = true # you probably want this
-    no_gaps_when_only = 1
-    force_split = 2
-}
-
-master {
-    # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-    new_is_master = true
-}
-
-gestures {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    workspace_swipe = false
-}
-
-misc {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    disable_hyprland_logo = 1
-    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
-}
+gesture = 3, horizontal, workspace
+gesture = 3, vertical, special, magic
+gesture = 4, horizontal, resize
+gesture = 4, vertical, fullscreen
 
 # Example per-device config
 # See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
-# device {
-#     name = epic-mouse-v1
-#     sensitivity = -0.5
-# }
-
-# Example windowrule v1
-# windowrule = float, ^(kitty)$
-# Example windowrule v2
-# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-# windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
+device {
+    name = epic-mouse-v1
+    sensitivity = -0.5
+}
 
 
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
+################
+### XWAYLAND ###
+################
+xwayland {
+    force_zero_scaling = true
+}
 
-# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-# bind = $mainMod, Q, exec, $terminal
-# bind = $mainMod, C, killactive,
-# bind = $mainMod, M, exit,
-# bind = $mainMod, E, exec, $fileManager
-# bind = $mainMod, R, exec, $menu
-# bind = $mainMod, P, pseudo, # dwindle
+###################
+### KEYBINDINGS ###
+###################
+# Modifier
+$mainMod = SUPER # Sets "Windows" key as main modifier
 
-$mainMod = SUPER
-$volume_down = $(pactl set-sink-volume @DEFAULT_SINK@ -5% && $sink_volume)
-$volume_up = $(pactl set-sink-volume @DEFAULT_SINK@ +5% && $sink_volume)
+# Programs
+$terminal = alacritty
+$fileManager = thunar
+$menu = wofi --show drun
+$browser = vivaldi --enable-features=UseOzonePlatform --ozone-platform=wayland
+$power_menu = ~/.config/hypr/scripts/power-menu.sh
+$screenshot = hyprshot -z -t 1000 -o ~/Pictures/Screenshots/ -m output
+$screenshot_region = hyprshot -z -t 1000 -o ~/Pictures/Screenshots/ -m region
+$lockscreen = hyprlock
+
+# Variables
+$volume_up = $(pactl set-sink-volume @DEFAULT_SINK@ -5% && $sink_volume)
+$volume_down = $(pactl set-sink-volume @DEFAULT_SINK@ +5% && $sink_volume)
 $volume_mute = $(pactl set-sink-mute @DEFAULT_SINK@ toggle && pactl get-sink-mute @DEFAULT_SINK@ | sed -En "/no/ s/.*/$($sink_volume)/p; /yes/ s/.*/0/p")
 $brightness_up = brightnessctl -c backlight set +5%
 $brightness_down = brightnessctl -c backlight set 5%-
 
-# Utility Keys 
-bind = , XF86AudioMute, exec, $volume_mute
-binde = , XF86AudioLowerVolume, exec, $volume_down
-binde = , XF86AudioRaiseVolume, exec, $volume_up
-
-bind = , XF86AudioPlay, exec, playerctl play-pause
-bind = , XF86AudioNext, exec, playerctl next
-bind = , XF86AudioPrev, exec, playerctl previous
-
-binde = , XF86MonBrightnessUp, exec, $brightness_up
-binde = , XF86MonBrightnessDown, exec, $brightness_down
-bind = , Print, exec, /usr/share/sway/scripts/grimshot --notify save output
-bind = Shift, Print, exec, ~/.config/sway/scripts/screenshot.sh
-
-
-# General Keybinds
-bind = $mainMod,        O,      exec,           $browser
-bind = $mainMod,        P,      exec,           $music
-bind = $mainMod,        D,      exec,           $menu
-bind = $mainMod,        N,      exec,           $fileManager
-bind = $mainMod,        RETURN, exec,           $terminal
-bind = $mainMod SHIFT,  E,      exec,           $powermenu
+# Execution
+bind = $mainMod, 	Q, 	killactive,
+bind = $mainMod, 	RETURN, exec, 		$terminal
+bind = $mainMod, 	N, 	exec, 		$fileManager
+bind = $mainMod, 	D, 	exec, 		$menu
+bind = $mainMod, 	O, 	exec, 		$browser
+bind = $mainMod SHIFT,  E,      exec,           $power_menu
 bind = $mainMod ALT,    L,      exec,           $lockscreen
 
-bind = $mainMod,        Q,      killactive,
-bind = $mainMod,        T,      togglesplit,
-bind = $mainMod,        F,      fullscreen,
-bind = $mainMod SHIFT,  SPACE,  togglefloating,
-
-# Move focus with mainMod + arrow keys
-# bind = $mainMod, left, movefocus, l
-# bind = $mainMod, right, movefocus, r
-# bind = $mainMod, up, movefocus, u
-# bind = $mainMod, down, movefocus, d
+# Windows
+bind = $mainMod SHIFT, SPACE, togglefloating,
+bind = $mainMod, P, pseudo, # dwindle
+bind = $mainMod, J, togglesplit, # dwindle
+bind = $mainMod, F, fullscreen,
 bind = $mainMod, TAB, cyclenext,
 
-# Resize windows
+# Window Resize
 binde = $mainMod, right, resizeactive, 20 0
 binde = $mainMod, left, resizeactive, -20 0
 binde = $mainMod, up, resizeactive, 0 -20
 binde = $mainMod, down, resizeactive, 0 20
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
 
-# Switch workspaces with mainMod + [0-9]
+# Audio
+bind  = , XF86AudioMute,	exec,	$volume_mute
+binde = , XF86AudioLowerVolume,	exec,	$volume_up
+binde = , XF86AudioRaiseVolume,	exec,	$volume_down
+bindl = , XF86AudioNext, 	exec, 	playerctl next
+bindl = , XF86AudioPlay, 	exec, 	playerctl play-pause
+bindl = , XF86AudioPrev, 	exec, 	playerctl previous
+
+# Utility
+binde = ,       XF86MonBrightnessUp,	exec,	$brightness_up
+binde = ,       XF86MonBrightnessDown,  exec,	$brightness_down
+bind  = ,       print,                  exec,   $screenshot
+bind  = SHIFT,  print,                  exec,   $screenshot_region
+
+# Workspaces
+binds {
+    hide_special_on_workspace_change = true
+}
 bind = $mainMod, 1, workspace, 1
 bind = $mainMod, 2, workspace, 2
 bind = $mainMod, 3, workspace, 3
@@ -228,28 +334,43 @@ bind = $mainMod, 9, workspace, 9
 bind = $mainMod, 0, workspace, 10
 
 # Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1
-bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2
-bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3
-bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4
-bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5
-bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6
-bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7
-bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8
-bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9
-bind = $mainMod SHIFT, 0, movetoworkspacesilent, 10
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+
+# Move workspace to active monitor with mainMod + CTRL + [0-9]
+bind = $mainMod CTRL, 1, exec, (hyprctl dispatch moveworkspacetomonitor 1 current; hyprctl dispatch workspace 1)
+bind = $mainMod CTRL, 2, exec, (hyprctl dispatch moveworkspacetomonitor 2 current; hyprctl dispatch workspace 2)
+bind = $mainMod CTRL, 3, exec, (hyprctl dispatch moveworkspacetomonitor 3 current; hyprctl dispatch workspace 3)
+bind = $mainMod CTRL, 4, exec, (hyprctl dispatch moveworkspacetomonitor 4 current; hyprctl dispatch workspace 4)
+bind = $mainMod CTRL, 5, exec, (hyprctl dispatch moveworkspacetomonitor 5 current; hyprctl dispatch workspace 5)
+bind = $mainMod CTRL, 6, exec, (hyprctl dispatch moveworkspacetomonitor 6 current; hyprctl dispatch workspace 6)
+bind = $mainMod CTRL, 7, exec, (hyprctl dispatch moveworkspacetomonitor 7 current; hyprctl dispatch workspace 7)
+bind = $mainMod CTRL, 8, exec, (hyprctl dispatch moveworkspacetomonitor 8 current; hyprctl dispatch workspace 8)
+bind = $mainMod CTRL, 9, exec, (hyprctl dispatch moveworkspacetomonitor 9 current; hyprctl dispatch workspace 9)
+bind = $mainMod CTRL, 0, exec, (hyprctl dispatch moveworkspacetomonitor 10 current; hyprctl dispatch workspace 10)
 
 # Example special workspace (scratchpad)
 bind = $mainMod, S, togglespecialworkspace, magic
-# bind = $mainMod SHIFT, S, movetoworkspace, special:magic
-# bind = $mainMod, S, exec, pypr toggle kitty
 bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+windowrule = border_size 2, match:float no, match:workspace special:magic
+workspace = name:special:magic, gapsout:30
+
 
 # Scroll through existing workspaces with mainMod + scroll
 bind = $mainMod, mouse_down, workspace, e+1
 bind = $mainMod, mouse_up, workspace, e-1
 
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
+# Ignore maximize requests from apps. You'll probably like this.
+windowrule = suppress_event maximize, match:class .*
+
+# Fix some dragging issues with XWayland
+windowrule = match:focus no,match:class ^$,match:title ^$,match:xwayland yes,match:float yes,match:fullscreen no,match:pin 0
 

hyprlock.conf

@@ -0,0 +1,140 @@
+# source = /home/justin/.cache/wal/colors-hyprland.conf
+
+# BACKGROUND
+background {
+    monitor =
+    #path = screenshot
+    path = /home/catman/.config/wallpaper/Sollee.png
+    #color = $background
+    blur_passes = 2
+    contrast = 1
+    brightness = 0.5
+    vibrancy = 0.2
+    vibrancy_darkness = 0.2
+}
+
+# GENERAL
+general {
+    no_fade_in = false
+    no_fade_out = false
+    hide_cursor = false
+    grace = 0
+    disable_loading_bar = true
+}
+
+# INPUT FIELD
+input-field {
+    monitor =
+    size = 250, 60
+    outline_thickness = 2
+    dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 0.35 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = true
+    outer_color = rgba(0, 0, 0, 1)
+    inner_color = rgba(242, 243, 244, 0.75)
+    font_color = #000000
+    fade_on_empty = false
+    rounding = -1
+    check_color = rgb(204, 136, 34)
+    placeholder_text = <i><span foreground="##000000">Input Password...</span></i>
+    hide_input = false
+    position = 0, -200
+    halign = center
+    valign = center
+}
+
+# DATE
+label {
+  monitor =
+  text = cmd[update:1000] echo "$(date +"%A, %B %d")"
+  color = rgba(242, 243, 244, 0.75)
+  font_size = 22
+  font_family = JetBrains Mono
+  position = 0, 300
+  halign = center
+  valign = center
+}
+
+# TIME
+label {
+  monitor = 
+  text = cmd[update:1000] echo "$(date +"%H:%M")"
+  color = rgba(242, 243, 244, 0.75)
+  font_size = 95
+  font_family = JetBrains Mono Extrabold
+  position = 0, 200
+  halign = center
+  valign = center
+}
+
+
+
+# Profile Picture
+# image {
+#     monitor =
+#     path = /home/
+#     size = 100
+#     border_size = 2
+#     border_color = $foreground
+#     position = 0, -100
+#     halign = center
+#     valign = center
+# }
+
+# Desktop Environment
+# image {
+#     monitor =
+#     path = /home/justin/Pictures/profile_pictures/hypr.png
+#     size = 75
+#     border_size = 2
+#     border_color = $foreground
+#     position = -50, 50
+#     halign = right
+#     valign = bottom
+# }
+
+# CURRENT SONG
+# label {
+#     monitor =
+#     text = cmd[update:1000] echo "$(/home/justin/Documents/Scripts/whatsong.sh)" 
+#     color = $foreground
+#     #color = rgba(255, 255, 255, 0.6)
+#     font_size = 18
+#     font_family = Metropolis Light, Font Awesome 6 Free Solid
+#     position = 0, 50
+#     halign = center
+#     valign = bottom
+# }
+
+label {
+    monitor =
+    text = cmd[update:1000] echo "$(whoami)@$(cat /etc/hostname | cut -d '.' -f 1)"
+    color = $foreground
+    font_size = 14
+    font_family = JetBrains Mono
+    position = 0, -10
+    halign = center
+    valign = top
+}
+
+# label {
+#     monitor =
+#     text = cmd[update:1000] echo "$(/home/justin/Documents/Scripts/battery.sh)"
+#     color = $foreground
+#     font_size = 24
+#     font_family = JetBrains Mono
+#     position = -90, -10
+#     halign = right
+#     valign = top
+# }
+
+# label {
+#     monitor =
+#     text = cmd[update:1000] echo "$(/home/justin/Documents/Scripts/network-status.sh)"
+#     color = $foreground
+#     font_size = 24
+#     font_family = JetBrains Mono
+#     position = -20, -10
+#     halign = right
+#     valign = top
+# }

hyprpaper.conf

@@ -1,5 +1,8 @@
-preload = /usr/share/hyprland/wall2.png
-preload = ~/.config/sway/sway.png
-
-wallpaper = ,~/.config/sway/sway.png
 splash = false
+
+wallpaper {
+    monitor =
+    path = /home/catman/.config/wallpaper/Sollee.png
+    fit_mode = cover
+}
+

mocha.conf

@@ -1,61 +0,0 @@
-$rosewaterAlpha = f5e0dc
-$flamingoAlpha  = f2cdcd
-$pinkAlpha      = f5c2e7
-$mauveAlpha     = cba6f7
-$redAlpha       = f38ba8
-$maroonAlpha    = eba0ac
-$peachAlpha     = fab387
-$yellowAlpha    = f9e2af
-$greenAlpha     = a6e3a1
-$tealAlpha      = 94e2d5
-$skyAlpha       = 89dceb
-$sapphireAlpha  = 74c7ec
-$blueAlpha      = 89b4fa
-$lavenderAlpha  = b4befe
-
-$textAlpha      = cdd6f4
-$subtext1Alpha  = bac2de
-$subtext0Alpha  = a6adc8
-
-$overlay2Alpha  = 9399b2
-$overlay1Alpha  = 7f849c
-$overlay0Alpha  = 6c7086
-
-$surface2Alpha  = 585b70
-$surface1Alpha  = 45475a
-$surface0Alpha  = 313244
-
-$baseAlpha      = 1e1e2e
-$mantleAlpha    = 181825
-$crustAlpha     = 11111b
-
-$rosewater = 0xfff5e0dc
-$flamingo  = 0xfff2cdcd
-$pink      = 0xfff5c2e7
-$mauve     = 0xffcba6f7
-$red       = 0xfff38ba8
-$maroon    = 0xffeba0ac
-$peach     = 0xfffab387
-$yellow    = 0xfff9e2af
-$green     = 0xffa6e3a1
-$teal      = 0xff94e2d5
-$sky       = 0xff89dceb
-$sapphire  = 0xff74c7ec
-$blue      = 0xff89b4fa
-$lavender  = 0xffb4befe
-
-$text      = 0xffcdd6f4
-$subtext1  = 0xffbac2de
-$subtext0  = 0xffa6adc8
-
-$overlay2  = 0xff9399b2
-$overlay1  = 0xff7f849c
-$overlay0  = 0xff6c7086
-
-$surface2  = 0xff585b70
-$surface1  = 0xff45475a
-$surface0  = 0xff313244
-
-$base      = 0xff1e1e2e
-$mantle    = 0xff181825
-$crust     = 0xff11111b

noctra.zsh-theme

@@ -0,0 +1,23 @@
+# RVM settings
+if [[ -s ~/.rvm/scripts/rvm ]] ; then
+  RPS1="%{$fg[yellow]%}rvm:%{$reset_color%}%{$FG[203]%}\$(~/.rvm/bin/rvm-prompt)%{$reset_color%} $EPS1"
+else
+  if which rbenv &> /dev/null; then
+    RPS1="%{$fg[yellow]%}rbenv:%{$reset_color%}%{$FG[203]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$reset_color%} $EPS1"
+  fi
+fi
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$FG[086]%}["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$FG[203]%}*%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+# Customized git status, oh-my-zsh currently does not allow render dirty status before branch
+git_custom_status() {
+  local cb=$(git_current_branch)
+  if [ -n "$cb" ]; then
+    echo "$(parse_git_dirty)$ZSH_THEME_GIT_PROMPT_PREFIX$(git_current_branch)$ZSH_THEME_GIT_PROMPT_SUFFIX"
+  fi
+}
+
+PROMPT='$(git_custom_status)%{$FG[033]%}[%~% ]%{$reset_color%}%B$%b '

power-menu

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-entries="Logout Suspend Reboot Shutdown"
-
-selected=$(printf '%s\n' $entries | wofi --conf=$HOME/.config/wofi/config.power --style=$HOME/.config/wofi/style.widgets.css | awk '{print tolower($1)}')
-
-case $selected in
-  logout)
-    hyprctl dispatch exit;;
-  suspend)
-    exec systemctl suspend;;
-  reboot)
-    exec systemctl reboot;;
-  shutdown)
-    exec systemctl poweroff -i;;
-esac

scripts/power-menu.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+dmenu_command=(wofi -dmenu -p "Power Menu" -i)
+
+# Define menu options and corresponding actions
+options=(
+  "Lock"
+  "Suspend"
+  "Logout"
+  "Shutdown"
+  "Reboot"
+)
+
+# Create associative array mapping text to actions
+declare -A actions
+actions["Lock"]="sleep 0.2 && hyprlock"
+actions["Suspend"]="sleep 0.2 && systemctl suspend"
+actions["Logout"]="hyprctl dispatch exit"
+actions["Shutdown"]="systemctl poweroff"
+actions["Reboot"]="systemctl reboot"
+
+# Prompt user using wofi in dmenu mode
+choice=$(printf '%s\n' "${options[@]}" | "${dmenu_command[@]}")
+
+# Run the corresponding command if valid choice was made
+if [[ -n "$choice" && -n "${actions[$choice]}" ]]; then
+  eval "${actions[$choice]}"
+fi
+