diff --git a/aliases/key_aliases.tmpl b/aliases/key_aliases.tmpl index 99bfd4b..0fa4074 100644 --- a/aliases/key_aliases.tmpl +++ b/aliases/key_aliases.tmpl @@ -52,7 +52,7 @@ ngb "sudo nvim /etc/default/grub" mgb "sudo grub-mkconfig -o /boot/grub/grub.cfg" # a "bat" -b "bat" +b "batcat" # ba "bat *" awkp "awk -F',' '{print \$0}'" cpr "cp -r" @@ -189,7 +189,7 @@ rsy "rsync --ignore-existing -Ptr" lhd "sudo fdisk -l" # get disc space for mounted drives # ds "df -h | tee >(head -n 1) >(grep sd) >/dev/null" -ds "df -h | head -n 1 && df -h | grep sd" +# ds "df -h | head -n 1 && df -h | grep sd" chownw "sudo chown -R kevin:wheel" chwnm "sudo chown -R kevin:wheel /run/media/{{ .chezmoi.username }}" # cd into backup folder and show backup sizes @@ -1169,16 +1169,26 @@ gotd "go mod tidy" # docker [[[ # -dk "docker" -dkb "docker build" -dki "docker image" -dkka "docker kill \$(docker ps -q)" -dkl "docker ps" -dkp "docker push" -dks "docker images" +d "docker" +db "docker build" +dc "docker-compose" +dcu "docker-compose up -d" +dcd "docker-compose down" +di "docker image" +dli "docker image list" +dk "docker kill" +dka "docker kill \$(docker ps -q)" +dl "docker ps" +dp "docker push" +dr "docker run" +drm "docker remove" +drmi "docker rmi -f" +ds "docker stop" # ]]] docker # +nt "sudo nginx -t" + sb "ansible" sbp "ansible-playbook" diff --git a/aliases/key_dirs.tmpl b/aliases/key_dirs.tmpl index 43ddaea..29c1c64 100644 --- a/aliases/key_dirs.tmpl +++ b/aliases/key_dirs.tmpl @@ -31,7 +31,7 @@ std ~/st # tm /tmp tm ~/tmp -{{ if and (eq .chezmoi.username "root") (eq .linux_os "debian") }} +{{ if (eq .linux_os "debian") }} ng /etc/nginx/sites-available # sv /etc/systemd/system {{ end }} diff --git a/aliases/key_files.tmpl b/aliases/key_files.tmpl index 17055ab..1d2fc52 100644 --- a/aliases/key_files.tmpl +++ b/aliases/key_files.tmpl @@ -17,7 +17,7 @@ r ~/linux-config/dot_config/ranger/rc.conf.tmpl sr ~/linux-config/configs/ranger/shortcuts.conf ss ~/.shortcuts st ~/st/config.def.h -t ~/linux-config/dot_tmux.conf +# t ~/linux-config/dot_tmux.conf u ~/linux-config/dot_Xresources.tmpl x ~/linux-config/dot_config/fish/config.fish.tmpl xi ~/linux-config/dot_xinitrc diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl index 3b7f946..02735d4 100755 --- a/dot_config/fish/config.fish.tmpl +++ b/dot_config/fish/config.fish.tmpl @@ -41,14 +41,14 @@ abbr ssa "ssh kevin@ec2-18-223-241-198.us-east-2.compute.amazonaws.com" # login to X [[[ # -{{ if eq .chezmoi.username "kevin" }} -if status is-login - if test -z "$DISPLAY" -a $XDG_VTNR = 1 - exec startx -- -keeptty - end -end -set -x GPG_TTY (tty) -{{ end }} +# {{ if eq .chezmoi.username "kevin" }} +# if status is-login +# if test -z "$DISPLAY" -a $XDG_VTNR = 1 +# exec startx -- -keeptty +# end +# end +# set -x GPG_TTY (tty) +# {{ end }} # ]]] login to X # @@ -71,7 +71,7 @@ set -x HASTE_SERVER https://pste.gq set -x LD_LIBRARY_PATH $LD_LIBRARY_PATH /usr/local/lib /usr/local/lib64 set -x GOPATH ~/go # set -x PATH $GRAALVM_BIN $PATH ~/.local/bin ~/scripts ~/scripts/colors ~/go/bin ~/.minetest/minetest/bin ~/.gem/ruby/2.6.0/bin -set -x PATH $PATH ~/.local/bin ~/scripts ~/scripts/colors $GOPATH/bin ~/.minetest/minetest/bin ~/.gem/ruby/*/bin ~/.yarn/bin +set -x PATH $PATH ~/.local/bin ~/scripts ~/scripts/colors $GOPATH/bin ~/.minetest/minetest/bin ~/.gem/ruby/*/bin ~/.yarn/bin /usr/sbin set -x PKG_CONFIG_PATH $PKG_CONFIG_PATH /usr/lib/pkgconfig # Java [[[ # @@ -220,6 +220,7 @@ abbr cpe "copy echo" abbr cpp "copy echo (pwd)" abbr cff "create-fish-function" abbr ctr "systemctl-restart" +abbr ctrn "systemctl-restart nginx" abbr def "define" abbr drs "dump-rarity-check" abbr fd1 "fd --changed-within 1d" @@ -305,5 +306,4 @@ abbr xya "export-pkgs" # task sync > /dev/null 2>&1 source /home/kevin/.config/fish/key_abbr.fish > /dev/null -wal -r # ~/scripts/xmodmap-custom