diff --git a/.config/fish/conf.d/env.fish b/.config/fish/conf.d/env.fish index b5c4c24..7c8569c 100644 --- a/.config/fish/conf.d/env.fish +++ b/.config/fish/conf.d/env.fish @@ -1,20 +1,21 @@ -set -gx XDG_CONFIG_HOME ~/.config -set -gx XDG_CACHE_HOME ~/.cache -set -gx XDG_STATE_HOME ~/.local/state -set -gx XDG_DATA_HOME ~/.local/share +set -gx XDG_CONFIG_HOME ~/.config +set -gx XDG_CACHE_HOME ~/.cache +set -gx XDG_STATE_HOME ~/.local/state +set -gx XDG_DATA_HOME ~/.local/share -set -gx XDG_MUSIC_DIR ~/music -set -gx XDG_VIDEOS_DIR ~/vid -set -gx XDG_PICTURES_DIR ~/pic -set -gx XDG_DOCUMENTS_DIR ~/doc +set -gx XDG_MUSIC_DIR ~/music +set -gx XDG_VIDEOS_DIR ~/vid +set -gx XDG_PICTURES_DIR ~/pic +set -gx XDG_DOCUMENTS_DIR ~/doc -set -gx XDG_DESKTOP_DIR /tmp -set -gx XDG_DOWNLOAD_DIR /tmp +set -gx XDG_DESKTOP_DIR /tmp +set -gx XDG_DOWNLOAD_DIR /tmp # set -gx XDG_TEMPLATES_DIR "$HOME/" # set -gx XDG_PUBLICSHARE_DIR "$HOME/" set -gx GOPATH $XDG_DATA_HOME/go # GOOUT my home set -gx CARGO_HOME $XDG_DATA_HOME/cargo +set -gx CLIPPY_CONF_DIR $XDG_DATA_HOME/cargo/ # Can't use '~' in universal variables set -gx fish_user_paths ~/.local/bin $CARGO_HOME/bin @@ -29,7 +30,6 @@ set -gx BROWSER librewolf # for fish documentation mainly set -gx SCREENSHOT_DIR $XDG_PICTURES_DIR/screen set -gx SCREENRECORD_DIR $XDG_VIDEOS_DIR/screen - # Find an editor for e in helix nvim vim vi nano type -q $e; or continue @@ -38,7 +38,6 @@ for e in helix nvim vim vi nano end type -q nvim; and set -gx MANPAGER nvim +Man! - test -S ~/.bitwarden-ssh-agent.sock and set -gx SSH_AUTH_SOCK ~/.bitwarden-ssh-agent.sock diff --git a/.config/fish/conf.d/source.fish b/.config/fish/conf.d/source.fish index 2e9cc17..0e6a92a 100644 --- a/.config/fish/conf.d/source.fish +++ b/.config/fish/conf.d/source.fish @@ -1 +1,2 @@ -zoxide init fish | source +command -q zoxide; and command zoxide init fish | source +command -q direnv; and command direnv hook fish | source diff --git a/.config/fish/functions/remux.fish b/.config/fish/functions/remux.fish index 35874be..452ba60 100644 --- a/.config/fish/functions/remux.fish +++ b/.config/fish/functions/remux.fish @@ -5,7 +5,7 @@ function remux --wraps=ffmpeg --description 'remux to mp4' if string match -qr '^(https?://|youtu\.?be|[a-zA-Z0-9]{11}$)' $argv[1] set argv[1] (yt-dlp -q --force-overwrites --print after_move:filepath \ -f 'bestvideo[height<=?1080][vcodec!=?av01]+bestaudio/best' \ - -o "/tmp/remux/download.%(ext)s" $argv[1]) + -o '/tmp/remux/download.%(ext)s' $argv[1]) or return end diff --git a/.config/fish/functions/tree.fish b/.config/fish/functions/tree.fish index 375ee0e..a2375a1 100644 --- a/.config/fish/functions/tree.fish +++ b/.config/fish/functions/tree.fish @@ -1,3 +1,13 @@ -function tree - command tree -C --dirsfirst $argv +if command -q eza + function tree --wraps='eza' + command eza -T --group-directories-last $argv + end +else if command -q tree + function tree + command tree -C --filesfirst $argv + end +else + function tree + ls -l --group-directories-first + end end diff --git a/.config/helix/config.toml b/.config/helix/config.toml index d74a679..446be6e 100644 --- a/.config/helix/config.toml +++ b/.config/helix/config.toml @@ -111,7 +111,7 @@ A-b = "move_parent_node_start" ";" = ["collapse_selection", "normal_mode"] # a = ["collapse_selection", "append_mode"] -x = "extend_line" +X = "extend_line_up" V = ["extend_to_line_bounds", "trim_selections"] D = ["ensure_selections_forward", "extend_to_line_end"] @@ -139,7 +139,7 @@ C-l = "jump_view_right" "A-=" = "format_selections" # a = ["collapse_selection", "append_mode"] -x = "extend_line" +X = "extend_line_up" V = ["extend_to_line_bounds", "trim_selections"] D = ["ensure_selections_forward", "extend_to_line_end"] diff --git a/.config/helix/languages.toml b/.config/helix/languages.toml index 9637882..44a659f 100644 --- a/.config/helix/languages.toml +++ b/.config/helix/languages.toml @@ -2,6 +2,9 @@ name = "lua" auto-format = false +[[language]] +name = "tsx" +auto-format = true [[language]] name = "markdown" diff --git a/.config/htop/htoprc b/.config/htop/htoprc index 48a76ac..c126c4e 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -8,7 +8,7 @@ hide_userland_threads=1 hide_running_in_container=1 shadow_other_users=0 show_thread_names=0 -show_program_path=1 +show_program_path=0 highlight_base_name=1 highlight_deleted_exe=1 shadow_distribution_path_prefix=1 @@ -40,14 +40,14 @@ column_meter_modes_0=1 1 column_meters_1=DateTime Uptime LoadAverage Tasks Battery DiskIO NetworkIO Memory Swap column_meter_modes_1=2 2 2 2 2 2 2 1 1 tree_view=0 -sort_key=47 +sort_key=46 tree_sort_key=0 sort_direction=-1 tree_sort_direction=-1 tree_view_always_by_pid=0 all_branches_collapsed=0 screen:Main=PID USER PRIORITY NICE M_VIRT M_SHARE M_RESIDENT STATE NLWP PROCESSOR PERCENT_CPU PERCENT_MEM TIME Command -.sort_key=PERCENT_MEM +.sort_key=PERCENT_CPU .tree_sort_key=PID .tree_view_always_by_pid=0 .tree_view=0 diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index 5bcd26c..bb4fd6f 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -115,9 +115,9 @@ bind = SHIFT, Print, exec, grim -o $(hyprctl activeworkspace | grep -Po '(?<=\d\ bind = SHIFT CTRL, Print, exec, sleep 3; grim -o $(hyprctl monitors | grep -Po '(?<=Monitor ).*?(?= \(ID \d*\):)') -t png -l 6 - | wl-copy -t image/png # instant region saved -# bind = $mod, Print, exec, grim -g "$($slurp_cmd 00ff00 && sleep 0.1)" -t png -l 6 - | tee $SCREENSHOT_DIR/$(date +'%-d.%m.%y-%H:%M:%S').png | wl-copy -t image/png +bind = $mod, Print, exec, grim -g "$($slurp_cmd 00ff00 && sleep 0.1)" -t png -l 6 - | tee $SCREENSHOT_DIR/$(date +'%-d.%m.%y-%H:%M:%S').png | wl-copy -t image/png # instant fullscreen saved -bind = $mod, Print, exec, grim -o $(hyprctl activeworkspace | grep -Po '(?<=\d\) on monitor ).*?(?=:)') -t png -l 6 - | tee $SCREENSHOT_DIR/$(date +'%-d.%m.%y-%H:%M:%S').png | wl-copy -t image/png +# bind = $mod, Print, exec, grim -o $(hyprctl activeworkspace | grep -Po '(?<=\d\) on monitor ).*?(?=:)') -t png -l 6 - | tee $SCREENSHOT_DIR/$(date +'%-d.%m.%y-%H:%M:%S').png | wl-copy -t image/png #TODO learn sed to screenshot active window # bind = ALT, Print, exec, hyprpicker -rz &!; slurp; grim -g "$($slurp_cmd ffffff && sleep 0.1)" -t png -l 6 - | wl-copy -t image/png; kill $! diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf index c94fd19..283521c 100644 --- a/.config/hypr/hyprpaper.conf +++ b/.config/hypr/hyprpaper.conf @@ -1,4 +1,4 @@ ipc = off # battery! splash = false -preload = ~/.walls/wall3 -wallpaper =, ~/.walls/wall3 +preload = ~/.walls/wall4 +wallpaper =, ~/.walls/wall4 diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index db866e5..66abe2d 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -2,9 +2,7 @@ "name": "main", "layer": "top", "position": "bottom", - // "output": [ - // "DP-6" - // ], + // "output": [ "DP-6" ], "height": 24, //"width": 1280, "modules-left": [ @@ -39,6 +37,7 @@ "ipc": false, //"include": ["~/.config/waybar/modules.jsonc"] "hyprland/workspaces": { + // "all-outputs": true, "all-outputs": false, "show-special": true, "format": "{icon}", diff --git a/.gitignore b/.gitignore index afd7612..660e7de 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,8 @@ !/.local/share/cargo/ /.local/share/cargo/* !/.local/share/cargo/config.toml +!/.local/share/cargo/binstall.toml +# !/.local/share/cargo/clippy.toml !/.config/ /.config/* diff --git a/.local/share/cargo/binstall.toml b/.local/share/cargo/binstall.toml new file mode 100644 index 0000000..b32015e --- /dev/null +++ b/.local/share/cargo/binstall.toml @@ -0,0 +1,8 @@ +confirm = true +track_installs = true +continue_on_failure = false +strategies = [] + +[telemetry] +enabled = false +consent_asked = true diff --git a/.local/share/cargo/clippy.toml b/.local/share/cargo/clippy.toml new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/.local/share/cargo/clippy.toml @@ -0,0 +1 @@ +