diff --git a/.vim/tmp/leavemebe b/.vim/tmp/leavemebe deleted file mode 100644 index e69de29..0000000 diff --git a/.yadm/alt/.config/awesome/rc.lua##Linux.epiphanius b/.yadm/alt/.config/awesome/rc.lua##Linux.epiphanius index 3e9072c..e37b7de 100644 --- a/.yadm/alt/.config/awesome/rc.lua##Linux.epiphanius +++ b/.yadm/alt/.config/awesome/rc.lua##Linux.epiphanius @@ -119,7 +119,7 @@ menubar.utils.terminal = terminal -- Set the terminal for applications that requ -- Keyboard map indicator and switcher mykeyboardlayout = awful.widget.keyboardlayout() -- Volume -volumewidget = wibox.widget.textbox(awful.spawn.easy_async("pamixer --sink 0 --get-volume",function(stdout, stderr, reason, exit_code) +volumewidget = wibox.widget.textbox(awful.spawn.easy_async("pamixer --sink ${pamixer --list-sinks |tail -1 |cut -d' ' -f1} --get-volume",function(stdout, stderr, reason, exit_code) volumewidget:set_text(" 🔈:"..stdout) end)) -- Battery @@ -384,12 +384,12 @@ globalkeys = gears.table.join( awful.key({ }, "XF86AudioMute", function () awful.util.spawn("pamixer --sink 0 -t", false) - awful.spawn.easy_async("pamixer --sink 0 --get-mute", function(stdout, stderr, reason, exit_code) + awful.spawn.easy_async_with_shell("pamixer --sink $(pamixer --list-sinks |tail -1 |cut -d' ' -f1) --get-mute", function(stdout, stderr, reason, exit_code) naughty.notify {title = "mute", text = stdout, timeout = 0.5} if string.match(stdout, "true" ) then volumewidget:set_text(" 🔇 ") else - awful.spawn.easy_async("pamixer --sink 0 --get-volume", function(stdout, stderr, reason, exit_code) + awful.spawn.easy_async_with_shell("pamixer --sink $(pamixer --list-sinks |tail -1 |cut -d' ' -f1) --get-volume", function(stdout, stderr, reason, exit_code) volumewidget:set_text(" 🔈:"..stdout) naughty.notify {title = "Inc", text = stdout, timeout = 0.5} end) @@ -405,17 +405,17 @@ globalkeys = gears.table.join( end), awful.key({ }, "XF86AudioLowerVolume", function () - awful.spawn.easy_async("pamixer --sink 0 -d 5 --get-volume", function(stdout, stderr, reason, exit_code) + awful.spawn.easy_async_with_shell("pamixer --sink $(pamixer --list-sinks |tail -1 |cut -d' ' -f1) -d 5 --get-volume", function(stdout, stderr, reason, exit_code) volumewidget:set_text(" 🔈:"..stdout) - naughty.notify {title = "Inc", text = stdout, timeout = 0.5} + naughty.notify {title = "🔈↓", text = stdout, timeout = 0.5} end) end), awful.key({ }, "XF86AudioRaiseVolume", function () - awful.spawn.easy_async("pamixer --sink 0 -i 5 --get-volume", function(stdout, stderr, reason, exit_code) + awful.spawn.easy_async_with_shell("pamixer --sink $(pamixer --list-sinks |tail -1 |cut -d' ' -f1) -i 5 --get-volume", function(stdout, stderr, reason, exit_code) volumewidget:set_text(" 🔈:"..stdout) - naughty.notify {title = "Dec", text = stdout, timeout = 0.5} + naughty.notify {title = "🔈↑", text = stdout, timeout = 0.5} end) end), awful.key({ "Control", "Mod4" }, "Up", diff --git a/.yadm/alt/.ssh/config##Linux.epiphanius b/.yadm/alt/.ssh/config##Linux.epiphanius index bca56c5..a6afd84 100644 --- a/.yadm/alt/.ssh/config##Linux.epiphanius +++ b/.yadm/alt/.ssh/config##Linux.epiphanius @@ -18,6 +18,12 @@ Host git.narbuto.lt AddKeysToAgent yes IdentityFile ~/.ssh/id_rsa_backute_gitea +Host gitlab.bol.io + User git + PubKeyAuthentication yes + AddKeysToAgent yes + IdentityFile ~/.ssh/id_rsa_bolcom_io_snarbutas + Host adm-gerrit-001 adm-gerrit-001.ams4.bolcom.net gerrit.internal.adm.bol.com gerrit.tools.bol.com User snarbutas Port 29418 diff --git a/.yadm/alt/.zshrc##Linux b/.yadm/alt/.zshrc##Linux index 995e201..5c1ee54 100644 --- a/.yadm/alt/.zshrc##Linux +++ b/.yadm/alt/.zshrc##Linux @@ -55,7 +55,7 @@ LESSOPEN='|~/.lessfilter %s' ## Setup editor and pager variables PAGER="less" -EDITOR="vim" +EDITOR="nvim" VISUAL="${EDITOR}" #TERM="xterm-termite" export PAGER EDITOR VISUAL diff --git a/.zsh.d/00-path.zsh b/.zsh.d/00-path.zsh deleted file mode 100644 index 9a3b037..0000000 --- a/.zsh.d/00-path.zsh +++ /dev/null @@ -1,6 +0,0 @@ -for dir in /usr/bin /usr/sbin /sbin /bin ~/.bin; do - if test -d "$dir" && ! grep -q -e "^${dir}:" -e ":${dir}:" -e ":${dir}" <<< $PATH; then - PATH="${dir}:${PATH}" - fi -done -export PATH diff --git a/.zsh.d/00-path.zsh b/.zsh.d/00-path.zsh new file mode 120000 index 0000000..e014cc2 --- /dev/null +++ b/.zsh.d/00-path.zsh @@ -0,0 +1 @@ +/home/snarbutas/.yadm/alt/.zsh.d/00-path.zsh##Linux.epiphanius \ No newline at end of file diff --git a/.zsh.d/15-ruby.zsh b/.zsh.d/15-ruby.zsh index 3e2f369..f0b7141 100644 --- a/.zsh.d/15-ruby.zsh +++ b/.zsh.d/15-ruby.zsh @@ -1,5 +1,6 @@ -for dir in ~/.rbenv/bin ~/.rbenv/shims ~/.gem/ruby/*/bin(ocN); do - if test -d "$dir"; then - export PATH="${PATH}:${dir}" - fi -done +#for dir in ~/.rbenv/bin ~/.rbenv/shims ~/.gem/ruby/*/bin(ocN); do +# if test -d "$dir"; then +# export PATH="${PATH}:${dir}" +# fi +#done +eval "$(rbenv init -)" diff --git a/.zsh.d/20-aliases.zsh b/.zsh.d/20-aliases.zsh index 00f4d22..95edb85 100644 --- a/.zsh.d/20-aliases.zsh +++ b/.zsh.d/20-aliases.zsh @@ -4,17 +4,18 @@ else alias ls='ls -F' fi alias ll='ls -ltrh' +alias cat='bat' if grep --color=auto >&/dev/null; then alias grep='grep --color=auto' alias egrep='egrep --color=auto' fi -if which vim > /dev/null; then - alias vi='vim' +if which nvim > /dev/null; then + alias vi='nvim' fi alias find='noglob find' alias git='noglob git' -alias history='history -100' +alias history='history -2000' alias gssh='gcloud compute ssh --ssh-flag "-J shd-gcp-jump-001.bolcom.net"' diff --git a/.zsh.d/40-always-tmux.zsh b/.zsh.d/40-always-tmux.zsh index 26220dd..ff14132 100644 --- a/.zsh.d/40-always-tmux.zsh +++ b/.zsh.d/40-always-tmux.zsh @@ -1,4 +1,4 @@ -if [[ "$TERM" == screen-256color ]] || [[ -n "$TMUX" ]]; then +if [[ "$TERM" == screen-256color ]] || [[ -n "$TMUX" ]] || [[ "${TERM_PROGRAM}" == "code" ]]; then return 1 fi @@ -9,4 +9,4 @@ if tmux list-sessions && (tmux list-sessions | test -n "$0"); then tmux attach-session -t $session_id \; set-option destroy-unattached else tmux new-session -s base -fi \ No newline at end of file +fi