From d74b672e60efe1062933ba8902de44342757fa2d Mon Sep 17 00:00:00 2001 From: CronyAkatsuki Date: Wed, 25 Dec 2024 21:06:09 +0100 Subject: [PATCH] Update. --- .config/MangoHud/MangoHud.conf | 29 +++++-------- .config/X11/xinitrc | 8 +++- .config/alacritty/alacritty.toml | 2 +- .config/qutebrowser/config.py | 4 +- .../greasemonkey/darkmode-disable.js | 2 + .config/qutebrowser/pyconfig/redirectors.py | 1 + .config/sxhkd/general | 8 +--- .config/tmux/tmux.conf | 42 ++++++++++++------- .config/xmonad/xmonad.hs | 6 ++- .config/zsh/.zshenv | 13 ++++++ .config/zsh/.zshrc | 7 ++++ .config/zsh/aliases.zsh | 6 +++ .config/zsh/functions.zsh | 8 +++- 13 files changed, 89 insertions(+), 47 deletions(-) diff --git a/.config/MangoHud/MangoHud.conf b/.config/MangoHud/MangoHud.conf index 15764a2..5bdd02d 100644 --- a/.config/MangoHud/MangoHud.conf +++ b/.config/MangoHud/MangoHud.conf @@ -1,12 +1,11 @@ ### Limit the application FPS. Comma-separated list of one or more FPS values (e.g. 0,30,60). 0 means unlimited (unless VSynced) -fps_limit=0,30,60 +fps_limit=0,30,60,120,144 ### Display the current GPU information ## Note: gpu_mem_clock also needs "vram" to be enabled gpu_stats gpu_temp gpu_core_clock -gpu_mem_clock gpu_power gpu_text=GPU gpu_load_change @@ -23,15 +22,9 @@ cpu_load_change cpu_load_value=60,90 cpu_load_color=39F900,FDFD09,B22222 -### Display IO read and write for the app (not system) -# io_stats -io_read -io_write - ### Display system vram / ram / swap space usage vram ram -swap ### Display FPS and frametime fps @@ -39,34 +32,34 @@ fps_sampling_period=1000 fps_color_change fps_value=30,60 fps_color=B22222,FDFD09,39F900 -frametime +# frametime # frame_count ### Display miscellaneous information # engine_version -gpu_name -vulkan_driver +# gpu_name +# vulkan_driver # wine ### Display GameMode / vkBasalt running status -gamemode +# gamemode # vkbasalt ### Display current FPS limit -show_fps_limit +# show_fps_limit ### Display the current resolution -resolution +# resolution ### Change the corner roundness -round_corners=5 +round_corners=10 ### Hud position offset -offset_x=15 -offset_y=15 +offset_x=10 +offset_y=10 ### Hud dimensions -width=275 +width=250 # height= # table_columns=3 # cellpadding_y=0 diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc index b1958b5..20e75e4 100644 --- a/.config/X11/xinitrc +++ b/.config/X11/xinitrc @@ -1,6 +1,6 @@ #!/bin/sh -sudo $HOME/bin/misc/ryzenadj-service --stapm-limit 35000 --fast-limit 35000 --slow-limit 35000 --slow-time 60 --stapm-time 1000 --tctl-temp 85 --vrmmax-current 70000 &>/dev/null & +sudo $HOME/bin/misc/ryzenadj-service --stapm-limit 30000 --fast-limit 30000 --slow-limit 30000 --slow-time 60 --stapm-time 1000 --tctl-temp 85 --vrmmax-current 50000 &>/dev/null & userresources=$HOME/.config/X11/xresources usermodmap=$HOME/.Xmodmap @@ -53,6 +53,10 @@ xset s noblank xmonad --recompile # Set wallpaper -xwallpaper --zoom $HOME/pics/wallpaper.png +xwallpaper --zoom "$HOME"/pics/wallpaper.png + +if [ -f "$HOME"/.cache/gaming.lock ]; then + rm -rf "$HOME"/.cache/gaming.lock +fi exec xmonad diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 77f45f8..b08f4ea 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -83,4 +83,4 @@ normal = { family = "Cascadia Code", style = "Regular" } bold = { family = "Cascadia Code", style = "Bold" } italic = { family = "Cascadia Code", style = "Italic" } bold_italic = { family = "Cascadia Code", style = "Bold Italic" } -size = 11 +size = 13 diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py index 4f95dde..cf1a5e0 100644 --- a/.config/qutebrowser/config.py +++ b/.config/qutebrowser/config.py @@ -29,8 +29,8 @@ c.colors.webpage.darkmode.policy.images = "never" # c.colors.webpage.darkmode.grayscale.images = 0.35 # change startpage and default page -c.url.start_pages = ["https://startpage.cronyakatsuki.xyz"] -c.url.default_page = "https://startpage.cronyakatsuki.xyz" +c.url.start_pages = ["http://192.168.0.16:3000"] +c.url.default_page = "http://192.168.0.16:3000" # search engines c.url.searchengines = { diff --git a/.config/qutebrowser/greasemonkey/darkmode-disable.js b/.config/qutebrowser/greasemonkey/darkmode-disable.js index e1ebad0..df64d51 100644 --- a/.config/qutebrowser/greasemonkey/darkmode-disable.js +++ b/.config/qutebrowser/greasemonkey/darkmode-disable.js @@ -6,6 +6,8 @@ // @match https://adventofcode.com/* // @match https://cronyakatsuki.xyz/qbt/* // @match https://www.keybr.com/* +// @match https://192.168.100:8006/* +// @match https://proxmox.me:8006/* // ==/UserScript== const meta = document.createElement("meta"); diff --git a/.config/qutebrowser/pyconfig/redirectors.py b/.config/qutebrowser/pyconfig/redirectors.py index 37f9ef9..57e4bd7 100644 --- a/.config/qutebrowser/pyconfig/redirectors.py +++ b/.config/qutebrowser/pyconfig/redirectors.py @@ -4,6 +4,7 @@ from qutebrowser.api import interceptor, message REDIRECT_MAP = { "reddit.com": operator.methodcaller("setHost", "libreddit.cronyakatsuki.xyz"), + "old.reddit.com": operator.methodcaller("setHost", "libreddit.cronyakatsuki.xyz"), "www.reddit.com": operator.methodcaller("setHost", "libreddit.cronyakatsuki.xyz"), "twitter.com": operator.methodcaller("setHost", "nitter.cronyakatsuki.xyz"), "www.twitter.com": operator.methodcaller("setHost", "nitter.cronyakatsuki.xyz"), diff --git a/.config/sxhkd/general b/.config/sxhkd/general index 7b38eef..1238021 100644 --- a/.config/sxhkd/general +++ b/.config/sxhkd/general @@ -48,8 +48,8 @@ super + p; {w,d,k,l} dmenu-link-handler $(xclip -sel c -o)} # Regular binding some other one's -super + d - dmenu_run +super + {d, c} + {dmenu_run, clipmenu} Print dmenu-screenshot @@ -62,10 +62,6 @@ super + shift + F12 alt + b; {a,o,e,d} {badd, dmenu-buku open, dmenu-buku edit, dmenu-buku delete} -##---KeePassXC quick pass bindings---## -super + g; b - dmenu-keepassxc vaultwarden copy - ##---Sripts---## super + F1 sound-output-toggle diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 3f6ca18..ada1e45 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -3,6 +3,7 @@ set-option -sa terminal-overrides ",alacritty:Tc" # enable mouse support set -g mouse on +set -g default-terminal "tmux-256color" # start window and panes indexing at 1 set -g base-index 1 @@ -32,12 +33,6 @@ bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel bind "'" split-window -v -c "#{pane_current_path}" bind '\' split-window -h -c "#{pane_current_path}" -# Floating popup keybindings -bind-key g run-shell 'tmux-popup lazygit' -bind-key f run-shell 'tmux-popup nnn' -bind-key h run-shell 'tmux-popup htop' -bind-key t run-shell 'tmux-popup t' - # Vim keybindings for pane movement setw -g mode-keys vi bind-key h select-pane -L @@ -51,21 +46,38 @@ bind-key x kill-pane # Don't exit from tmux when closing a session set -g detach-on-destroy off -# Catppuccin settings -set -g @catppuccin_flavour 'frappe' -set -g @catppuccin_window_right_separator "█ " -set -g @catppuccin_window_number_position "right" -set -g @catppuccin_window_middle_separator " | " +# sesh for session management +bind-key "T" run-shell "sesh connect \"$( + sesh list --icons | fzf-tmux -p 55%,60% \ + --no-sort --ansi --border-label ' sesh ' --prompt '⚡ ' \ + --header ' ^a all ^t tmux ^g configs ^x zoxide ^d tmux kill ^f find' \ + --bind 'tab:down,btab:up' \ + --bind 'ctrl-a:change-prompt(⚡ )+reload(sesh list --icons)' \ + --bind 'ctrl-t:change-prompt(🪟 )+reload(sesh list -t --icons)' \ + --bind 'ctrl-g:change-prompt(⚙️ )+reload(sesh list -c --icons)' \ + --bind 'ctrl-x:change-prompt(📁 )+reload(sesh list -z --icons)' \ + --bind 'ctrl-f:change-prompt(🔎 )+reload(fd -H -d 2 -t d -E .Trash . ~)' \ + --bind 'ctrl-d:execute(tmux kill-session -t {2..})+change-prompt(⚡ )+reload(sesh list --icons)' \ +)\"" -set -g @catppuccin_window_default_fill "none" +bind-key "n" run-shell "sesh connect nnn" -set -g @catppuccin_window_current_fill "all" +# use sesh for last session +bind -N "last-session (via sesh) " L run-shell "sesh last" + +# Configure catppuccin +set -g @catppuccin_flavor 'frappe' +set -g @catppuccin_window_status_style 'basic' + +set -g status-left '' +set -g status-right '#{E:@catppuccin_status_session}' +set -ag status-right '#{E:@catppuccin_status_application}' +set -ag status-right '#{E:@catppuccin_status_date_time}' -set -g @catppuccin_status_modules_right "application session date_time" set -g @catppuccin_status_left_separator "█" set -g @catppuccin_status_right_separator "█" -set -g @catppuccin_date_time_text "%Y-%m-%d %H:%M" +set -g @catppuccin_date_time_text " %d-%m-%Y %H:%M " # Status bar border setw -g pane-border-status top diff --git a/.config/xmonad/xmonad.hs b/.config/xmonad/xmonad.hs index de7bdfc..b5df615 100644 --- a/.config/xmonad/xmonad.hs +++ b/.config/xmonad/xmonad.hs @@ -84,10 +84,11 @@ myStartupHook = do spawnOnce "sxhkd -c $HOME/.config/sxhkd/general" spawnOnce "syncthing" spawnOnce "picom" - -- spawnOnce "clipmenud" + spawnOnce "clipmenud" spawnOnce "dunst" spawnOnce "keepassxc" spawnOnce "lxpolkit" + spawnOnce "gotify-desktop" -- spawnOnce "nheko" -- spawnOnce "jellyfin-mpv-shim" spawn ("sleep 2 && trayer --edge top --align right --widthtype request --padding 6 --iconspacing 7 --SetDockType true --SetPartialStrut true --expand true --monitor 1 --transparent true --alpha 0 --tint 0x303446 --height 24 -l") @@ -172,12 +173,15 @@ myManageHook = composeAll , className =? "discord" --> doShiftAndGo ( myWorkspaces !! 4) , className =? "tutanota-desktop" --> doShiftAndGo ( myWorkspaces !! 4) , className =? "nheko" --> doShiftAndGo ( myWorkspaces !! 4) + , className =? "armcord" --> doShiftAndGo ( myWorkspaces !! 4) + , className =? "Element" --> doShiftAndGo ( myWorkspaces !! 4) , className =? "Lutris" --> doShiftAndGo ( myWorkspaces !! 5) , className =? "steam" --> doShiftAndGo ( myWorkspaces !! 5) , className =? "heroic" --> doShiftAndGo ( myWorkspaces !! 5) , className =? "cartridges" --> doShiftAndGo ( myWorkspaces !! 5) , className =? "Cemu" --> doShiftAndGo ( myWorkspaces !! 5) , className =? "xemu" --> doShiftAndGo ( myWorkspaces !! 5) + , className =? "PrismLauncher" --> doShiftAndGo ( myWorkspaces !! 5) , className =? "librewolf" --> doShiftAndGo ( myWorkspaces !! 8) , isDialog --> doCenterFloat <+> doF W.swapUp , className =? "Gimp" --> doFloat <+> doF W.swapUp diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv index 80291c4..5fd8824 100644 --- a/.config/zsh/.zshenv +++ b/.config/zsh/.zshenv @@ -18,6 +18,7 @@ export OPENER="xdg-open" export PAGER="less" export WM="xmonad" export SUDO_ASKPASS="dmenu-pass" +export SECOND_BRAIN="$HOME/docs/sb" # NNN settings export NNN_FIFO="/tmp/nnn.fifo" @@ -30,6 +31,9 @@ BLK="03" CHR="03" DIR="04" EXE="02" REG="07" HARDLINK="05" SYMLINK="05" MISSING= export NNN_COLORS="#04020301;4231" export NNN_FCOLORS="$BLK$CHR$DIR$EXE$REG$HARDLINK$SYMLINK$MISSING$ORPHAN$FIFO$SOCK$UNKNOWN" +# Catppuccin colors bemenu +export BEMENU_OPTS='--fb "#303446" --ff "#c6d0f5" --nb "#303446" --nf "#c6d0f5" --tb "#303446" --hb "#303446" --tf "#e78284" --hf "#e5c890" --af "#c6d0f5" --ab "#303446"' + # XDG CLEANUP export XDG_DATA_HOME="$HOME/.local/share" export XDG_CONFIG_HOME="$HOME/.config" @@ -54,3 +58,12 @@ export XCURSOR_PATH=/usr/share/icons:$XDG_DATA_HOME/icons export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc +# Clipmenu settings +export CM_MAX_CLIPS=20 +export CM_IGNORE_WINDOW="KeePassXC" +export CM_SELECTIONS="clipboard" +export CM_OWN_CLIPBOARD=1 +export CM_DIR="$HOME/.cache" + +# Use nvim for man pages +export MANPAGER='nvim +Man!' diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 780add0..c4a02a9 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -54,3 +54,10 @@ nnn_cd () } trap nnn_cd EXIT + +# Tmux autostart +if [ -x "$(command -v tmux)" ] && [ -n "${DISPLAY}" ] && [ -z "${TMUX}" ]; then + exec tmux new-session -A -s default >/dev/null 2>&1 +fi + +fastfetch diff --git a/.config/zsh/aliases.zsh b/.config/zsh/aliases.zsh index 6311f23..cd7efd4 100644 --- a/.config/zsh/aliases.zsh +++ b/.config/zsh/aliases.zsh @@ -41,3 +41,9 @@ alias ls="eza --icons=always --group-directories-first --git" alias la="ls -a" alias ll="ls -lg" alias lla="ll -a" + +# aria2c +alias dl="aria2c -x 16 -j 16" + +# todo.xtx +alias td='todo.sh' diff --git a/.config/zsh/functions.zsh b/.config/zsh/functions.zsh index 4f018e6..a348b76 100644 --- a/.config/zsh/functions.zsh +++ b/.config/zsh/functions.zsh @@ -20,8 +20,12 @@ mvln () { # Find my script and let me edit them se() { - fd . ~/bin -L --type f --color=never | fzf --prompt "Choose script to edit: " \ - --preview 'bat --color=always --style=plain --pager=never {}' | xargs -r $EDITOR + current=$(pwd) + file=$(fd . ~/bin -L --type f --color=never | fzf --prompt "Choose script to edit: " \ + --preview 'bat --color=always --style=plain --pager=never {}') + [ "$file" = "" ] && return + cd "$(dirname "$file")" && nvim "$(basename "$file")" + cd "$current" } # List my config and open the dir in a editor