added fish_vars to ignore

updated hyprland confs
refactored hyprland conf for better maintainability
2025-08-04 07:31:22 +02:00 · 2025-08-02 00:16:14 +02:00 · 2025-08-01 10:03:02 +02:00 · 2025-08-01 09:45:23 +02:00 · 2025-07-31 10:53:09 +02:00 · 2025-07-30 12:08:36 +02:00
51 changed files with 2766 additions and 412 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -11,9 +11,13 @@
 !zathura/
 !mimeapps.list
 !fuzzel/
+!fish/
+fish/fish_variables
+!packages
 !brave-flags.conf
 !chromium-flags.conf
 !README.md
 !rice.png
 !rice-2.png
+!rice-3.png
 !btop
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,9 @@
 [submodule "nvim/pack/nvim/start/nvim-lspconfig"]
 	path = nvim/pack/nvim/start/nvim-lspconfig
 	url = https://github.com/neovim/nvim-lspconfig
+[submodule "btop/catppuccin-btop"]
+	path = btop/catppuccin-btop
+	url = https://github.com/catppuccin/btop.git
+[submodule "fuzzel/catppuccin-fuzzel"]
+	path = fuzzel/catppuccin-fuzzel
+	url = https://github.com/catppuccin/fuzzel.git
--- a/README.md
+++ b/README.md
@@ -2,3 +2,4 @@

 ![image not found](./rice.png)
 ![image not found](./rice-2.png)
+![image not found](./rice-3.png)
--- a/btop/btop.conf
+++ b/btop/btop.conf
@@ -63,7 +63,7 @@ proc_sorting = "cpu lazy"
 proc_reversed = False

 #* Show processes as a tree.
-proc_tree = False
+proc_tree = True

 #* Use the cpu graph colors in the process list.
 proc_colors = True
