diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index f3c289a..d7d2418 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -46,6 +46,6 @@ SETUVAR fish_pager_color_selected_background:\x1d SETUVAR fish_pager_color_selected_completion:\x1d SETUVAR fish_pager_color_selected_description:\x1d SETUVAR fish_pager_color_selected_prefix:\x1d -SETUVAR fish_user_paths:/home/q/bin +SETUVAR fish_user_paths:/home/q/bin\x1e/home/q/\x2elocal/bin SETUVAR nvm_data:/home/q/\x2elocal/share/nvm SETUVAR nvm_mirror:https\x3a//nodejs\x2eorg/dist diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini index 35976e1..51262f4 100644 --- a/.config/foot/foot.ini +++ b/.config/foot/foot.ini @@ -21,7 +21,6 @@ font=JetBrainsMono Nerd Font Mono:size=9 # underline-offset= # box-drawings-uses-font-glyphs=no # dpi-aware=auto - # initial-window-size-pixels=700x500 # Or, # initial-window-size-chars= # initial-window-mode=windowed diff --git a/.config/gtk-3.0/bookmarks b/.config/gtk-3.0/bookmarks index 4f2507c..130bcdc 100644 --- a/.config/gtk-3.0/bookmarks +++ b/.config/gtk-3.0/bookmarks @@ -3,3 +3,4 @@ file:///home/q/Music Music file:///home/q/Pictures/screenshots screenshots file:///home/q/Documents file:///home/q/Documents/ +file:///home/q/Music/ diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index facdee3..ae8c83c 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -1,7 +1,7 @@ [Settings] gtk-application-prefer-dark-theme=true gtk-button-images=1 -gtk-cursor-theme-name=breeze_cursors +gtk-cursor-theme-name=Nordzy-cursors-white gtk-cursor-theme-size=24 gtk-decoration-layout=icon:minimize,maximize,close gtk-enable-animations=true diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf deleted file mode 100644 index 5677e22..0000000 --- a/.config/hypr/hyprpaper.conf +++ /dev/null @@ -1,6 +0,0 @@ -preload = /home/q/Pictures/wallpapers/nord/wallhaven-4glwwl_1920x1080.png - -wallpaper = ,/home/q/Pictures/wallpapers/nord/wallhaven-4glwwl_1920x1080.png - -#preload = /home/q/Pictures/wallpapers/catppuccin/tetris.png -#wallpaper = ,/home/q/Pictures/wallpapers/catppuccin/tetris.png diff --git a/.config/lf/lfrc b/.config/lf/lfrc index eb604e9..54ebf95 100644 --- a/.config/lf/lfrc +++ b/.config/lf/lfrc @@ -1,8 +1,7 @@ +set drawbox set icons true set ignorecase true -set drawbox - # interpreter for shell commands set shell sh set shellopts '-eu' @@ -12,96 +11,73 @@ set cleaner ctpvclear &ctpv -s $id &ctpvquit $id -cmd mkfile ${{ - printf "File Name: " - read ans - $EDITOR $ans -}} - cmd edit-config ${{ - $EDITOR ~/.config/lf/lfrc - lf -remote "send $id source ~/.config/lf/lfrc" + $EDITOR ~/.config/lf/lfrc + lf -remote "send $id source ~/.config/lf/lfrc" }} -cmd paste &{{ - set -- $(cat ~/.local/share/lf/files) - mode="$1" - shift - case "$mode" in - copy) - rsync -av --ignore-existing --progress -- "$@" . | - stdbuf -i0 -o0 -e0 tr '\r' '\n' | - while IFS= read -r line; do - lf -remote "send $id echo $line" - done - ;; - move) mv -n -- "$@" .;; - esac - rm ~/.local/share/lf/files - lf -remote "send clear" +cmd open &{{ + case $(file --mime-type "$f" -bL) in + text/*|application/json) lf -remote "send $id \$$EDITOR \$fx";; + image/*) swayimg -f "$f";; + audio/*) lf -remote "send $id \$mpv --audio-display=no \"$fx\" && clear";; + video/*) mpv "$f";; + application/pdf|application/epub) zathura "$f";; + esac }} cmd setwallpaper %swww img "$f" --transition-type right --transition-fps 60 cmd fzf_jump ${{ - res="$(find . | fzf --reverse --header='Jump to location' | sed 's/\\/\\\\/g;s/"/\\"/g')" - if [ -d "$res" ] ; then - cmd="cd" - elif [ -f "$res" ] ; then - cmd="select" - else - exit 0 - fi - lf -remote "send $id $cmd \"$res\"" + res="$(find . | fzf --reverse --header='Jump to location' | sed 's/\\/\\\\/g;s/"/\\"/g')" + if [ -d "$res" ] ; then + cmd="cd" + elif [ -f "$res" ] ; then + cmd="select" + else + exit 0 + fi + lf -remote "send $id $cmd \"$res\"" }} cmd fzf_search ${{ - res="$( \ - RG_PREFIX="rg --column --line-number --no-heading --color=always \ - --smart-case " - FZF_DEFAULT_COMMAND="$RG_PREFIX ''" \ - fzf --bind "change:reload:$RG_PREFIX {q} || true" \ - --ansi --layout=reverse --header 'Search in files' \ - | cut -d':' -f1 - )" - [ ! -z "$res" ] && lf -remote "send $id select \"$res\"" -}} - -cmd open &{{ - case "$f" in - *.pdf|*.epub) $(zathura "$f");; - *.avi|*.mp4|*.wmv|*.dat|*.3gp|*.ogv|*.mkv|*.mpg|*.mpeg|*.vob|*.fl[icv]|*.m2v|*.mov|*.webm|*.ts|*.mts|*.m4v|*.r[am]|*.qt|*.divx) $(mpv "$f");; - *.bmp|*.jpg|*.jpeg|*.png|*.xpm|*.webp|*.tiff|*.gif|*.jfif|*.ico) $(imv "$f") ;; - *) lf -remote "send $id \$$EDITOR \$fx";; - esac + res="$( \ + RG_PREFIX="rg --column --line-number --no-heading --color=always \ + --smart-case " + FZF_DEFAULT_COMMAND="$RG_PREFIX ''" \ + fzf --bind "change:reload:$RG_PREFIX {q} || true" \ + --ansi --layout=reverse --header 'Search in files' \ + | cut -d':' -f1 + )" + [ ! -z "$res" ] && lf -remote "send $id select \"$res\"" }} cmd unarchive ${{ - set -f - case $f in - *.tar.bz|*.tar.bz2|*.tbz|*.tbz2) tar xjvf $f;; - *.tar.gz|*.tgz) tar xzvf $f;; - *.tar.xz|*.txz) tar xJvf $f;; - *.zip) unzip $f;; - *.rar) unrar x $f;; - *.7z) 7z x $f;; - esac + set -f + case $f in + *.tar.bz|*.tar.bz2|*.tbz|*.tbz2) tar xjvf $f;; + *.tar.gz|*.tgz) tar xzvf $f;; + *.tar.xz|*.txz) tar xJvf $f;; + *.zip) unzip $f;; + *.rar) unrar x $f;; + *.7z) 7z x $f;; + esac }} cmd tar ${{ - set -f - mkdir $1 - cp -r $fx $1 - tar czf $1.tar.gz $1 - rm -rf $1 + set -f + mkdir $1 + cp -r $fx $1 + tar czf $1.tar.gz $1 + rm -rf $1 }} cmd zip ${{ - set -f - mkdir $1 - cp -r $fx $1 - zip -r $1.zip $1 - rm -rf $1 + set -f + mkdir $1 + cp -r $fx $1 + zip -r $1.zip $1 + rm -rf $1 }} @@ -110,8 +86,13 @@ cmd trash ${{ files=$(printf "$fx" | tr '\n' ';') while [ "$files" ]; do file=${files%%;*} + + if [[ "$(pwd)" == "/home/$USER/.local/share/Trash/files" ]]; then + rm -rf $file + else + trash-put "$(basename "$file")" + fi - trash-put "$(basename "$file")" if [ "$files" = "$file" ]; then files='' else @@ -120,36 +101,49 @@ cmd trash ${{ done }} -cmd restore_trash ${{ - trash-restore +# lfrc +cmd restore-from-trash ${{ + ids="$(echo -ne '\n' | \ + trash-restore | \ + awk '$1 ~ /^[0-9]+/ {print $0}' | \ + fzf --multi | \ + awk '{print $1}' | \ + sed -z 's/\n/,/g;s/,$/\n/')" + echo $ids | trash-restore + clear }} +map m +map o +map n +map "'" +map '"' +map d +map e +map f +map t + map . set hidden! -# move current file or selected files to trash folder -# (also see 'man mv' for backup/overwrite options) -cmd trash %set -f; mv $fx ~/.trash - -# make sure trash folder exists -%mkdir -p ~/.trash - -map dd trash -map dr restore_trash +map md push %mkdir map y copy map p paste map x cut +map open + map f :fzf_jump map gf :fzf_search -map open +map C edit-config +map bg setwallpaper + +map dd trash +map dr restore-from-trash map R reload -map bg setwallpaper -map C edit-config - map gh cd ~ map gd cd ~/Downloads map gD cd ~/Documents @@ -157,6 +151,8 @@ map gD cd ~/Documents map gc cd ~/.config map gr cd ~/repos +map gC cd ~/code + map gp cd ~/Pictures map gw cd ~/Pictures/wallpapers map gs cd ~/Pictures/screenshots @@ -165,4 +161,4 @@ map gv cd ~/Videos map gm cd ~/Music map gt cd ~/.local/share/Trash/files -map tC rm -rf ~/.local/share/Trash/files/* +map tc %rm -rf ~/.local/share/Trash/files/* diff --git a/Pictures/Nextcloud_Pictures/2023-13_14-18.png b/Pictures/Nextcloud_Pictures/2023-13_14-18.png new file mode 100644 index 0000000..1316375 Binary files /dev/null and b/Pictures/Nextcloud_Pictures/2023-13_14-18.png differ diff --git a/Pictures/Nextcloud_Pictures/2023-13_14-24.png b/Pictures/Nextcloud_Pictures/2023-13_14-24.png new file mode 100644 index 0000000..ba0b1e7 Binary files /dev/null and b/Pictures/Nextcloud_Pictures/2023-13_14-24.png differ diff --git a/Pictures/Nextcloud_Pictures/2023-13_14-26.png b/Pictures/Nextcloud_Pictures/2023-13_14-26.png new file mode 100644 index 0000000..f4461aa Binary files /dev/null and b/Pictures/Nextcloud_Pictures/2023-13_14-26.png differ diff --git a/Pictures/Nextcloud_Pictures/2023-13_14-28.png b/Pictures/Nextcloud_Pictures/2023-13_14-28.png new file mode 100644 index 0000000..ee20589 Binary files /dev/null and b/Pictures/Nextcloud_Pictures/2023-13_14-28.png differ diff --git a/Pictures/Nextcloud_Pictures/2023-13_22-59.png b/Pictures/Nextcloud_Pictures/2023-13_22-59.png new file mode 100644 index 0000000..c6b4346 Binary files /dev/null and b/Pictures/Nextcloud_Pictures/2023-13_22-59.png differ diff --git a/Pictures/Nextcloud_Pictures/2023-13_23-00.png b/Pictures/Nextcloud_Pictures/2023-13_23-00.png new file mode 100644 index 0000000..0b654e9 Binary files /dev/null and b/Pictures/Nextcloud_Pictures/2023-13_23-00.png differ diff --git a/Pictures/wallpapers/gruvbox/862301.jpg b/Pictures/wallpapers/gruvbox/862301.jpg new file mode 100644 index 0000000..d53e400 Binary files /dev/null and b/Pictures/wallpapers/gruvbox/862301.jpg differ diff --git a/Pictures/wallpapers/gruvbox/cropped-1920-1080-851016.jpg b/Pictures/wallpapers/gruvbox/cropped-1920-1080-851016.jpg new file mode 100644 index 0000000..cd2c179 Binary files /dev/null and b/Pictures/wallpapers/gruvbox/cropped-1920-1080-851016.jpg differ diff --git a/Pictures/wallpapers/wallhaven-r2mp6j_1920x1080.png b/Pictures/wallpapers/nature/wallhaven-r2mp6j_1920x1080.png similarity index 100% rename from Pictures/wallpapers/wallhaven-r2mp6j_1920x1080.png rename to Pictures/wallpapers/nature/wallhaven-r2mp6j_1920x1080.png diff --git a/Pictures/wallpapers/nord/850990.png b/Pictures/wallpapers/nord/850990.png new file mode 100644 index 0000000..47abbab Binary files /dev/null and b/Pictures/wallpapers/nord/850990.png differ diff --git a/Pictures/wallpapers/nord/851006.png b/Pictures/wallpapers/nord/851006.png new file mode 100644 index 0000000..985516a Binary files /dev/null and b/Pictures/wallpapers/nord/851006.png differ diff --git a/Pictures/wallpapers/nord/cropped-1920-1080-977159.png b/Pictures/wallpapers/nord/cropped-1920-1080-977159.png new file mode 100644 index 0000000..e7c7c03 Binary files /dev/null and b/Pictures/wallpapers/nord/cropped-1920-1080-977159.png differ diff --git a/Pictures/wallpapers/nord/wallhaven-zxwvlj_1920x1080.png b/Pictures/wallpapers/nord/wallhaven-zxwvlj_1920x1080.png deleted file mode 100644 index 29594bf..0000000 Binary files a/Pictures/wallpapers/nord/wallhaven-zxwvlj_1920x1080.png and /dev/null differ diff --git a/Pictures/wallpapers/wallhaven-13gqx9_1920x1080.png b/Pictures/wallpapers/wallhaven-13gqx9_1920x1080.png deleted file mode 100644 index 71f2177..0000000 Binary files a/Pictures/wallpapers/wallhaven-13gqx9_1920x1080.png and /dev/null differ diff --git a/Pictures/wallpapers/wallhaven-42xjrm_1920x1080 (1).png b/Pictures/wallpapers/wallhaven-42xjrm_1920x1080 (1).png new file mode 100644 index 0000000..def12b7 Binary files /dev/null and b/Pictures/wallpapers/wallhaven-42xjrm_1920x1080 (1).png differ diff --git a/Pictures/wallpapers/wallhaven-4ow217_1920x1080.png b/Pictures/wallpapers/wallhaven-4ow217_1920x1080.png new file mode 100644 index 0000000..35fe365 Binary files /dev/null and b/Pictures/wallpapers/wallhaven-4ow217_1920x1080.png differ diff --git a/Pictures/wallpapers/wallhaven-5we3l7_1920x1080.png b/Pictures/wallpapers/wallhaven-5we3l7_1920x1080.png deleted file mode 100644 index 4c8daf0..0000000 Binary files a/Pictures/wallpapers/wallhaven-5we3l7_1920x1080.png and /dev/null differ diff --git a/Pictures/wallpapers/wallhaven-6o3qx7_1920x1080.png b/Pictures/wallpapers/wallhaven-6o3qx7_1920x1080.png deleted file mode 100644 index bce9b5f..0000000 Binary files a/Pictures/wallpapers/wallhaven-6o3qx7_1920x1080.png and /dev/null differ diff --git a/Pictures/wallpapers/wallhaven-zxyqyv_1920x1080.png b/Pictures/wallpapers/wallhaven-zxyqyv_1920x1080.png new file mode 100644 index 0000000..732e683 Binary files /dev/null and b/Pictures/wallpapers/wallhaven-zxyqyv_1920x1080.png differ diff --git a/bin/battery b/bin/battery deleted file mode 100755 index 514d671..0000000 --- a/bin/battery +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -for pid in $(pidof -x battery); do - if [ "$pid" != $$ ]; then - kill -9 "$pid" - fi -done - -notify_icons="/home/q/.config/dunst/icons" - -# notify when below this percentage -warning_level=50 - -# how often to check battery status, in seconds -check_interval=300 - -while true; do - path_to_battery=$(upower -e | grep BAT) - battery_level=$(upower -i "$path_to_battery" | grep -E "percentage" | sed 's/[^0-9]//g') - discharging=$(upower -i "$path_to_battery" | grep -E "state" | grep -c "discharging") - time_to_empty=$(upower -i "$path_to_battery" | grep -E "time to empty" | sed 's/[^0-9,.]//g') - - # check if battery is low and discharging - if [ "$battery_level" -lt "$warning_level" ] && [ "$discharging" -eq 1 ] - then - dunstify -a "Battery" \ - "Low battery: ${battery_level}%" \ - "Battery is low ($time_to_empty minuts left)" \ - -r 100 \ - -i "$notify_icons/battery-low.png" - mpv "/home/q/.config/alarm/low-battery-sound.mp3" - fi - - sleep ${check_interval}s -done diff --git a/bin/ewrap b/bin/ewrap deleted file mode 100755 index f0de43d..0000000 --- a/bin/ewrap +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env sh -if [ -n "$TMUX" ] ; then - tmux split-window -h "nvim \"$*\"" -else - kitty -e "nvim \"$*\"" -fi diff --git a/bin/newpyproject b/bin/newpyproject deleted file mode 100755 index 857b381..0000000 --- a/bin/newpyproject +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -if [ $# -lt 1 ];then - echo "Failed get arguments" - echo "./newpyproject [project name]" - exit -fi - -mkdir $1 -cd $1 -git init -poetry init -cp ~/.config/pyright/pyrightconfig.json . -venv_path=$(poetry env info -p) -echo -e $(jq -r --arg path "$venv_path" '.venvPath |= $path' pyrightconfig.json) > pyrightconfig.json diff --git a/bin/notetaker b/bin/notetaker deleted file mode 100755 index 8ed0cbe..0000000 --- a/bin/notetaker +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -noteFileName="$HOME/notes/note-$(date +%Y-%m-%d).md" - -if [ ! -f $noteFileName ];then - echo "Notes for $(date +%Y-%m-%d)" > $noteFileName -fi - -nvim -c "norm Go" \ - -c "norm Go## $(date +'%I:%m %p')" \ - -c "norm G2o" \ - -c "norm zz" \ - -c "startinsert" $noteFileName