diff --git a/user/.bashrc b/user/.bashrc index ee089b0f7..d79469ba8 100644 --- a/user/.bashrc +++ b/user/.bashrc @@ -198,9 +198,8 @@ alias \ # file management alias \ - fm="$HOME/.config/vifm/scripts/vifmrun" \ - flm="$HOME/.config/vifm/scripts/vifmrun" \ - vifm="$HOME/.config/vifm/scripts/vifmrun" \ + fm="yazi" \ + flm="yazi" \ rm="rm -vI" \ mv="mv -iv" \ cp="cp -iv" \ @@ -224,8 +223,8 @@ alias \ yta-vorbis="yt-dlp --extract-audio --audio-format vorbis" \ yta-wav="yt-dlp --extract-audio --audio-format wav" \ ytv-best="yt-dlp -f bestvideo+bestaudio" \ - yt="ytfzf -ftsl" \ - ytm="ytfzf -mtsl" + yt="ytfzf -ftslT kitty" \ + ytm="ytfzf -mtslT kitty" # network and bluetooth alias \ diff --git a/user/.config/fish/config.fish b/user/.config/fish/config.fish index 3aeba5828..9978828e9 100644 --- a/user/.config/fish/config.fish +++ b/user/.config/fish/config.fish @@ -9,17 +9,17 @@ # First line removes the path; second line sets it. Without the first line, # your path gets massive and fish becomes very slow. set -e fish_user_paths -set -U fish_user_paths $HOME/.bin $HOME/.local/bin $HOME/go/bin $HOME/Applications /var/lib/flatpak/exports/bin/ $fish_user_paths +set -U fish_user_paths $HOME/.bin $HOME/.local/bin $HOME/.go/bin $HOME/Applications /var/lib/flatpak/exports/bin/ $fish_user_paths ### EXPORT ### set fish_greeting # Supresses fish's intro message set TERM "xterm-256color" # Sets the terminal type set EDITOR "lvim" set VISUAL "kitty --class editor lvim" -set GOPATH "~/go" +set GOPATH "$HOME/.go" ### SET BAT AS MANPAGER -set -x MANPAGER "sh -c 'col -bx | bat -l man -p'" +#set -x MANPAGER "sh -c 'col -bx | bat -l man -p'" ### SET EITHER DEFAULT EMACS MODE OR VI MODE ### function fish_user_key_bindings @@ -116,6 +116,12 @@ end function take --argument number head -$number end + +# unlock ssh keys +function unlock + ssh-add "$HOME/.ssh/$argv[1]" +end + ### END OF FUNCTIONS ### ### ALIASES ### @@ -157,8 +163,8 @@ alias egrep='egrep --color=auto' alias fgrep='fgrep --color=auto' # file management -alias fm="~/.config/vifm/scripts/vifmrun" -alias flm="~/.config/vifm/scripts/vifmrun" +alias fm="yazi" +alias flm="yazi" alias cp='cp -iv' alias mv='mv -iv' alias rm='rm -vI' @@ -168,9 +174,9 @@ alias mkdir='mkdir -pv' # audio alias mx='pulsemixer' alias amx='alsamixer' -alias mk='cmus' -alias ms='cmus' -alias music='cmus' +alias mk='musikcube' +alias ms='musikcube' +alias music='musikcube' # multimedia scripts alias fli='flix-cli' @@ -216,10 +222,10 @@ alias yta-opus="yt-dlp --extract-audio --audio-format opus " alias yta-vorbis="yt-dlp --extract-audio --audio-format vorbis " alias yta-wav="yt-dlp --extract-audio --audio-format wav " alias ytv-best="yt-dlp -f bestvideo+bestaudio " -alias yt='ytfzf -ftsl' -alias youtube='ytfzf -ftsl' -alias ytm='ytfzf -mtsl' -alias youtube-music='ytfzf -mtsl' +alias yt='ytfzf -ftslT kitty' +alias youtube='ytfzf -ftslT kitty' +alias ytm='ytfzf -mtslT kitty' +alias youtube-music='ytfzf -mtslT kitty' # network and bluetooth alias netstats='nmcli dev' diff --git a/user/.config/fuzzel/scripts/fuzz_power b/user/.config/fuzzel/scripts/fuzz_power index d029d1ff4..747d83d9d 100755 --- a/user/.config/fuzzel/scripts/fuzz_power +++ b/user/.config/fuzzel/scripts/fuzz_power @@ -3,7 +3,6 @@ # ***This script was made by Clay Gomera (Drake)*** # - Description: A simple power menu script for rofi/dmenu/wofi # - Dependencies: {rofi||dmenu||wofi}, power-profiles-daemon, swaylock -# ####################### ## Main manu options ## @@ -26,9 +25,7 @@ pwr3="󰾆 Power Saver" pwr4=" Cancel" pwrs="$pwr1\n$pwr2\n$pwr3\n$pwr4" -##### ## This variable will store the current power profile -##### currentpwr=$(powerprofilesctl get) ########## @@ -52,9 +49,7 @@ case "$action" in hyprlock; ;; "$option6") - ##### ## These conditions will be used for the prompt - ##### if [ "$currentpwr" = "performance" ]; then currentpwr="$pwr1"; elif [ "$currentpwr" = "balanced" ]; then @@ -63,6 +58,7 @@ case "$action" in currentpwr="$pwr3"; fi pwraction=$(echo -e "$pwrs" | $RUNNER -l 6 -i -p "[ Power Profile Menu - Currently set to: $currentpwr] ") # power profiles submenu prompt + case "$pwraction" in "$pwr1") if [ "$currentpwr" = "$pwr1" ]; then # if the power profile is already set to performance diff --git a/user/.config/fuzzel/scripts/fuzz_wifi b/user/.config/fuzzel/scripts/fuzz_wifi index a4fd4446b..0d1df77ee 100755 --- a/user/.config/fuzzel/scripts/fuzz_wifi +++ b/user/.config/fuzzel/scripts/fuzz_wifi @@ -15,22 +15,11 @@ option5="󱛆 Setup captive portal" option6=" Exit" options="$option1\n$option2\n$option3\n$option4\n$option5\n$option6" -##### -## These variables will store specific -## information about the wireless -## interface -##### +## These variables will store specific information about the wireless interface wifi_info=$(nmcli dev | awk '/wifi/ {print $1,$3; exit}') read -r wlan constate <<< "$wifi_info" -##### -## This function uses nmcli to turn -## off wifi and then sends a -## notification -##### -## param: none -## return: void -##### +## This function uses nmcli to turn off wifi and then sends a notification turnoff() { nmcli radio wifi off if [ $? -eq 0 ]; then @@ -40,14 +29,7 @@ turnoff() { fi } -##### -## This function uses nmcli to turn -## on wifi and then sends a -## notification -##### -## param: none -## return: void -##### +## This function uses nmcli to turn on wifi and then sends a notification turnon() { nmcli radio wifi on if [ $? -eq 0 ]; then @@ -57,15 +39,7 @@ turnon() { fi } -##### -## This function uses nmcli and the -## $wlan and $constate variables to -## disconnect from the wifi network -## and then sends a notification -##### -## param: none -## return: void -##### +## This function uses nmcli and the $wlan and $constate variables to disconnect from the wifi network and then sends a notification disconnect() { if [ "$constate" = "disconnected" ]; then notify-send "WiFi is already disconnected" @@ -81,15 +55,7 @@ disconnect() { fi } -##### -## This function uses nmcli to first scan -## for available networks and then the -## $bssid variable will store the SSID -## of the network that the user chooses -##### -## param: none -## return: string -##### +## This function uses nmcli to first scan for available networks and then the $bssid variable will store the SSID of the network that the user chooses connect() { notify-send -t 5000 "Scanning networks..." nmcli dev wifi rescan @@ -101,34 +67,21 @@ connect() { ssid=$(echo "$wifinet" | awk '{print $2}') } -##### -## This function will store the WiFi -## password in the $pass variable -##### -## param: none -## return: string -##### +## This function will store the WiFi password in the $pass variable password() { if nmcli connection show | awk -v ssid="$ssid" '$1 == ssid {found=1} END {exit !found}'; then pass="" elif nmcli -f BSSID,SECURITY dev wifi list | grep -w "$bssid" | awk '{print $2}' | grep -q -- "--"; then pass="" else - pass=$($RUNNER -l 0 --password -p "[Enter Password ]  " ); + pass=$($RUNNER -l 0 --password -p "[Enter Password  ]  " ); if [ -z "$pass" ]; then exit 0 fi fi } -##### -## This function will actually connect -## to the chosen WiFi network using the -## $bssid and $pass variables -##### -## param: none -## return: void -##### +## This function will actually connect to the chosen WiFi network using the $bssid and $pass variables action() { if [ -n "$pass" ]; then nmcli dev wifi connect "$bssid" password "$pass" diff --git a/user/.config/gtk-2.0/gtkfilechooser.ini b/user/.config/gtk-2.0/gtkfilechooser.ini new file mode 100644 index 000000000..3de31bfd5 --- /dev/null +++ b/user/.config/gtk-2.0/gtkfilechooser.ini @@ -0,0 +1,11 @@ +[Filechooser Settings] +LocationMode=path-bar +ShowHidden=false +ShowSizeColumn=true +GeometryX=0 +GeometryY=0 +GeometryWidth=780 +GeometryHeight=585 +SortColumn=name +SortOrder=ascending +StartupMode=recent diff --git a/user/.config/gtk-3.0/bookmarks b/user/.config/gtk-3.0/bookmarks new file mode 100644 index 000000000..e69de29bb diff --git a/user/.config/hypr/hyprland.conf b/user/.config/hypr/hyprland.conf index afc086eac..03beed1b1 100644 --- a/user/.config/hypr/hyprland.conf +++ b/user/.config/hypr/hyprland.conf @@ -1,7 +1,4 @@ -# ╻ ┏━┓╻ ╻┏┓╻┏━╸╻ ╻ -# ┃ ┣━┫┃ ┃┃┗┫┃ ┣━┫ -# ┗━╸╹ ╹┗━┛╹ ╹┗━╸╹ ╹ - +# autolaunch exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = dbus-update-activation-environment --systemd --all exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP @@ -14,10 +11,7 @@ exec-once = wl-paste --type image --watch cliphist store exec-once = hyprpaper exec-once = hypridle -# ┏━╸┏┓╻╻ ╻ -# ┣╸ ┃┗┫┃┏┛ -# ┗━╸╹ ╹┗┛ - +# environment variables env = SSH_AUTH_SOCK,$XDG_RUNTIME_DIR/ssh-agent.socket env = XDG_CURRENT_DESKTOP,Hyprland env = XDG_SESSION_DESKTOP,Hyprland @@ -28,7 +22,7 @@ env = QT_STYLE_OVERRIDE,kvantum env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 env = QT_AUTO_SCREEN_SCALE_FACTOR,1 env = GDK_BACKEND,wayland,x11 -env = SDL_VIDEODRIVER,wayland +#env = SDL_VIDEODRIVER,wayland env = MOZ_ENABLE_WAYLAND,1 env = WLR_NO_HARDWARE_CURSORS,1 env = HYPRLAND_NO_SD_NOTIFY=0 @@ -40,19 +34,13 @@ env = VIEWER,zathura env = RUNNER,fuzzel --dmenu env = RUNNER_EX,fuzzel -# ┏┳┓┏━┓┏┓╻╻╺┳╸┏━┓┏━┓ -# ┃┃┃┃ ┃┃┗┫┃ ┃ ┃ ┃┣┳┛ -# ╹ ╹┗━┛╹ ╹╹ ╹ ┗━┛╹┗╸ - -monitor=HDMI-A-1, preferred, auto, 1 -monitor=eDP-1, preferred, auto, 1, mirror, HDMI-A-1 +# monitor settings +monitor = eDP-1, preferred, auto, 1 +monitor = HDMI-A-1, preferred, auto, 1, mirror, eDP-1 bindl = , switch:off:Lid Switch, exec, hyprctl keyword monitor "eDP-1, preferred, auto, 1" bindl = , switch:on:Lid Switch, exec, hyprctl keyword monitor "eDP-1, disable" -# ╻┏┓╻┏━┓╻ ╻╺┳╸ -# ┃┃┗┫┣━┛┃ ┃ ┃ -# ╹╹ ╹╹ ┗━┛ ╹ - +# input settings input { kb_layout = us,es kb_options = grp:shift_caps_toggle @@ -68,12 +56,17 @@ input { gestures { workspace_swipe = true + workspace_swipe_touch = true } -# ╻ ┏━┓╻ ╻┏━┓╻ ╻╺┳╸┏━┓ -# ┃ ┣━┫┗┳┛┃ ┃┃ ┃ ┃ ┗━┓ -# ┗━╸╹ ╹ ╹ ┗━┛┗━┛ ╹ ┗━┛ +# cursor +cursor { + hide_on_touch = true + hide_on_key_press = true + inactive_timeout = 30 +} +# layouts dwindle { pseudotile = yes preserve_split = yes @@ -87,24 +80,17 @@ master { mfact = 0.50 } -# ┏┳┓╻┏━┓┏━╸ -# ┃┃┃┃┗━┓┃ -# ╹ ╹╹┗━┛┗━╸ - +# misc misc { disable_hyprland_logo = true disable_splash_rendering = true mouse_move_enables_dpms = true enable_swallow = true swallow_regex = ^(alacritty)$ - hide_cursor_on_touch = true mouse_move_focuses_monitor = true } -# ┏━┓┏━┓╻ ╻┏━┓┏━╸┏━╸ -# ┗━┓┃ ┃┃ ┃┣┳┛┃ ┣╸ -# ┗━┛┗━┛┗━┛╹┗╸┗━╸┗━╸ - +# source source = ~/.config/hypr/animations.conf source = ~/.config/hypr/keybindings.conf source = ~/.config/hypr/rules.conf diff --git a/user/.config/hypr/keybindings.conf b/user/.config/hypr/keybindings.conf index 9ccc3d3bb..14dc7d17f 100644 --- a/user/.config/hypr/keybindings.conf +++ b/user/.config/hypr/keybindings.conf @@ -94,16 +94,16 @@ binde = $supMod_SHIFT, b, exec, pkill fuzzel || $HOME/.config/fuzzel/scripts/f binde = $supMod_SHIFT, m, exec, pkill fuzzel || $HOME/.config/fuzzel/scripts/fuzz_mount # launch drive mounter # apps binds -binde = $supMod_$altMod, y, exec, kitty --class ytfzf ytfzf -flstT kitty # launch youtube player -binde = $supMod_$altMod, m, exec, kitty --class ytfzf_music ytfzf -mlstT kitty # launch youtube music player -binde = $supMod_$altMod, f, exec, kitty --class flix_cli flix-cli # launch torrent movie player -binde = $supMod_$altMod, a, exec, kitty --class ani_cli ani-cli # launch anime player -binde = $supMod_$altMod, b, exec, kitty --class btop btop # launch resource monitor -binde = $supMod_$altMod, p, exec, kitty --class pulsemixer pulsemixer # launch audio mixer -binde = $supMod_$conMod, f, exec, kitty --class file_manager $HOME/.config/vifm/scripts/vifmrun # launch file manager -binde = $supMod_$conMod, e, exec, kitty --class editor lvim # launch text editor -binde = $supMod_$conMod, m, exec, kitty --class musikcube musikcube # launch music player -binde = $supMod_$conMod, r, exec, kitty --class newsboat newsboat # launch rss feed reader -binde = $supMod_$conMod, w, exec, flatpak run org.mozilla.firefox # launch web browser -binde = $supMod_$conMod, c, exec, flatpak run org.signal.Signal # launch chat app -binde = $supMod_$conMod, p, exec, flatpak run com.bitwarden.desktop # launch password manager +binde = $supMod_$altMod, y, exec, kitty --class ytfzf ytfzf -flstT kitty # launch youtube player +binde = $supMod_$altMod, m, exec, kitty --class ytfzf_music ytfzf -mlstT kitty # launch youtube music player +binde = $supMod_$altMod, f, exec, kitty --class flix_cli flix-cli # launch torrent movie player +binde = $supMod_$altMod, a, exec, kitty --class ani_cli ani-cli # launch anime player +binde = $supMod_$altMod, b, exec, kitty --class btop btop # launch resource monitor +binde = $supMod_$altMod, p, exec, kitty --class pulsemixer pulsemixer # launch audio mixer +binde = $supMod_$conMod, f, exec, kitty --class file_manager yazi # launch file manager +binde = $supMod_$conMod, e, exec, kitty --class editor lvim # launch text editor +binde = $supMod_$conMod, m, exec, kitty --class musikcube musikcube # launch music player +binde = $supMod_$conMod, r, exec, kitty --class newsboat newsboat # launch rss feed reader +binde = $supMod_$conMod, w, exec, flatpak run org.mozilla.firefox # launch web browser +binde = $supMod_$conMod, c, exec, flatpak run org.signal.Signal # launch chat app +binde = $supMod_$conMod, p, exec, flatpak run com.bitwarden.desktop # launch password manager diff --git a/user/.config/hypr/rules.conf b/user/.config/hypr/rules.conf index cd341a3f9..465042ad8 100644 --- a/user/.config/hypr/rules.conf +++ b/user/.config/hypr/rules.conf @@ -14,6 +14,7 @@ windowrulev2 = float,class:^(nm-connection-editor)$ windowrulev2 = float,class:^(org.kde.polkit-kde-authentication-agent-1)$ windowrulev2 = float,class:^(com.obsproject.Studio)$,title:^(Controls)$ windowrulev2 = float,class:^(qalculate-gtk)$ +windowrulev2 = float,class:^(xdg-desktop-portal-gtk)$ # ╻ ╻┏━┓┏━┓╻┏ ┏━┓┏━┓┏━┓┏━╸┏━╸ ┏━┓╻ ╻╻ ┏━╸┏━┓ # ┃╻┃┃ ┃┣┳┛┣┻┓┗━┓┣━┛┣━┫┃ ┣╸ ┣┳┛┃ ┃┃ ┣╸ ┗━┓ @@ -91,6 +92,7 @@ windowrule = workspace 6, ^(org.kde.kid3)$ windowrule = workspace 7, ^(pitivi)$ windowrule = workspace 7, ^(org.kde.kdenlive)$ windowrule = workspace 7, ^(mpv)$ +windowrule = workspace 7, ^(vlc)$ windowrule = workspace 7, ^(ytfzf)$ windowrule = workspace 7, ^(flix_cli)$ windowrule = workspace 7, ^(ani_cli)$ @@ -125,9 +127,16 @@ windowrule = workspace 9, ^(evince)$ # workspace 10 - games windowrule = workspace 10, ^(org.libretro.RetroArch)$ windowrule = workspace 10, ^(com.github.tkashkin.gamehub)$ -windowrule = workspace 10, ^(DarkPlaces)$ +windowrule = workspace 10, ^(xonotic-linux64-sdl)$ windowrule = workspace 10, ^(pyrogenesis)$ windowrule = workspace 10, ^(wesnoth)$ windowrule = workspace 10, ^(steam)$ windowrule = workspace 10, ^(Minetest)$ windowrule = workspace 10, ^(org.prismlauncher.PrismLauncher)$ +windowrule = workspace 10, ^(lutris)$ +windowrule = workspace 10, ^(es-de)$ +windowrule = workspace 10, ^(xemu)$ +windowrule = workspace 10, ^(duckstation-qt)$ +windowrule = workspace 10, ^(pcsx2-qt)$ +windowrule = workspace 10, ^(info.cemu.Cemu)$ +windowrule = workspace 10, ^(org.ppsspp.PPSSPP)$ diff --git a/user/.config/hypr/scripts/switchlayout b/user/.config/hypr/scripts/switchlayout index fefad1998..404958a49 100755 --- a/user/.config/hypr/scripts/switchlayout +++ b/user/.config/hypr/scripts/switchlayout @@ -1,10 +1,10 @@ #!/bin/bash hyprctl \ - --batch "$( - hyprctl devices -j | - jq -r '.keyboards[] | .name' | - while IFS= read -r keyboard; do - printf '%s %s %s;' 'switchxkblayout' "${keyboard}" 'next' - done -)" + --batch "$( + hyprctl devices -j | + jq -r '.keyboards[] | .name' | + while IFS= read -r keyboard; do + printf '%s %s %s;' 'switchxkblayout' "${keyboard}" 'next' + done + )" diff --git a/user/.config/hypr/wall/lock.png b/user/.config/hypr/wall/lock.png index 6db8b8b27..eac75b934 100644 Binary files a/user/.config/hypr/wall/lock.png and b/user/.config/hypr/wall/lock.png differ diff --git a/user/.config/hypr/wall/wall.png b/user/.config/hypr/wall/wall.png index 6db8b8b27..eac75b934 100644 Binary files a/user/.config/hypr/wall/wall.png and b/user/.config/hypr/wall/wall.png differ