--- a/btop/catppuccin-btop
+++ b/btop/catppuccin-btop
--- a/fish/conf.d/autopair.fish
+++ b/fish/conf.d/autopair.fish
@@ -0,0 +1,39 @@
+status is-interactive || exit
+
+set --global autopair_left "(" "[" "{" '"' "'"
+set --global autopair_right ")" "]" "}" '"' "'"
+set --global autopair_pairs "()" "[]" "{}" '""' "''"
+
+function _autopair_fish_key_bindings --on-variable fish_key_bindings
+    set --query fish_key_bindings[1] || return
+
+    test $fish_key_bindings = fish_default_key_bindings &&
+        set --local mode default insert ||
+        set --local mode insert default
+
+    bind --mode $mode[-1] --erase \177 \b \t
+
+    bind --mode $mode[1] \177 _autopair_backspace # macOS ⌫
+    bind --mode $mode[1] \b _autopair_backspace
+    bind --mode $mode[1] \t _autopair_tab
+
+    printf "%s\n" $autopair_pairs | while read --local left right --delimiter ""
+        bind --mode $mode[-1] --erase $left $right
+        if test $left = $right
+            bind --mode $mode[1] $left "_autopair_insert_same \\$left"
+        else
+            bind --mode $mode[1] $left "_autopair_insert_left \\$left \\$right"
+            bind --mode $mode[1] $right "_autopair_insert_right \\$right"
+        end
+    end
+end
+
+_autopair_fish_key_bindings
+
+function _autopair_uninstall --on-event autopair_uninstall
+    string collect (
+        bind --all | string replace --filter --regex -- "_autopair.*" --erase
+        set --names | string replace --filter --regex -- "^autopair" "set --erase autopair"
+    ) | source
+    functions --erase (functions --all | string match "_autopair_*")
+end
--- a/fish/conf.d/done.fish
+++ b/fish/conf.d/done.fish
@@ -0,0 +1,300 @@
+# MIT License
+
+# Copyright (c) 2016 Francisco Lourenço & Daniel Wehner
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+if not status is-interactive
+    exit
+end
+
+set -g __done_version 1.16.5
+
+function __done_run_powershell_script
+    set -l powershell_exe (command --search "powershell.exe")
+
+    if test $status -ne 0
+        and command --search wslvar
+
+        set -l powershell_exe (wslpath (wslvar windir)/System32/WindowsPowerShell/v1.0/powershell.exe)
+    end
+
+    if string length --quiet "$powershell_exe"
+        and test -x "$powershell_exe"
+
+        set cmd (string escape $argv)
+
+        eval "$powershell_exe -Command $cmd"
+    end
+end
+
+function __done_windows_notification -a title -a message
+    if test "$__done_notify_sound" -eq 1
+        set soundopt "<audio silent=\"false\" src=\"ms-winsoundevent:Notification.Default\" />"
+    else
+        set soundopt "<audio silent=\"true\" />"
+    end
+
+    __done_run_powershell_script "
+[Windows.Data.Xml.Dom.XmlDocument, Windows.Data.Xml.Dom.XmlDocument, ContentType = WindowsRuntime] | Out-Null
+[Windows.UI.Notifications.ToastNotification, Windows.UI.Notifications, ContentType = WindowsRuntime] | Out-Null
+
+\$toast_xml_source = @\"
+    <toast>
+        $soundopt
+        <visual>
+            <binding template=\"ToastText02\">
+                <text id=\"1\">$title</text>
+                <text id=\"2\">$message</text>
+            </binding>
+        </visual>
+    </toast>
+\"@
+
+\$toast_xml = New-Object Windows.Data.Xml.Dom.XmlDocument
+\$toast_xml.loadXml(\$toast_xml_source)
+
+\$toast = New-Object Windows.UI.Notifications.ToastNotification \$toast_xml
+
+[Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier(\"fish\").Show(\$toast)
+"
+end
+
+function __done_get_focused_window_id
+    if type -q lsappinfo
+        lsappinfo info -only bundleID (lsappinfo front) | cut -d '"' -f4
+    else if test -n "$SWAYSOCK"
+        and type -q jq
+        swaymsg --type get_tree | jq '.. | objects | select(.focused == true) | .id'
+    else if begin
+            test "$XDG_SESSION_DESKTOP" = gnome; and type -q gdbus
+        end
+        gdbus call --session --dest org.gnome.Shell --object-path /org/gnome/Shell --method org.gnome.Shell.Eval 'global.display.focus_window.get_id()'
+    else if type -q xprop
+        and test -n "$DISPLAY"
+        # Test that the X server at $DISPLAY is running
+        and xprop -grammar >/dev/null 2>&1
+        xprop -root 32x '\t$0' _NET_ACTIVE_WINDOW | cut -f 2
+    else if uname -a | string match --quiet --ignore-case --regex microsoft
+        __done_run_powershell_script '
+Add-Type @"
+    using System;
+    using System.Runtime.InteropServices;
+    public class WindowsCompat {
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetForegroundWindow();
+    }
+"@
+[WindowsCompat]::GetForegroundWindow()
+'
+    else if set -q __done_allow_nongraphical
+        echo 12345 # dummy value
+    end
+end
+
+function __done_is_tmux_window_active
+    set -q fish_pid; or set -l fish_pid %self
+
+    # find the outermost process within tmux
+    # ppid != "tmux" -> pid = ppid
+    # ppid == "tmux" -> break
+    set tmux_fish_pid $fish_pid
+    while set tmux_fish_ppid (ps -o ppid= -p $tmux_fish_pid | string trim)
+        and ! string match -q "tmux*" (basename (ps -o command= -p $tmux_fish_ppid))
+        set tmux_fish_pid $tmux_fish_ppid
+    end
+
+    # tmux session attached and window is active -> no notification
+    # all other combinations -> send notification
+    tmux list-panes -a -F "#{session_attached} #{window_active} #{pane_pid}" | string match -q "1 1 $tmux_fish_pid"
+end
+
+function __done_is_screen_window_active
+    string match --quiet --regex "$STY\s+\(Attached" (screen -ls)
+end
+
+function __done_is_process_window_focused
+    # Return false if the window is not focused
+
+    if set -q __done_allow_nongraphical
+        return 1
+    end
+
+    set __done_focused_window_id (__done_get_focused_window_id)
+    if test "$__done_sway_ignore_visible" -eq 1
+        and test -n "$SWAYSOCK"
+        string match --quiet --regex "^true" (swaymsg -t get_tree | jq ".. | objects | select(.id == "$__done_initial_window_id") | .visible")
+        return $status
+    else if test "$__done_initial_window_id" != "$__done_focused_window_id"
+        return 1
+    end
+    # If inside a tmux session, check if the tmux window is focused
+    if type -q tmux
+        and test -n "$TMUX"
+        __done_is_tmux_window_active
+        return $status
+    end
+
+    # If inside a screen session, check if the screen window is focused
+    if type -q screen
+        and test -n "$STY"
+        __done_is_screen_window_active
+        return $status
+    end
+
+    return 0
+end
+
+function __done_humanize_duration -a milliseconds
+    set -l seconds (math --scale=0 "$milliseconds/1000" % 60)
+    set -l minutes (math --scale=0 "$milliseconds/60000" % 60)
+    set -l hours (math --scale=0 "$milliseconds/3600000")
+
+    if test $hours -gt 0
+        printf '%s' $hours'h '
+    end
+    if test $minutes -gt 0
+        printf '%s' $minutes'm '
+    end
+    if test $seconds -gt 0
+        printf '%s' $seconds's'
+    end
+end
+
+# verify that the system has graphical capabilities before initializing
+if test -z "$SSH_CLIENT" # not over ssh
+    and count (__done_get_focused_window_id) >/dev/null # is able to get window id
+    set __done_enabled
+end
+
+if set -q __done_allow_nongraphical
+    and set -q __done_notification_command
+    set __done_enabled
+end
+
+if set -q __done_enabled
+    set -g __done_initial_window_id ''
+    set -q __done_min_cmd_duration; or set -g __done_min_cmd_duration 5000
+    set -q __done_exclude; or set -g __done_exclude 'git (?!push|pull|fetch)'
+    set -q __done_notify_sound; or set -g __done_notify_sound 0
+    set -q __done_sway_ignore_visible; or set -g __done_sway_ignore_visible 0
+
+    function __done_started --on-event fish_preexec
+        set __done_initial_window_id (__done_get_focused_window_id)
+    end
+
+    function __done_ended --on-event fish_prompt
+        set -l exit_status $status
+
+        # backwards compatibility for fish < v3.0
+        set -q cmd_duration; or set -l cmd_duration $CMD_DURATION
+
+        if test $cmd_duration
+            and test $cmd_duration -gt $__done_min_cmd_duration # longer than notify_duration
+            and not __done_is_process_window_focused # process pane or window not focused
+            and not string match -qr $__done_exclude $history[1] # don't notify on git commands which might wait external editor
+
+            # Store duration of last command
+            set -l humanized_duration (__done_humanize_duration "$cmd_duration")
+
+            set -l title "Done in $humanized_duration"
+            set -l wd (string replace --regex "^$HOME" "~" (pwd))
+            set -l message "$wd/ $history[1]"
+            set -l sender $__done_initial_window_id
+
+            if test $exit_status -ne 0
+                set title "Failed ($exit_status) after $humanized_duration"
+            end
+
+            if set -q __done_notification_command
+                eval $__done_notification_command
+                if test "$__done_notify_sound" -eq 1
+                    echo -e "\a" # bell sound
+                end
+            else if type -q terminal-notifier # https://github.com/julienXX/terminal-notifier
+                if test "$__done_notify_sound" -eq 1
+                    terminal-notifier -message "$message" -title "$title" -sender "$__done_initial_window_id" -sound default
+                else
+                    terminal-notifier -message "$message" -title "$title" -sender "$__done_initial_window_id"
+                end
+
+            else if type -q osascript # AppleScript
+                osascript -e "display notification \"$message\" with title \"$title\""
+                if test "$__done_notify_sound" -eq 1
+                    echo -e "\a" # bell sound
+                end
+
+            else if type -q notify-send # Linux notify-send
+                # set urgency to normal
+                set -l urgency normal
+
+                # use user-defined urgency if set
+                if set -q __done_notification_urgency_level
+                    set urgency "$__done_notification_urgency_level"
+                end
+                # override user-defined urgency level if non-zero exitstatus
+                if test $exit_status -ne 0
+                    set urgency critical
+                    if set -q __done_notification_urgency_level_failure
+                        set urgency "$__done_notification_urgency_level_failure"
+                    end
+                end
+
+                notify-send --hint=int:transient:1 --urgency=$urgency --icon=utilities-terminal --app-name=fish "$title" "$message"
+
+                if test "$__done_notify_sound" -eq 1
+                    echo -e "\a" # bell sound
+                end
+
+            else if type -q notify-desktop # Linux notify-desktop
+                set -l urgency
+                if test $exit_status -ne 0
+                    set urgency "--urgency=critical"
+                end
+                notify-desktop $urgency --icon=utilities-terminal --app-name=fish "$title" "$message"
+                if test "$__done_notify_sound" -eq 1
+                    echo -e "\a" # bell sound
+                end
+
+            else if uname -a | string match --quiet --ignore-case --regex microsoft
+                __done_windows_notification "$title" "$message"
+
+            else # anything else
+                echo -e "\a" # bell sound
+            end
+
+        end
+    end
+end
+
+function __done_uninstall -e done_uninstall
+    # Erase all __done_* functions
+    functions -e __done_ended
+    functions -e __done_started
+    functions -e __done_get_focused_window_id
+    functions -e __done_is_tmux_window_active
+    functions -e __done_is_screen_window_active
+    functions -e __done_is_process_window_focused
+    functions -e __done_windows_notification
+    functions -e __done_run_powershell_script
+    functions -e __done_humanize_duration
+
+    # Erase __done variables
+    set -e __done_version
+end
--- a/fish/conf.d/omf.fish
+++ b/fish/conf.d/omf.fish
@@ -0,0 +1,7 @@
+# Path to Oh My Fish install.
+set -q XDG_DATA_HOME
+  and set -gx OMF_PATH "$XDG_DATA_HOME/omf"
+  or set -gx OMF_PATH "$HOME/.local/share/omf"
+
+# Load Oh My Fish configuration.
+source $OMF_PATH/init.fish
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -0,0 +1,31 @@
+if status is-interactive
+    # Commands to run in interactive sessions can go here
+end
+# set SPACESHIP_PROMPT_ADD_NEWLINE false
+# set SPACESHIP_TIME_SHOW false
+# set SPACESHIP_USER_SHOW always
+# set SPACESHIP_HOST_SHOW true
+# set SPACESHIP_CHAR_SYMBOL ""
+# set SPACESHIP_CHAR_SYMBOL=" "
+# set SPACESHIP_VI_MODE_INSERT 
+# set SPACESHIP_VI_MODE_NORMAL 
+# Set the cursor shapes for the different vi modes.
+set fish_cursor_default block blink
+set fish_cursor_insert line blink
+set fish_cursor_replace_one underscore blink
+set fish_cursor_visual block
+# starship init fish | source
+fish_vi_key_bindings
+if test -e ~/.cache/wal/colors.fish
+    source ~/.cache/wal/colors.fish
+end
+zoxide init --cmd cd fish | source
+set -gx PATH ~/.local/bin $PATH
+if not pgrep --full ssh-agent | string collect > /dev/null
+  eval (ssh-agent -c)
+  set -Ux SSH_AGENT_PID $SSH_AGENT_PID
+  set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK
+end
+if uwsm check may-start && uwsm select
+	exec uwsm start default
+end
--- a/fish/fish_plugins
+++ b/fish/fish_plugins
@@ -0,0 +1,2 @@
+franciscolourenco/done
+jorgebucaran/autopair.fish
--- a/fish/functions/_autopair_backspace.fish
+++ b/fish/functions/_autopair_backspace.fish
@@ -0,0 +1,9 @@
+function _autopair_backspace
+    set --local index (commandline --cursor)
+    set --local buffer (commandline)
+
+    test $index -ge 1 &&
+        contains -- (string sub --start=$index --length=2 -- "$buffer") $autopair_pairs &&
+        commandline --function delete-char
+    commandline --function backward-delete-char
+end
--- a/fish/functions/_autopair_insert_left.fish
+++ b/fish/functions/_autopair_insert_left.fish
@@ -0,0 +1,13 @@
+function _autopair_insert_left --argument-names left right
+    set --local buffer (commandline)
+    set --local before (commandline --cut-at-cursor)
+
+    commandline --insert -- $left
+
+    switch "$buffer"
+        case "$before"{," "\*,$autopair_right\*}
+            set --local index (commandline --cursor)
+            commandline --insert -- $right
+            commandline --cursor $index
+    end
+end
--- a/fish/functions/_autopair_insert_right.fish
+++ b/fish/functions/_autopair_insert_right.fish
@@ -0,0 +1,11 @@
+function _autopair_insert_right --argument-names key
+    set --local buffer (commandline)
+    set --local before (commandline --cut-at-cursor)
+
+    switch "$buffer"
+        case "$before$key"\*
+            commandline --cursor (math (commandline --cursor) + 1)
+        case \*
+            commandline --insert -- $key
+    end
+end
--- a/fish/functions/_autopair_insert_same.fish
+++ b/fish/functions/_autopair_insert_same.fish
@@ -0,0 +1,20 @@
+function _autopair_insert_same --argument-names key
+    set --local buffer (commandline)
+    set --local index (commandline --cursor)
+    set --local next (string sub --start=(math $index + 1) --length=1 -- "$buffer")
+
+    if test (math (count (string match --all --regex -- "$key" "$buffer")) % 2) = 0
+        test $key = $next && commandline --cursor (math $index + 1) && return
+
+        commandline --insert -- $key
+
+        if test $index -lt 1 ||
+                contains -- (string sub --start=$index --length=1 -- "$buffer") "" " " $autopair_left &&
+                contains -- $next "" " " $autopair_right
+            commandline --insert -- $key
+            commandline --cursor (math $index + 1)
+        end
+    else
+        commandline --insert -- $key
+    end
+end
--- a/fish/functions/_autopair_tab.fish
+++ b/fish/functions/_autopair_tab.fish
@@ -0,0 +1,7 @@
+function _autopair_tab
+    commandline --paging-mode && down-or-search && return
+
+    string match --quiet --regex -- '\$[^\s]*"$' (commandline --current-token) &&
+        commandline --function delete-char
+    commandline --function complete
+end
--- a/fish/functions/batdiff.fish
+++ b/fish/functions/batdiff.fish
@@ -0,0 +1,3 @@
+function batdiff --description 'batdiff function'
+    git diff --name-only --diff-filter=d $argv | bat --diff
+end
--- a/fish/functions/cat.fish
+++ b/fish/functions/cat.fish
@@ -0,0 +1,3 @@
+function cat --wraps=bat --description 'alias cat=bat'
+  bat $argv; 
+end
--- a/fish/functions/cpr.fish
+++ b/fish/functions/cpr.fish
@@ -0,0 +1,3 @@
+function cpr
+    rsync --archive -hh --partial --info=stats1,progress2 --modify-window=1 $argv
+end
--- a/fish/functions/du.fish
+++ b/fish/functions/du.fish
@@ -0,0 +1,3 @@
+function du --wraps='dust -bs' --description 'alias du=dust -bs'
+  dust -bs $argv; 
+end
--- a/fish/functions/egrep.fish
+++ b/fish/functions/egrep.fish
@@ -0,0 +1,3 @@
+function egrep --description 'alias egrep=egrep --color=auto'
+ command egrep --color=auto $argv; 
+end
--- a/fish/functions/fgrep.fish
+++ b/fish/functions/fgrep.fish
@@ -0,0 +1,3 @@
+function fgrep --description 'alias fgrep=fgrep --color=auto'
+ command fgrep --color=auto $argv; 
+end
--- a/fish/functions/fish_prompt.fish
+++ b/fish/functions/fish_prompt.fish
@@ -0,0 +1,30 @@
+function fish_prompt --description 'Write out the prompt'
+        set -l last_status $status
+        set -l normal (set_color normal)
+        set -l status_color (set_color brgreen)
+        set -l cwd_color (set_color $fish_color_cwd)
+        set -l vcs_color (set_color brpurple)
+        set -l prompt_status ""
+    
+        # Since we display the prompt on a new line allow the directory names to be longer.
+        set -q fish_prompt_pwd_dir_length
+        or set -lx fish_prompt_pwd_dir_length 0
+    
+        # Color the prompt differently when we're root
+        set -l suffix '❯'
+        if functions -q fish_is_root_user; and fish_is_root_user
+                if set -q fish_color_cwd_root
+                        set cwd_color (set_color $fish_color_cwd_root)
+                end
+                set suffix '#'
+        end
+    
+        # Color the prompt in red on error
+        if test $last_status -ne 0
+                set status_color (set_color $fish_color_error)
+                set prompt_status $status_color "[" $last_status "]" $normal
+        end
+    
+        echo -s (prompt_login) ' ' $cwd_color (prompt_pwd) $vcs_color (fish_vcs_prompt) $normal ' ' $prompt_status
+        echo -n -s $status_color $suffix ' ' $normal
+end
--- a/fish/functions/grep.fish
+++ b/fish/functions/grep.fish
@@ -0,0 +1,3 @@
+function grep --description 'alias grep=grep --color=auto'
+ command grep --color=auto $argv; 
+end
--- a/fish/functions/la.fish
+++ b/fish/functions/la.fish
@@ -0,0 +1,3 @@
+function la --wraps='exa -a --long --color=auto' --description 'alias la=exa -a --long --color=auto'
+  exa -a --long --color=auto $argv; 
+end
--- a/fish/functions/lg.fish
+++ b/fish/functions/lg.fish
@@ -0,0 +1,3 @@
+function lg --wraps='exa --git --long' --description 'alias lg=exa --git --long'
+  exa --git --long $argv; 
+end
--- a/fish/functions/ll.fish
+++ b/fish/functions/ll.fish
@@ -0,0 +1,3 @@
+function ll --wraps='exa --long --color=auto' --description 'alias ll exa --long --color=auto'
+  exa --long --color=auto $argv; 
+end
--- a/fish/functions/ls.fish
+++ b/fish/functions/ls.fish
@@ -0,0 +1,3 @@
+function ls --wraps='exa --long --color=auto' --description 'alias ls=exa --long --color=auto'
+  exa --long --color=auto $argv; 
+end
--- a/fish/functions/mvr.fish
+++ b/fish/functions/mvr.fish
@@ -0,0 +1,3 @@
+function mvr
+    rsync --archive -hh --partial --info=stats1,progress2 --modify-window=1 --remove-source-files $argv
+end
--- a/fish/functions/open.fish
+++ b/fish/functions/open.fish
@@ -0,0 +1,3 @@
+function open -d "Open an application detached from the terminal"
+    nohup $argv >/dev/null 2>&1 &
+end
--- a/fish/themes/Catppuccin
+++ b/fish/themes/Catppuccin
@@ -0,0 +1,30 @@
+# name: 'Catppuccin Frappé'
+# url: 'https://github.com/catppuccin/fish'
+# preferred_background: 303446
+
+fish_color_normal c6d0f5
+fish_color_command 8caaee
+fish_color_param eebebe
+fish_color_keyword e78284
+fish_color_quote a6d189
+fish_color_redirection f4b8e4
+fish_color_end ef9f76
+fish_color_comment 838ba7
+fish_color_error e78284
+fish_color_gray 737994
+fish_color_selection --background=414559
+fish_color_search_match --background=414559
+fish_color_option a6d189
+fish_color_operator f4b8e4
+fish_color_escape ea999c
+fish_color_autosuggestion 737994
+fish_color_cancel e78284
+fish_color_cwd e5c890
+fish_color_user 81c8be
+fish_color_host 8caaee
+fish_color_host_remote a6d189
+fish_color_status e78284
+fish_pager_color_progress 737994
+fish_pager_color_prefix f4b8e4
+fish_pager_color_completion c6d0f5
+fish_pager_color_description 737994
--- a/fish/themes/Catppuccin
+++ b/fish/themes/Catppuccin
@@ -0,0 +1,30 @@
+# name: 'Catppuccin Latte'
+# url: 'https://github.com/catppuccin/fish'
+# preferred_background: eff1f5
+
+fish_color_normal 4c4f69
+fish_color_command 1e66f5
+fish_color_param dd7878
+fish_color_keyword d20f39
+fish_color_quote 40a02b
+fish_color_redirection ea76cb
+fish_color_end fe640b
+fish_color_comment 8c8fa1
+fish_color_error d20f39
+fish_color_gray 9ca0b0
+fish_color_selection --background=ccd0da
+fish_color_search_match --background=ccd0da
+fish_color_option 40a02b
+fish_color_operator ea76cb
+fish_color_escape e64553
+fish_color_autosuggestion 9ca0b0
+fish_color_cancel d20f39
+fish_color_cwd df8e1d
+fish_color_user 179299
+fish_color_host 1e66f5
+fish_color_host_remote 40a02b
+fish_color_status d20f39
+fish_pager_color_progress 9ca0b0
+fish_pager_color_prefix ea76cb
+fish_pager_color_completion 4c4f69
+fish_pager_color_description 9ca0b0
--- a/fish/themes/Catppuccin
+++ b/fish/themes/Catppuccin
@@ -0,0 +1,30 @@
+# name: 'Catppuccin Macchiato'
+# url: 'https://github.com/catppuccin/fish'
+# preferred_background: 24273a
+
+fish_color_normal cad3f5
+fish_color_command 8aadf4
+fish_color_param f0c6c6
+fish_color_keyword ed8796
+fish_color_quote a6da95
+fish_color_redirection f5bde6
+fish_color_end f5a97f
+fish_color_comment 8087a2
+fish_color_error ed8796
+fish_color_gray 6e738d
+fish_color_selection --background=363a4f
+fish_color_search_match --background=363a4f
+fish_color_option a6da95
+fish_color_operator f5bde6
+fish_color_escape ee99a0
+fish_color_autosuggestion 6e738d
+fish_color_cancel ed8796
+fish_color_cwd eed49f
+fish_color_user 8bd5ca
+fish_color_host 8aadf4
+fish_color_host_remote a6da95
+fish_color_status ed8796
+fish_pager_color_progress 6e738d
+fish_pager_color_prefix f5bde6
+fish_pager_color_completion cad3f5
+fish_pager_color_description 6e738d
--- a/fish/themes/Catppuccin
+++ b/fish/themes/Catppuccin
@@ -0,0 +1,30 @@
+# name: 'Catppuccin Mocha'
+# url: 'https://github.com/catppuccin/fish'
+# preferred_background: 1e1e2e
+
+fish_color_normal cdd6f4
+fish_color_command 89b4fa
+fish_color_param f2cdcd
+fish_color_keyword f38ba8
+fish_color_quote a6e3a1
+fish_color_redirection f5c2e7
+fish_color_end fab387
+fish_color_comment 7f849c
+fish_color_error f38ba8
+fish_color_gray 6c7086
+fish_color_selection --background=313244
+fish_color_search_match --background=313244
+fish_color_option a6e3a1
+fish_color_operator f5c2e7
+fish_color_escape eba0ac
+fish_color_autosuggestion 6c7086
+fish_color_cancel f38ba8
+fish_color_cwd f9e2af
+fish_color_user 94e2d5
+fish_color_host 89b4fa
+fish_color_host_remote a6e3a1
+fish_color_status f38ba8
+fish_pager_color_progress 6c7086
+fish_pager_color_prefix f5c2e7
+fish_pager_color_completion cdd6f4
+fish_pager_color_description 6c7086
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -1,336 +1,18 @@

-# #######################################################################################
-# AUTOGENERATED HYPRLAND CONFIG.
-# PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hyprland.conf AND EDIT IT,
-# OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS.
-# #######################################################################################
+# narls hyprland dotfiles

-# This is an example Hyprland config file.
-# Refer to the wiki for more information.
-# https://wiki.hyprland.org/Configuring/
+source = ~/.config/hypr/modules/monitors.conf

-# Please note not all available settings / options are set here.
-# For a full list, see the wiki
+source = ~/.config/hypr/modules/programs.conf

-# You can split this configuration into multiple files
-# Create your files separately and then link them to this file like this:
-# source = ~/.config/hypr/myColors.conf
+source = ~/.config/hypr/modules/autostart.conf

+source = ~/.config/hypr/modules/env.conf

-################
-### MONITORS ###
-################
+source = ~/.config/hypr/modules/theme.conf

-# See https://wiki.hyprland.org/Configuring/Monitors/
-monitor=eDP-1, preferred, 0x0, 1
-# monitor=DP-4, preferred, auto, 1, mirror, eDP-1
-monitor=,preferred,auto,auto
-# trigger when the switch is turning off
-# bindl = , switch:off:Lid Switch,exec,hyprctl keyword monitor "eDP-1, 1920x1080@60, 0x0, 1"
-# trigger when the switch is turning on
-# bindl = , switch:on:Lid Switch,exec,hyprctl keyword monitor "eDP-1, disable"
+source = ~/.config/hypr/modules/input.conf

+source = ~/.config/hypr/modules/keybinds.conf

-###################
-### MY PROGRAMS ###
-###################
-
-# See https://wiki.hyprland.org/Configuring/Keywords/
-
-# Set programs that you use
-$terminal = alacritty
-$fileManager = nautilus
-$menu = fuzzel
-
-
-#################
-### AUTOSTART ###
-#################
-
-# Autostart necessary processes (like notifications daemons, status bars, etc.)
-# Or execute your favorite apps at launch like this:
-
-exec-once = uwsm app -- waybar
-exec-once = uwsm app -- nm-applet
-exec-once = uwsm app -- nextcloud --background
-exec-once = uwsm app -- rclone mount google_drive: ~/gdrive
-exec-once = uwsm app -- protonvpn-app
-
-
-#############################
-### ENVIRONMENT VARIABLES ###
-#############################
-
-# See https://wiki.hyprland.org/Configuring/Environment-variables/
-
-env = HYPRCURSOR_THEME,Bibata-Modern-Classic
-env = HYPRCURSOR_SIZE,24
-env = XCURSOR_SIZE,24
-env = XCURSOR_THEME,Bibata-Modern-Classic
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = debug:full_cm_proto=true
-env = QT_QPA_PLATFORMTHEME=qt6ct
-
-
-
-###################
-### PERMISSIONS ###
-###################
-
-# See https://wiki.hyprland.org/Configuring/Permissions/
-# Please note permission changes here require a Hyprland restart and are not applied on-the-fly
-# for security reasons
-
-# ecosystem {
-#   enforce_permissions = 1
-# }
-
-# permission = /usr/(bin|local/bin)/grim, screencopy, allow
-# permission = /usr/(lib|libexec|lib64)/xdg-desktop-portal-hyprland, screencopy, allow
-# permission = /usr/(bin|local/bin)/hyprpm, plugin, allow
-
-
-#####################
-### LOOK AND FEEL ###
-#####################
-
-# Refer to https://wiki.hyprland.org/Configuring/Variables/
-
-# https://wiki.hyprland.org/Configuring/Variables/#general
-source = ~/.config/hypr/catppuccin-hyprland/themes/mocha.conf
-general {
-    gaps_in = 5
-    gaps_out = 5, 5, 5, 5
-
-    border_size = 3
-
-    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
-    # col.active_border = rgba(cba6f7ee) rgba(f38ba8ee) 45deg
-    col.active_border = rgb($mauveAlpha) rgb($tealAlpha) 30deg
-    col.inactive_border = rgb($surface2Alpha)
-
-    # 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 = true
-
-    layout = dwindle
-}
-
-# https://wiki.hyprland.org/Configuring/Variables/#decoration
-decoration {
-    rounding = 4
-    rounding_power = 1
-
-    # 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"
-# uncomment all if you wish to use that.
-# workspace = w[tv1], gapsout:0, gapsin:0
-# workspace = f[1], gapsout:0, gapsin:0
-# windowrule = bordersize 0, floating:0, onworkspace:w[tv1]
-# windowrule = rounding 0, floating:0, onworkspace:w[tv1]
-# windowrule = bordersize 0, floating:0, onworkspace:f[1]
-# windowrule = rounding 0, floating:0, onworkspace: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
-}
-
-# 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 = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
-    disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :(
-	vrr = 0
-}
-
-
-#############
-### INPUT ###
-#############
-
-# https://wiki.hyprland.org/Configuring/Variables/#input
-input {
-    kb_layout = us
-    kb_variant = dvorak-intl, intl
-    kb_model =
-    kb_options =
-    kb_rules =
-
-    follow_mouse = 1
-
-    accel_profile = flat
-    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
-
-    touchpad {
-        natural_scroll = false
-    }
-}
-
-# https://wiki.hyprland.org/Configuring/Variables/#gestures
-gestures {
-    workspace_swipe = false
-}
-
-
-###################
-### KEYBINDINGS ###
-###################
-
-# See https://wiki.hyprland.org/Configuring/Keywords/
-$mainMod = SUPER # Sets "Windows" key as main modifier
-
-bind = , PRINT, exec, gscreenshot -c -s
-# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, RETURN, exec, $terminal
-bind = $mainMod SHIFT, Q, killactive,
-# bind = $mainMod, M, exit,
-bind = $mainMod CTRL, L, exec, hyprlock
-bind = $mainMod, E, exec, $fileManager
-bind = $mainMod, V, togglefloating,
-bind = $mainMod, F, fullscreen,
-bindr = $mainMod, SPACE, exec, $menu
-bind = $mainMod, P, exec, ~/.config/hypr/scripts/powermenu.sh &
-# bind = $mainMod, J, togglesplit, # dwindle
-
-# Move focus with mainMod + arrow keys
-bind = $mainMod, h, movefocus, l
-bind = $mainMod, l, movefocus, r
-bind = $mainMod, k, movefocus, u
-bind = $mainMod, j, movefocus, d
-
-bind = $mainMod SHIFT, left, movewindow, l
-bind = $mainMod SHIFT, right, movewindow, r
-bind = $mainMod SHIFT, up, movewindow, u
-bind = $mainMod SHIFT, down, movewindow, d
-bind = $mainMod SHIFT, H, movewindow, l
-bind = $mainMod SHIFT, L, movewindow, r
-bind = $mainMod SHIFT, K, movewindow, u
-bind = $mainMod SHIFT, J, movewindow, d
-
-# Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-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, 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
-
-# Example special workspace (scratchpad)
-bind = $mainMod, S, togglespecialworkspace, magic
-bind = $mainMod SHIFT, S, movetoworkspace, special:magic
-
-# 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
-
-# Laptop multimedia keys for volume and LCD brightness
-bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+
-bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
-bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
-bindel = ,XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+
-bindel = ,XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%-
-
-# Requires playerctl
-bindl = , XF86AudioNext, exec, playerctl next
-bindl = , XF86AudioPause, exec, playerctl play-pause
-bindl = , XF86AudioPlay, exec, playerctl play-pause
-bindl = , XF86AudioPrev, exec, playerctl previous
-bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+
-bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%-
-
-##############################
-### WINDOWS AND WORKSPACES ###
-##############################
-
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
-
-# Example windowrule
-# windowrule = float,class:^(kitty)$,title:^(kitty)$
-
-# Ignore maximize requests from apps. You'll probably like this.
-windowrule = suppressevent maximize, class:.*
-
-# Fix some dragging issues with XWayland
-windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
-windowrulev2=noblur,class:^()$,title:^()$
+source = ~/.config/hypr/modules/window_rules.conf
--- a/hypr/hyprpaper.conf
+++ b/hypr/hyprpaper.conf
@@ -1,2 +1,4 @@
+preload = ~/Pictures/red_moon/red_moon-latte.jpg
 preload = ~/Pictures/rem/rem-latte.jpg
+# wallpaper = ,~/Pictures/red_moon/red_moon-latte.jpg
 wallpaper = ,~/Pictures/rem/rem-latte.jpg
--- a/hypr/mocha.conf
+++ b/hypr/mocha.conf
@@ -1,78 +0,0 @@
-
-$rosewater = rgb(f5e0dc)
-$rosewaterAlpha = f5e0dc
-
-$flamingo = rgb(f2cdcd)
-$flamingoAlpha = f2cdcd
-
-$pink = rgb(f5c2e7)
-$pinkAlpha = f5c2e7
-
-$mauve = rgb(cba6f7)
-$mauveAlpha = cba6f7
-
-$red = rgb(f38ba8)
-$redAlpha = f38ba8
-
-$maroon = rgb(eba0ac)
-$maroonAlpha = eba0ac
-
-$peach = rgb(fab387)
-$peachAlpha = fab387
-
-$yellow = rgb(f9e2af)
-$yellowAlpha = f9e2af
-
-$green = rgb(a6e3a1)
-$greenAlpha = a6e3a1
-
-$teal = rgb(94e2d5)
-$tealAlpha = 94e2d5
-
-$sky = rgb(89dceb)
-$skyAlpha = 89dceb
-
-$sapphire = rgb(74c7ec)
-$sapphireAlpha = 74c7ec
-
-$blue = rgb(89b4fa)
-$blueAlpha = 89b4fa
-
-$lavender = rgb(b4befe)
-$lavenderAlpha = b4befe
-
-$text = rgb(cdd6f4)
-$textAlpha = cdd6f4
-
-$subtext1 = rgb(bac2de)
-$subtext1Alpha = bac2de
-
-$subtext0 = rgb(a6adc8)
-$subtext0Alpha = a6adc8
-
-$overlay2 = rgb(9399b2)
-$overlay2Alpha = 9399b2
-
-$overlay1 = rgb(7f849c)
-$overlay1Alpha = 7f849c
-
-$overlay0 = rgb(6c7086)
-$overlay0Alpha = 6c7086
-
-$surface2 = rgb(585b70)
-$surface2Alpha = 585b70
-
-$surface1 = rgb(45475a)
-$surface1Alpha = 45475a
-
-$surface0 = rgb(313244)
-$surface0Alpha = 313244
-
-$base = rgb(1e1e2e)
-$baseAlpha = 1e1e2e
-
-$mantle = rgb(181825)
-$mantleAlpha = 181825
-
-$crust = rgb(11111b)
-$crustAlpha = 11111b
--- a/hypr/modules/autostart.conf
+++ b/hypr/modules/autostart.conf
@@ -0,0 +1,10 @@
+
+# Autostart necessary processes (like notifications daemons, status bars, etc.)
+# Or execute your favorite apps at launch like this:
+
+# exec-once = uwsm app -- waybar
+exec-once = uwsm app -- nm-applet
+exec-once = uwsm app -- nextcloud --background
+exec-once = uwsm app -- rclone mount google_drive: ~/gdrive
+exec-once = uwsm app -- protonvpn-app
+# exec-once = uwsm app -- hyprpaper
--- a/hypr/modules/env.conf
+++ b/hypr/modules/env.conf
@@ -0,0 +1,10 @@
+
+# See https://wiki.hyprland.org/Configuring/Environment-variables/
+
+env = HYPRCURSOR_THEME,Bibata-Modern-Classic
+env = HYPRCURSOR_SIZE,24
+env = XCURSOR_SIZE,24
+env = XCURSOR_THEME,Bibata-Modern-Classic
+env = XDG_CURRENT_DESKTOP,Hyprland
+env = debug:full_cm_proto=true
+env = QT_QPA_PLATFORMTHEME=qt6ct
--- a/hypr/modules/input.conf
+++ b/hypr/modules/input.conf
@@ -0,0 +1,24 @@
+
+# https://wiki.hyprland.org/Configuring/Variables/#input
+input {
+    kb_layout = us
+    kb_variant = dvorak-intl, intl
+    # kb_variant = intl
+    kb_model =
+    kb_options =
+    kb_rules =
+
+    follow_mouse = 0
+
+    accel_profile = flat
+    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
+
+    touchpad {
+        natural_scroll = false
+    }
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#gestures
+gestures {
+    workspace_swipe = false
+}
--- a/hypr/modules/keybinds.conf
+++ b/hypr/modules/keybinds.conf
@@ -0,0 +1,82 @@
+
+$mainMod = SUPER # Sets "Windows" key as main modifier
+
+bind = , PRINT, exec, gscreenshot -c -s
+bind = $mainMod, RETURN, exec, $terminal
+bind = $mainMod SHIFT, Q, killactive,
+bind = $mainMod CTRL, L, exec, hyprlock
+bind = $mainMod, E, exec, $fileManager
+bind = $mainMod, V, togglefloating,
+bind = $mainMod, F, fullscreen,
+bind = $mainMod, SPACE, exec, $menu
+bind = $mainMod, P, exec, ~/.config/hypr/scripts/powermenu.sh &
+bind = $mainMod, t, togglesplit, # dwindle
+bind = $mainMod, n, togglegroup
+
+# Move focus with mainMod + arrow keys
+bind = $mainMod, h, movefocus, l
+bind = $mainMod, l, movefocus, r
+bind = $mainMod, k, movefocus, u
+bind = $mainMod, j, movefocus, d
+
+bind = $mainMod SHIFT, H, movewindoworgroup, l
+bind = $mainMod SHIFT, L, movewindoworgroup, r
+bind = $mainMod SHIFT, K, movewindoworgroup, u
+bind = $mainMod SHIFT, J, movewindoworgroup, d
+
+# Switch workspaces with mainMod + [0-9]
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+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, 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
+
+# groups
+# bind = ALT, Tab, changegroupactive, prev
+bind = ALT, Tab, changegroupactive, next
+
+
+# Example special workspace (scratchpad)
+bind = $mainMod, S, togglespecialworkspace, magic
+bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+
+# 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
+
+# Laptop multimedia keys for volume and LCD brightness
+bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+
+bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
+bindel = ,XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+
+bindel = ,XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%-
+
+# Requires playerctl
+bindl = , XF86AudioNext, exec, playerctl next
+bindl = , XF86AudioPause, exec, playerctl play-pause
+bindl = , XF86AudioPlay, exec, playerctl play-pause
+bindl = , XF86AudioPrev, exec, playerctl previous
+bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+
+bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%-
--- a/hypr/modules/monitors.conf
+++ b/hypr/modules/monitors.conf
@@ -0,0 +1,9 @@
+
+# See https://wiki.hyprland.org/Configuring/Monitors/
+monitor=eDP-1, preferred, 0x0, 1
+# monitor=DP-4, preferred, auto, 1, mirror, eDP-1
+monitor=,preferred,auto,auto
+# trigger when the switch is turning off
+# bindl = , switch:off:Lid Switch,exec,hyprctl keyword monitor "eDP-1, 1920x1080@60, 0x0, 1"
+# trigger when the switch is turning on
+# bindl = , switch:on:Lid Switch,exec,hyprctl keyword monitor "eDP-1, disable"
--- a/hypr/modules/programs.conf
+++ b/hypr/modules/programs.conf
@@ -0,0 +1,7 @@
+
+# See https://wiki.hyprland.org/Configuring/Keywords/
+
+# Set programs that you use
+$terminal = alacritty
+$fileManager = nautilus
+$menu = fuzzel
--- a/hypr/modules/theme.conf
+++ b/hypr/modules/theme.conf
@@ -0,0 +1,113 @@
+# catppuccin mocha theme
+source = ~/.config/hypr/catppuccin-hyprland/themes/mocha.conf
+
+# Refer to https://wiki.hyprland.org/Configuring/Variables/
+
+# https://wiki.hyprland.org/Configuring/Variables/#general
+
+general {
+    gaps_in = 5
+    gaps_out = 5, 5, 5, 5
+
+    border_size = 3
+
+    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
+    # col.active_border = rgba(cba6f7ee) rgba(f38ba8ee) 45deg
+    col.active_border = rgb($mauveAlpha) rgb($tealAlpha) 30deg
+    col.inactive_border = rgb($surface2Alpha)
+
+    # 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 = true
+
+    layout = dwindle
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#decoration
+decoration {
+    rounding = 4
+    rounding_power = 1
+
+    # 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
+}
+
+# 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
+}
+
+# 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 = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
+    disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :(
+	vrr = 1
+	font_family = FiraCode Nerd Font
+}
+
+group {
+	groupbar {
+		font_size = 14
+		text_color = $text
+		text_color_inactive = $text
+		col.active = $maroon
+		col.inactive = $surface2
+	}
+    col.border_active = $maroon $teal 30deg
+    col.border_inactive = $surface2
+}
--- a/hypr/modules/window_rules.conf
+++ b/hypr/modules/window_rules.conf
@@ -0,0 +1,55 @@
+
+# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
+
+# Ignore maximize requests from apps. You'll probably like this.
+windowrule = suppressevent maximize, class:.*
+
+# Fix some dragging issues with XWayland
+windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
+windowrulev2=noblur,class:^()$,title:^()$
+
+
+# games for tearing add the immediate rule
+windowrule = immediate, class:^(cs2)$
+
+# Float Windows
+windowrule=float,title:^(Open File)$
+windowrule=float,title:^(Select a File)$
+windowrule=float,title:^(Choose a file)$
+windowrule=float,title:^(Save As)$
+windowrule=float,title:^(Save File)$
+windowrule=float,title:^(branchdialog)$
+windowrule=float,title:^(pinentry-gtk-2)$
+windowrule=float,title:^(Confirm to replace files)$
+windowrule=float,title:^(File Operation Progress)$
+windowrule=float,class:^(pavucontrol|blueman-manager|nm-connection-editor)$
+
+# Center and Resize Windows
+windowrule=size 800 600,title:^(Open File)$
+windowrule=size 800 600,title:^(Select a File)$
+windowrule=size 800 600,title:^(Choose a file)$
+windowrule=size 800 600,title:^(Save As)$
+windowrule=size 800 600,title:^(Save File)$
+windowrule=size 800 600,title:^(branchdialog)$
+windowrule=size 800 600,title:^(pinentry-gtk-2)$
+windowrule=size 800 600,title:^(Confirm to replace files)$
+windowrule=size 800 600,title:^(File Operation Progress)$
+windowrule=size 800 600,class:^(pavucontrol|blueman-manager|nm-connection-editor)$
+windowrule=center,title:^(Open File)$
+windowrule=center,title:^(Select a File)$
+windowrule=center,title:^(Choose a file)$
+windowrule=center,title:^(Save As)$
+windowrule=center,title:^(Save File)$
+windowrule=center,title:^(branchdialog)$
+windowrule=center,title:^(pinentry-gtk-2)$
+windowrule=center,title:^(Confirm to replace files)$
+windowrule=center,title:^(File Operation Progress)$
+windowrule=center,class:^(pavucontrol|blueman-manager|nm-connection-editor)$
+
+# Workspace Rules
+windowrule=workspace 1,class:^(firefox)$
+windowrule=workspace 2,class:^(kitty)$
+windowrule=workspace 3,class:^(Code)$
+windowrule=workspace 4,class:^(steam)$
+windowrule=workspace 5,class:^(discord)$
--- a/hypr/scripts/gamemode.sh
+++ b/hypr/scripts/gamemode.sh
--- a/1799
+++ b/1799
--- a/rice-2.png
+++ b/rice-2.png
--- a/rice-3.png
+++ b/rice-3.png
--- a/rice.png
+++ b/rice.png
--- a/waybar/config.jsonc
+++ b/waybar/config.jsonc
@@ -3,7 +3,7 @@
    "layer": "top",
    "position": "top",
    "height": 35,
-    "modules-left": ["hyprland/workspaces", "hyprland/window"],
+    "modules-left": ["hyprland/workspaces"],
    "modules-center": [],
    "modules-right": ["tray", "wireplumber", "custom/pixelbuds", "custom/anc", "network", "cpu", "memory", "custom/tlp", "clock", "custom/power"],

@@ -16,7 +16,7 @@
        "max-length": 35
    },
    "clock": {
-        "format": "{:%I:%M %p}",
+        "format": "{:%H:%M}",
        "format-alt": "{:%a, %b %d}",
        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
    },
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -74,13 +74,13 @@ window#waybar.hidden {
 }

 #custom-anc.anc-active {
-    color: @sky; 
-  	border-bottom: 3px solid @sky;
+    color: @teal; 
+  	border-bottom: 3px solid @teal;
 }

 #custom-anc.anc-aware {
-    color: @green; 
-  	border-bottom: 3px solid @green;
+    color: @yellow; 
+  	border-bottom: 3px solid @yellow;
 }

 #custom-anc.anc-off {
Author	SHA1	Message	Date
Nils Pukropp	5599be8150	added fish_vars to ignore	2025-08-04 07:31:22 +02:00
Nils Pukropp	5696aeed8d	updated hyprland confs	2025-08-02 00:16:14 +02:00
Nils Pukropp	bc2cabece3	refactored hyprland conf for better maintainability	2025-08-01 10:03:02 +02:00
Nils Pukropp	bab1718ea5	added wallpapers	2025-08-01 09:45:23 +02:00
Nils Pukropp	9f31f26325	added different wallpapers	2025-07-31 10:53:09 +02:00
Nils Pukropp	c6d9cfc270	added packages + fuzzel	2025-07-30 12:08:36 +02:00
Nils Pukropp	7850c7bb0e	added fish config	2025-07-30 11:46:46 +02:00
Nils Pukropp	44b40bc8e7	added updated rice pics	2025-07-23 23:37:08 +02:00
Nils Pukropp	53b1b5bc27	added btop	2025-07-23 23:04:08 +02:00