From 0300e55167f1df80b6dddf946bb16a2c063b6d67 Mon Sep 17 00:00:00 2001 From: iceyrazor Date: Mon, 29 Dec 2025 02:42:08 -0600 Subject: [PATCH] Squashed commit of the following: - set icons for mon2 in i3 - exluded a blender render dir - two flash backup thingys - lfrc filebrowser dectetion and formatting - changed music dir for mpd - moved browser backup to its own script. log too big - added DIAGRAM_PLANTUML_CLASSPATH var for plantuml - added web reqs script - added asciidoc preview - fixed ft_to_lang error by disabling treesitter in telescope - copy media script --- env/.config/.profile | 3 ++ env/.config/i3/config | 51 +++++++++++------- env/.config/lf/lfrc | 54 ++++++++++--------- env/.config/mpd/mpd.conf | 2 +- .../nvim/after/plugin/asciidoc-preview.lua | 30 +++++++++++ env/.config/nvim/after/plugin/telescope.lua | 5 +- env/.config/nvim/lua/yourmom/packer.lua | 6 +++ env/.local/bin/scripts/backup/backup-flash | 4 +- .../bin/scripts/backup/backup-flash-priv | 21 ++++++++ .../{backup-to-serv.sh => backup-to-serv} | 0 env/.local/bin/scripts/backup/bbackup | 4 +- env/.local/bin/scripts/backup/bbackup-browser | 25 +++++++++ env/.local/bin/scripts/backup/copy-media | 25 +++++++++ runs-all/get-reqs-arch/web.sh | 2 + 14 files changed, 181 insertions(+), 51 deletions(-) create mode 100644 env/.config/nvim/after/plugin/asciidoc-preview.lua create mode 100755 env/.local/bin/scripts/backup/backup-flash-priv rename env/.local/bin/scripts/backup/{backup-to-serv.sh => backup-to-serv} (100%) create mode 100755 env/.local/bin/scripts/backup/bbackup-browser create mode 100755 env/.local/bin/scripts/backup/copy-media create mode 100755 runs-all/get-reqs-arch/web.sh diff --git a/env/.config/.profile b/env/.config/.profile index ad7f60f..f1e5989 100755 --- a/env/.config/.profile +++ b/env/.config/.profile @@ -34,6 +34,9 @@ if [ -f ~/.local/bin/system/paths.sh ]; then source ~/.local/bin/system/paths.sh fi +export DIAGRAM_PLANTUML_CLASSPATH=/usr/lib/ruby/gems/3.4.0/gems/asciidoctor-diagram-plantuml-1.2025.3/lib/asciidoctor-diagram/plantuml/plantuml-lgpl-1.2025.3.jar + + alias fukn="sudo $@" [ doas ] && alias fukn="doas $@" diff --git a/env/.config/i3/config b/env/.config/i3/config index 1e73d77..875c880 100644 --- a/env/.config/i3/config +++ b/env/.config/i3/config @@ -182,6 +182,17 @@ set $ws8 "8: " set $ws9 "9: " set $ws10 "10: " +set $ws11 "11: " +set $ws12 "12: " +set $ws13 "13: " +set $ws14 "14: " +set $ws15 "15: " +set $ws16 "16: " +set $ws17 "17: " +set $ws18 "18: " +set $ws19 "19: " +set $ws20 "20: " + bindsym $mod+n workspace next bindsym $mod+b workspace prev # switch to workspace @@ -209,26 +220,26 @@ bindsym $mod+Shift+9 move container to workspace number $ws9 bindsym $mod+Shift+0 move container to workspace number $ws10 mode "mon2" { - bindsym $mod+1 workspace number 11 - bindsym $mod+2 workspace number 12 - bindsym $mod+3 workspace number 13 - bindsym $mod+4 workspace number 14 - bindsym $mod+5 workspace number 15 - bindsym $mod+6 workspace number 16 - bindsym $mod+7 workspace number 17 - bindsym $mod+8 workspace number 18 - bindsym $mod+9 workspace number 19 - bindsym $mod+0 workspace number 20 - bindsym $mod+Shift+1 move container to workspace number 11 - bindsym $mod+Shift+2 move container to workspace number 12 - bindsym $mod+Shift+3 move container to workspace number 13 - bindsym $mod+Shift+4 move container to workspace number 14 - bindsym $mod+Shift+5 move container to workspace number 15 - bindsym $mod+Shift+6 move container to workspace number 16 - bindsym $mod+Shift+7 move container to workspace number 17 - bindsym $mod+Shift+8 move container to workspace number 18 - bindsym $mod+Shift+9 move container to workspace number 19 - bindsym $mod+Shift+0 move container to workspace number 20 + bindsym $mod+1 workspace number $ws11 + bindsym $mod+2 workspace number $ws12 + bindsym $mod+3 workspace number $ws13 + bindsym $mod+4 workspace number $ws14 + bindsym $mod+5 workspace number $ws15 + bindsym $mod+6 workspace number $ws16 + bindsym $mod+7 workspace number $ws17 + bindsym $mod+8 workspace number $ws18 + bindsym $mod+9 workspace number $ws19 + bindsym $mod+0 workspace number $ws20 + bindsym $mod+Shift+1 move container to workspace number $ws11 + bindsym $mod+Shift+2 move container to workspace number $ws12 + bindsym $mod+Shift+3 move container to workspace number $ws13 + bindsym $mod+Shift+4 move container to workspace number $ws14 + bindsym $mod+Shift+5 move container to workspace number $ws15 + bindsym $mod+Shift+6 move container to workspace number $ws16 + bindsym $mod+Shift+7 move container to workspace number $ws17 + bindsym $mod+Shift+8 move container to workspace number $ws18 + bindsym $mod+Shift+9 move container to workspace number $ws19 + bindsym $mod+Shift+0 move container to workspace number $ws20 bindsym $mod+o mode "default" } diff --git a/env/.config/lf/lfrc b/env/.config/lf/lfrc index d8d72f0..90a49fd 100755 --- a/env/.config/lf/lfrc +++ b/env/.config/lf/lfrc @@ -111,21 +111,21 @@ cmd zip ${{ }} cmd trash ${{ - files=$(printf "$fx" | tr '\n' ';') - while [ "$files" ]; do - file=${files%%;*} + files=$(printf "$fx" | tr '\n' ';') + while [ "$files" ]; do + file=${files%%;*} - mv "$(basename "$file")" ~/.trash - if [ "$files" = "$file" ]; then - files='' - else - files="${files#*;}" - fi - done + mv "$(basename "$file")" ~/.trash + if [ "$files" = "$file" ]; then + files='' + else + files="${files#*;}" + fi + done }} cmd vim ${{ - nvim $f + nvim $f }} cmd Sxiv ${{ @@ -136,19 +136,19 @@ cmd clipf ${{ # printf "$f" | xclip -selection clipboard # xclip -selection clipboard -t "$(file -b --mime-type $f)" -i $f # echo -n '$f' | xclip -sel clip -t text/uri-list -i -case "$(file -b --mime-type $f)" in -image/png|image/jpeg|image/gif) - xclip -selection clipboard -t image/png -i $f - ;; -video/mp4) - # !! doesnt work. no clue how todo uri-list. ICCCM section 2.6.2 is confusing - # echo -n '$f' | xclip -selection clipboard -t x-special/gnome-copied-files -i - xclip -selection clipboard -t text/uri-list -i $f - ;; -*) - xclip -selection clipboard -t "$(file -b --mime-type $f)" -i $f - ;; -esac + case "$(file -b --mime-type $f)" in + image/png|image/jpeg|image/gif) + xclip -selection clipboard -t image/png -i $f + ;; + video/mp4) + # !! doesnt work. no clue how todo uri-list. ICCCM section 2.6.2 is confusing + # echo -n '$f' | xclip -selection clipboard -t x-special/gnome-copied-files -i + xclip -selection clipboard -t text/uri-list -i $f + ;; + *) + xclip -selection clipboard -t "$(file -b --mime-type $f)" -i $f + ;; + esac }} cmd clip-path ${{ @@ -160,7 +160,11 @@ cmd clip-path ${{ }} cmd filebrowser ${{ - nohup pcmanfm $f > /dev/null 2> /dev/null < /dev/null & disown + if [ "$(file -b --mime-type "$f")" == "inode/directory" ]; then + nohup pcmanfm -- "$f" > /dev/null 2> /dev/null < /dev/null & disown + else + nohup pcmanfm -- "$(dirname -- $f)" > /dev/null 2> /dev/null < /dev/null & disown + fi }} map DD trash diff --git a/env/.config/mpd/mpd.conf b/env/.config/mpd/mpd.conf index 82e6708..bd14348 100644 --- a/env/.config/mpd/mpd.conf +++ b/env/.config/mpd/mpd.conf @@ -1,4 +1,4 @@ -music_directory "~/stuff/media/music/main" +music_directory "~/stuff/media/music" playlist_directory "$XDG_CONFIG_HOME/mpd/playlists" db_file "$XDG_CACHE_HOME/mpd/database" diff --git a/env/.config/nvim/after/plugin/asciidoc-preview.lua b/env/.config/nvim/after/plugin/asciidoc-preview.lua new file mode 100644 index 0000000..a80bd7f --- /dev/null +++ b/env/.config/nvim/after/plugin/asciidoc-preview.lua @@ -0,0 +1,30 @@ +local ok, asciidoc = pcall(require, 'asciidoc-preview') +if ok then + asciidoc.setup({ + server = { + -- Specifies how the AsciiDoc file is converted to HTML for the preview. + -- `js` - asciidoctor.js (no local installation needed) + -- `cmd` - asciidoctor command (local installation needed) + converter = 'cmd', + + -- Specifies the hostname or IP address of the preview website for the client. + -- This is only needed if you run neovim in a remote session and + -- want to access the preview website from another machine. + hostname = 'localhost', + + -- Specifies the port of the preview website on the client and server side. + -- Must be between 10000 and 65535. + port = 11235, + }, + preview = { + -- Specifies the scroll position of the preview website. + -- `current` - Keep current scroll position + -- `start` - Start of the website + -- `sync` - (experimental) Same (similar) position as in Neovim + -- => inaccurate, because very content dependent + position = 'current', + }, + }) + vim.keymap.set('n', 'max', ':AsciiDocPreview') + vim.keymap.set('n', 'mas', ':AsciiDocPreviewStop') +end diff --git a/env/.config/nvim/after/plugin/telescope.lua b/env/.config/nvim/after/plugin/telescope.lua index 9d4488f..fcf62b8 100755 --- a/env/.config/nvim/after/plugin/telescope.lua +++ b/env/.config/nvim/after/plugin/telescope.lua @@ -9,7 +9,10 @@ if ok then ["d"] = action.delete_buffer, ["q"] = action.close, } - } + }, + preview = { + treesitter = false, + }, }, pickers = { find_files = { diff --git a/env/.config/nvim/lua/yourmom/packer.lua b/env/.config/nvim/lua/yourmom/packer.lua index d6115f7..317471e 100755 --- a/env/.config/nvim/lua/yourmom/packer.lua +++ b/env/.config/nvim/lua/yourmom/packer.lua @@ -93,4 +93,10 @@ return require('packer').startup(function(use) -- requires = { 'echasnovski/mini.icons', opt = true }, -- if you use standalone mini plugins -- requires = { 'nvim-tree/nvim-web-devicons', opt = true }, -- if you prefer nvim-web-devicons }) + + + use({ + 'tigion/nvim-asciidoc-preview', + run = 'cd server && npm install --omit=dev', + }) end) diff --git a/env/.local/bin/scripts/backup/backup-flash b/env/.local/bin/scripts/backup/backup-flash index 732d191..bd2e140 100755 --- a/env/.local/bin/scripts/backup/backup-flash +++ b/env/.local/bin/scripts/backup/backup-flash @@ -1,4 +1,4 @@ -cd ~/stuff/scripts +cd ~ fsync () { # t? @@ -12,7 +12,7 @@ fsync () { fi } -syncfile="LINUX-SERVER1 sites" +syncfile="stuff/notes" #sync game stuff target="/home/iceyrazor/u" diff --git a/env/.local/bin/scripts/backup/backup-flash-priv b/env/.local/bin/scripts/backup/backup-flash-priv new file mode 100755 index 0000000..732d191 --- /dev/null +++ b/env/.local/bin/scripts/backup/backup-flash-priv @@ -0,0 +1,21 @@ +cd ~/stuff/scripts + +fsync () { + # t? + rsync -RUuavn --delete-after $exclude $syncfile "$target" + printf "===commit these changes?\n" + read - "y/n: " uinput + if [ "$uinput" != "n" ] && [ "$uinput" != "N" ]; then + printf "\n\n\n" + rsync -RUuav --progress --delete-after $exclude $syncfile "$target" + printf "\n===end sync\n---------\n\n" + fi +} + +syncfile="LINUX-SERVER1 sites" + +#sync game stuff +target="/home/iceyrazor/u" +exclude="" + +fsync diff --git a/env/.local/bin/scripts/backup/backup-to-serv.sh b/env/.local/bin/scripts/backup/backup-to-serv similarity index 100% rename from env/.local/bin/scripts/backup/backup-to-serv.sh rename to env/.local/bin/scripts/backup/backup-to-serv diff --git a/env/.local/bin/scripts/backup/bbackup b/env/.local/bin/scripts/backup/bbackup index 7e60525..5bfb717 100755 --- a/env/.local/bin/scripts/backup/bbackup +++ b/env/.local/bin/scripts/backup/bbackup @@ -15,10 +15,10 @@ fsyncb () { fi } -syncfile="stuff .surf/styles .config/eDEX-UI/ .gnupg .ssh .local/bin/lf-gadgets .config/FreeTube .config/wlxoverlay .config/newsboat .config/zsh .config/vesktop/themes .keepass .config/Pinta .config/cava .config/gajim/theme .local/share/applications/custom .local/share/osu .librewolf" +syncfile="stuff .surf/styles .config/eDEX-UI/ .gnupg .ssh .local/bin/lf-gadgets .config/FreeTube .config/wlxoverlay .config/newsboat .config/zsh .config/vesktop/themes .keepass .config/Pinta .config/cava .config/gajim/theme .local/share/applications/custom .local/share/osu" target="/home/iceyrazor/mnt-backups/LINUX FILES/home/iceyrazor" -exclude="--exclude node_modules --exclude node_modules_23 --exclude **/target --exclude LinVAM/pyenv --exclude stuff/custom-linux/LFN --exclude stuff/custom-linux/LFN-borked-lol --exclude stuff/.private-parent/.private/minecraft" +exclude="--exclude node_modules --exclude node_modules_23 --exclude **/target --exclude LinVAM/pyenv --exclude stuff/custom-linux/LFN --exclude stuff/custom-linux/LFN-borked-lol --exclude stuff/.private-parent/.private/minecraft --exclude /home/iceyrazor/stuff/projects/blender-projects/anim-pose/image-sequence" fsynca diff --git a/env/.local/bin/scripts/backup/bbackup-browser b/env/.local/bin/scripts/backup/bbackup-browser new file mode 100755 index 0000000..b620656 --- /dev/null +++ b/env/.local/bin/scripts/backup/bbackup-browser @@ -0,0 +1,25 @@ +cd ~/ + +fsynca () { + # t? + rsync -RUuavn --delete-after $exclude $syncfile "$target" +} + +fsyncb () { + printf "===confirm changes?\n" + read -p "y/n: " uinput + if [ "$uinput" != "n" ] && [ "$uinput" != "N" ]; then + printf "\n\n\n" + rsync -RUuav --progress --delete-after $exclude $syncfile "$target" + printf "\n===end sync\n---------\n\n" + fi +} + +syncfile=".librewolf" + +target="/home/iceyrazor/mnt-backups/LINUX FILES/home/iceyrazor" +exclude="" + +fsynca + +fsyncb diff --git a/env/.local/bin/scripts/backup/copy-media b/env/.local/bin/scripts/backup/copy-media new file mode 100755 index 0000000..5e7efe7 --- /dev/null +++ b/env/.local/bin/scripts/backup/copy-media @@ -0,0 +1,25 @@ +cd ~/stuff/media/music/ + +fsynca () { + # t? + rsync -RUuavn --delete-after $exclude $syncfile "$target" +} + +fsyncb () { + printf "===confirm changes?\n" + read -p "y/n: " uinput + if [ "$uinput" != "n" ] && [ "$uinput" != "N" ]; then + printf "\n\n\n" + rsync -RUuav --progress --delete-after $exclude $syncfile "$target" + printf "\n===end sync\n---------\n\n" + fi +} + +syncfile="./*" + +target="serv:servers/local_html/ice" +exclude="" + +fsynca + +fsyncb diff --git a/runs-all/get-reqs-arch/web.sh b/runs-all/get-reqs-arch/web.sh new file mode 100755 index 0000000..bd392fa --- /dev/null +++ b/runs-all/get-reqs-arch/web.sh @@ -0,0 +1,2 @@ +$sudo pacman -S --noconfirm asciidoc asciidoctor +$aurm -S --noconfirm ruby-asciidoctor-diagram ruby-asciidoctor-diagram-plantuml