diff --git a/.chezmoiignore b/.chezmoiignore old mode 100644 new mode 100755 index fe01b30..93702db --- a/.chezmoiignore +++ b/.chezmoiignore @@ -1,10 +1,9 @@ README.md -{{ if eq .chezmoi.username "root" }} +{{ if or (eq .chezmoi.username "root") (not (eq .chezmoi.osRelease.id "arch")) }} .config/i3/ .config/i3blocks/ .config/mpv/ -.config/neofetch/ .config/zathura/ scripts/ txt/ diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/dot_Xmodmap.tmpl b/dot_Xmodmap.tmpl old mode 100644 new mode 100755 diff --git a/dot_Xresources.tmpl b/dot_Xresources.tmpl old mode 100644 new mode 100755 diff --git a/dot_bashrc b/dot_bashrc old mode 100644 new mode 100755 diff --git a/dot_config/chezmoi/chezmoi-template.toml.tmpl b/dot_config/chezmoi/chezmoi-template.toml.tmpl old mode 100644 new mode 100755 diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl old mode 100644 new mode 100755 index ccc11ca..cddbfe8 --- a/dot_config/i3/config.tmpl +++ b/dot_config/i3/config.tmpl @@ -69,12 +69,12 @@ bindsym control+Mod4+w exec urxvt -e nvim /home/kevin/.config/watson/state.tmp # bindsym Mod4+x exec $swex bindsym Mod4+x exec xmodmap ~/.Xmodmap && xset r rate $XSET_DELAY $XSET_RATE bindsym Mod4+z exec cliqz -{{ if eq .chezmoi.fullHostname "x1-carbon" }} -bindsym $mod+p --release exec "scrot -s /tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'" -bindsym control+$mod+p --release exec "scrot -u /tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'" -{{ else }} +{{ if .ext_kb }} bindsym Print --release exec "scrot -s /tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'" bindsym control+Print --release exec "scrot -u /tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'" +{{ else }} +bindsym $mod+p --release exec "scrot -s /tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'" +bindsym control+$mod+p --release exec "scrot -u /tmp/screenshot-$(date +%F_%T).png -e 'xclip -selection c -t image/png < $f'" {{ end }} # ]]] app shortcuts # diff --git a/dot_config/i3blocks/i3blocks-display.conf b/dot_config/i3blocks/i3blocks-display.conf old mode 100644 new mode 100755 diff --git a/dot_config/i3blocks/i3blocks-secondary.conf.tmpl b/dot_config/i3blocks/i3blocks-secondary.conf.tmpl old mode 100644 new mode 100755 diff --git a/dot_config/i3blocks/i3blocks.conf.tmpl b/dot_config/i3blocks/i3blocks.conf.tmpl old mode 100644 new mode 100755 diff --git a/dot_config/i3blocks/scripts/executable_backlight b/dot_config/i3blocks/scripts/executable_backlight old mode 100644 new mode 100755 diff --git a/dot_config/i3blocks/scripts/executable_battery b/dot_config/i3blocks/scripts/executable_battery old mode 100644 new mode 100755 diff --git a/dot_config/i3blocks/scripts/executable_calendar b/dot_config/i3blocks/scripts/executable_calendar old mode 100644 new mode 100755 diff --git a/dot_config/i3blocks/scripts/executable_cpu_usage b/dot_config/i3blocks/scripts/executable_cpu_usage old mode 100644 new mode 100755 diff --git a/dot_config/i3blocks/scripts/executable_load_average b/dot_config/i3blocks/scripts/executable_load_average old mode 100644 new mode 100755 diff --git a/dot_config/i3blocks/scripts/executable_memory b/dot_config/i3blocks/scripts/executable_memory old mode 100644 new mode 100755 diff --git a/dot_config/i3blocks/scripts/executable_name b/dot_config/i3blocks/scripts/executable_name old mode 100644 new mode 100755 diff --git a/dot_config/i3blocks/scripts/executable_spotify b/dot_config/i3blocks/scripts/executable_spotify old mode 100644 new mode 100755 diff --git a/dot_config/i3blocks/scripts/executable_temperature b/dot_config/i3blocks/scripts/executable_temperature old mode 100644 new mode 100755 diff --git a/dot_config/i3blocks/scripts/executable_time b/dot_config/i3blocks/scripts/executable_time old mode 100644 new mode 100755 diff --git a/dot_config/i3blocks/scripts/executable_volume b/dot_config/i3blocks/scripts/executable_volume old mode 100644 new mode 100755 diff --git a/dot_config/i3blocks/scripts/executable_wifi b/dot_config/i3blocks/scripts/executable_wifi old mode 100644 new mode 100755 diff --git a/dot_config/mpv/input.conf b/dot_config/mpv/input.conf old mode 100644 new mode 100755 diff --git a/dot_config/neofetch/config.conf b/dot_config/neofetch/config.conf old mode 100644 new mode 100755 diff --git a/dot_config/nvim/init.vim b/dot_config/nvim/init.vim old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/completions/watson.fish b/dot_config/private_fish/completions/watson.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/config.fish.tmpl b/dot_config/private_fish/config.fish.tmpl old mode 100644 new mode 100755 index 03bea10..7a02ac0 --- a/dot_config/private_fish/config.fish.tmpl +++ b/dot_config/private_fish/config.fish.tmpl @@ -25,16 +25,16 @@ bind \ce edit_command_buffer bind \cr forward-word chezmoi apply -/home/kevin/scripts/sync-shortcuts -# source /home/kevin/.config/fish/key_abbr.fish > /dev/null -set -U fish_fxn_dir "/home/kevin/linux-config/dot_config/private_fish/private_functions" -# set -U fish_fxn_dir "/home/kevin/.config/fish/functions" +~/scripts/sync-shortcuts +# source ~/.config/fish/key_abbr.fish > /dev/null +set -U fish_fxn_dir "{{ .chezmoi.homedir }}/linux-config/dot_config/private_fish/private_functions" +# set -U fish_fxn_dir "~/.config/fish/functions" abbr ff "cd $fish_fxn_dir" for fxn in (find $fish_fxn_dir -name '*.fish') source $fxn end -abbr rf "chezmoi apply && source ~/.config/fish/config.fish" -abbr rfs "sync-shortcuts && chezmoi apply && source ~/.config/fish/key_abbr.fish > /dev/null" +abbr rf "chezmoi apply && sync-shortcuts && source ~/.config/fish/key_abbr.fish > /dev/null" +abbr rfc "chezmoi apply && source ~/.config/fish/config.fish" abbr xf "fish_config" abbr f. "cd .." abbr f.. "cd ../.." @@ -44,10 +44,12 @@ abbr f.. "cd ../.." # universal var's [[[ # # spv -set -U spv_dir "/home/kevin/coding/spotify-lib-vis" -set -U mfs_dir "/home/kevin/coding/mf-site" +{{ if eq .chezmoi.fullHostname "nzxt" }} +set -U spv_dir "~/coding/spotify-lib-vis" +set -U mfs_dir "~/coding/mf-site" +{{ end }} -set -x PATH $PATH /home/kevin/scripts /home/kevin/scripts/colors /home/kevin/go/bin +set -x PATH $PATH ~/scripts ~/scripts/colors ~/go/bin set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH /usr/local/lib /usr/local/lib64 set -x PKG_CONFIG_PATH $PKG_CONFIG_PATH /usr/lib/pkgconfig diff --git a/dot_config/private_fish/private_functions/369/a2/carsim.fish b/dot_config/private_fish/private_functions/369/a2/carsim.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/369/a2/gdb-a2.fish b/dot_config/private_fish/private_functions/369/a2/gdb-a2.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/369/a3/gdb-a3-break.fish b/dot_config/private_fish/private_functions/369/a3/gdb-a3-break.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/369/a3/run-a3.fish b/dot_config/private_fish/private_functions/369/a3/run-a3.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/369/a4/block-to-line.fish b/dot_config/private_fish/private_functions/369/a4/block-to-line.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/369/a4/executable_revert-image.fish b/dot_config/private_fish/private_functions/369/a4/executable_revert-image.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/369/a4/hex.fish b/dot_config/private_fish/private_functions/369/a4/hex.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/369/a4/mount-image.fish b/dot_config/private_fish/private_functions/369/a4/mount-image.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/369/a4/run-a4.fish b/dot_config/private_fish/private_functions/369/a4/run-a4.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/369/grep-c.fish b/dot_config/private_fish/private_functions/369/grep-c.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/369/grep-headers.fish b/dot_config/private_fish/private_functions/369/grep-headers.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/369/rg-headers.fish b/dot_config/private_fish/private_functions/369/rg-headers.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/369/rgc.fish b/dot_config/private_fish/private_functions/369/rgc.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/benq-brightness.fish b/dot_config/private_fish/private_functions/benq-brightness.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/cd.fish b/dot_config/private_fish/private_functions/cd.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/certbot-ssl.fish b/dot_config/private_fish/private_functions/certbot-ssl.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/copy.fish b/dot_config/private_fish/private_functions/copy.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/create-fish-function.fish b/dot_config/private_fish/private_functions/create-fish-function.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/evince-silent.fish b/dot_config/private_fish/private_functions/evince-silent.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/find-vim-filetype.fish b/dot_config/private_fish/private_functions/find-vim-filetype.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/git/git-amend-push.fish b/dot_config/private_fish/private_functions/git/git-amend-push.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/git/git-delete-branch.fish b/dot_config/private_fish/private_functions/git/git-delete-branch.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/git/git-diff-files.fish b/dot_config/private_fish/private_functions/git/git-diff-files.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/git/git-mult-remotes.fish b/dot_config/private_fish/private_functions/git/git-mult-remotes.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/git/git-push-multiple.fish b/dot_config/private_fish/private_functions/git/git-push-multiple.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/grep-aliases.fish b/dot_config/private_fish/private_functions/grep-aliases.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/grep-pdf-file.fish b/dot_config/private_fish/private_functions/grep-pdf-file.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/grep-pdf.fish b/dot_config/private_fish/private_functions/grep-pdf.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/pastebin.fish b/dot_config/private_fish/private_functions/pastebin.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/redshift-set.fish b/dot_config/private_fish/private_functions/redshift-set.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/scan-history.fish b/dot_config/private_fish/private_functions/scan-history.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/shred-rm.fish b/dot_config/private_fish/private_functions/shred-rm.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/ssh-bandit.fish b/dot_config/private_fish/private_functions/ssh-bandit.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/unix-timestamp.fish b/dot_config/private_fish/private_functions/unix-timestamp.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/unzip-rm.fish b/dot_config/private_fish/private_functions/unzip-rm.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/vsnp.fish b/dot_config/private_fish/private_functions/vsnp.fish old mode 100644 new mode 100755 diff --git a/dot_config/private_fish/private_functions/wc-pdf.fish b/dot_config/private_fish/private_functions/wc-pdf.fish old mode 100644 new mode 100755 diff --git a/dot_config/ranger/commands.py b/dot_config/ranger/commands.py old mode 100644 new mode 100755 diff --git a/dot_config/ranger/executable_scope.sh b/dot_config/ranger/executable_scope.sh old mode 100644 new mode 100755 diff --git a/dot_config/ranger/plugins/__init__.py b/dot_config/ranger/plugins/__init__.py old mode 100644 new mode 100755 diff --git a/dot_config/ranger/plugins/__pycache__/__init__.cpython-37.opt-1.pyc b/dot_config/ranger/plugins/__pycache__/__init__.cpython-37.opt-1.pyc old mode 100644 new mode 100755 diff --git a/dot_config/ranger/plugins/__pycache__/devicons.cpython-37.opt-1.pyc b/dot_config/ranger/plugins/__pycache__/devicons.cpython-37.opt-1.pyc old mode 100644 new mode 100755 diff --git a/dot_config/ranger/plugins/__pycache__/devicons_linemode.cpython-37.opt-1.pyc b/dot_config/ranger/plugins/__pycache__/devicons_linemode.cpython-37.opt-1.pyc old mode 100644 new mode 100755 diff --git a/dot_config/ranger/plugins/executable_devicons.py b/dot_config/ranger/plugins/executable_devicons.py old mode 100644 new mode 100755 diff --git a/dot_config/ranger/plugins/executable_devicons_linemode.py b/dot_config/ranger/plugins/executable_devicons_linemode.py old mode 100644 new mode 100755 diff --git a/dot_config/ranger/rc.conf b/dot_config/ranger/rc.conf old mode 100644 new mode 100755 index aad4842..d95673d --- a/dot_config/ranger/rc.conf +++ b/dot_config/ranger/rc.conf @@ -695,7 +695,7 @@ map zr shell unzip %f && rm %f map e. open_with evince f map v. shell $EDITOR %f -source /home/kevin/.config/ranger/key_mappings.conf +source ~/.config/ranger/key_mappings.conf map dg shell dragon-drag-and-drop -a -x %p # map shell dragon-drag-and-drop -a -x %p diff --git a/dot_config/ranger/rifle.conf b/dot_config/ranger/rifle.conf old mode 100644 new mode 100755 diff --git a/dot_config/zathura/zathurarc b/dot_config/zathura/zathurarc old mode 100644 new mode 100755 diff --git a/dot_gitconfig b/dot_gitconfig old mode 100644 new mode 100755 diff --git a/dot_imwheelrc b/dot_imwheelrc old mode 100644 new mode 100755 diff --git a/dot_inputrc b/dot_inputrc old mode 100644 new mode 100755 diff --git a/dot_vimrc.tmpl b/dot_vimrc.tmpl old mode 100644 new mode 100755 diff --git a/dot_xinitrc b/dot_xinitrc old mode 100644 new mode 100755 diff --git a/dot_zshrc b/dot_zshrc old mode 100644 new mode 100755 diff --git a/key_aliases.tmpl b/key_aliases.tmpl old mode 100644 new mode 100755 diff --git a/key_dirs.tmpl b/key_dirs.tmpl old mode 100644 new mode 100755 diff --git a/key_files.tmpl b/key_files.tmpl old mode 100644 new mode 100755 diff --git a/scripts/colors/executable_arch b/scripts/colors/executable_arch old mode 100644 new mode 100755 diff --git a/scripts/colors/executable_blocks b/scripts/colors/executable_blocks old mode 100644 new mode 100755 diff --git a/scripts/colors/executable_panes b/scripts/colors/executable_panes old mode 100644 new mode 100755 diff --git a/scripts/colors/executable_rupees b/scripts/colors/executable_rupees old mode 100644 new mode 100755 diff --git a/scripts/colors/executable_space-invaders b/scripts/colors/executable_space-invaders old mode 100644 new mode 100755 diff --git a/scripts/colors/executable_unowns b/scripts/colors/executable_unowns old mode 100644 new mode 100755 diff --git a/scripts/executable_backup b/scripts/executable_backup old mode 100644 new mode 100755 diff --git a/scripts/executable_bg-chooser b/scripts/executable_bg-chooser old mode 100644 new mode 100755 diff --git a/scripts/executable_burn-iso.sh b/scripts/executable_burn-iso.sh old mode 100644 new mode 100755 diff --git a/scripts/executable_change-sink b/scripts/executable_change-sink old mode 100644 new mode 100755 diff --git a/scripts/executable_install-arch-pkgs.sh b/scripts/executable_install-arch-pkgs.sh old mode 100644 new mode 100755 diff --git a/scripts/executable_passmenu b/scripts/executable_passmenu old mode 100644 new mode 100755 diff --git a/scripts/executable_qr-gif.sh b/scripts/executable_qr-gif.sh old mode 100644 new mode 100755 diff --git a/scripts/executable_rick-roll b/scripts/executable_rick-roll old mode 100644 new mode 100755 diff --git a/scripts/executable_shuffler b/scripts/executable_shuffler old mode 100644 new mode 100755 diff --git a/scripts/executable_sync-shortcuts b/scripts/executable_sync-shortcuts old mode 100644 new mode 100755 diff --git a/scripts/executable_tex-clean b/scripts/executable_tex-clean old mode 100644 new mode 100755 diff --git a/txt/exclude-dirs-backup-full.txt b/txt/exclude-dirs-backup-full.txt old mode 100644 new mode 100755 diff --git a/txt/exclude-dirs-backup.txt b/txt/exclude-dirs-backup.txt old mode 100644 new mode 100755 diff --git a/txt/gtk-themes.txt b/txt/gtk-themes.txt old mode 100644 new mode 100755 diff --git a/txt/nzxt-aur.txt b/txt/nzxt-aur.txt old mode 100644 new mode 100755 diff --git a/txt/nzxt-pkgs.txt b/txt/nzxt-pkgs.txt old mode 100644 new mode 100755 diff --git a/txt/tex-build-files.txt b/txt/tex-build-files.txt old mode 100644 new mode 100755 diff --git a/txt/todo.md b/txt/todo.md old mode 100644 new mode 100755 index 81d7958..227f40c --- a/txt/todo.md +++ b/txt/todo.md @@ -1,8 +1,6 @@ # chezmoi -- home server -- lab - - template bash file +- scripts + - copy sync-shortcut # Other -- nnn -- spotify blocklet - escape chars. +- nnn? diff --git a/txt/usbs.md b/txt/usbs.md old mode 100644 new mode 100755 diff --git a/txt/x1-carbon-aur.txt b/txt/x1-carbon-aur.txt old mode 100644 new mode 100755 diff --git a/txt/x1-carbon-pkgs.txt b/txt/x1-carbon-pkgs.txt old mode 100644 new mode 100755