From 2e7d6857a856aa2f0cfba77206e4dae9659675c2 Mon Sep 17 00:00:00 2001 From: Michael Zhang Date: Thu, 15 Apr 2021 02:29:54 -0500 Subject: [PATCH] poggers --- dot_config/alacritty/alacritty.yml | 2 +- dot_config/i3/config | 45 +++++++++++-------- dot_config/i3blocks/executable_config | 14 ++++++ dot_config/nvim/init.vim | 7 ++- dot_local/scripts/executable_toggle-vpn.sh | 1 + .../applications/executable_Onivim2.desktop | 6 +++ .../executable_run-proton-bridge.sh | 14 +----- dot_wakatime.cfg | 2 +- dot_zprofile | 1 + dot_zshrc | 5 ++- executable_dot_xinitrc | 6 +++ private_dot_ssh/executable_config | 4 ++ 12 files changed, 67 insertions(+), 40 deletions(-) create mode 100644 dot_config/i3blocks/executable_config create mode 100644 dot_local/share/applications/executable_Onivim2.desktop diff --git a/dot_config/alacritty/alacritty.yml b/dot_config/alacritty/alacritty.yml index e07edb0..e2df0e3 100644 --- a/dot_config/alacritty/alacritty.yml +++ b/dot_config/alacritty/alacritty.yml @@ -150,7 +150,7 @@ font: #style: Bold Italic # Point size - size: 7.5 + size: 10 # Offset is the extra space around each character. `offset.y` can be thought # of as modifying the line spacing, and `offset.x` as modifying the letter diff --git a/dot_config/i3/config b/dot_config/i3/config index 932b41a..89c80d0 100644 --- a/dot_config/i3/config +++ b/dot_config/i3/config @@ -29,6 +29,10 @@ bindsym $mod+p exec $HOME/.local/scripts/passmenu.sh bindsym $mod+semicolon exec alacritty -e nvim $HOME/todos.md bindsym $mod+m exec $HOME/.local/scripts/toggle-vpn.sh sift-vpn-mzhang +# MOVE WINDOW BETWEEN MONITORS +bindsym $mod+Ctrl+greater move workspace to output right +bindsym $mod+Ctrl+less move workspace to output left + # The combination of xss-lock, nm-applet and pactl is a popular choice, so # they are included here as an example. Modify as you see fit. @@ -172,27 +176,27 @@ bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcu # resize window (you can also use the mouse for that) mode "resize" { - # These bindings trigger as soon as you enter the resize mode + # These bindings trigger as soon as you enter the resize mode - # Pressing left will shrink the window’s width. - # Pressing right will grow the window’s width. - # Pressing up will shrink the window’s height. - # Pressing down will grow the window’s height. - bindsym j resize shrink width 10 px or 10 ppt - bindsym k resize grow height 10 px or 10 ppt - bindsym l resize shrink height 10 px or 10 ppt - bindsym semicolon resize grow width 10 px or 10 ppt + # Pressing left will shrink the window’s width. + # Pressing right will grow the window’s width. + # Pressing up will shrink the window’s height. + # Pressing down will grow the window’s height. + bindsym j resize shrink width 10 px or 10 ppt + bindsym k resize grow height 10 px or 10 ppt + bindsym l resize shrink height 10 px or 10 ppt + bindsym semicolon resize grow width 10 px or 10 ppt - # same bindings, but for the arrow keys - bindsym Left resize shrink width 10 px or 10 ppt - bindsym Down resize grow height 10 px or 10 ppt - bindsym Up resize shrink height 10 px or 10 ppt - bindsym Right resize grow width 10 px or 10 ppt + # same bindings, but for the arrow keys + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt - # back to normal: Enter or Escape or $mod+r - bindsym Return mode "default" - bindsym Escape mode "default" - bindsym $mod+r mode "default" + # back to normal: Enter or Escape or $mod+r + bindsym Return mode "default" + bindsym Escape mode "default" + bindsym $mod+r mode "default" } bindsym $mod+r mode "resize" @@ -200,5 +204,8 @@ bindsym $mod+r mode "resize" # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) bar { - status_command i3status + tray_output HDMI-A-0 + tray_output DisplayPort-0 + + status_command i3blocks } diff --git a/dot_config/i3blocks/executable_config b/dot_config/i3blocks/executable_config new file mode 100644 index 0000000..134f1e3 --- /dev/null +++ b/dot_config/i3blocks/executable_config @@ -0,0 +1,14 @@ +[weather] +command=curl -Ss "https://wttr.in/55404?m&format=%25c%25C+%25t+%25p\n" +interval=3600 +color=#A4C2F4 + +[date] +command=date +"%a %m[%d]%Y" +interval=5 +color=#EE92EE + +[time] +command=date +"[%H:%M]:%S" +interval=5 +color=#EEEE92 diff --git a/dot_config/nvim/init.vim b/dot_config/nvim/init.vim index 2754227..c80b706 100644 --- a/dot_config/nvim/init.vim +++ b/dot_config/nvim/init.vim @@ -3,8 +3,8 @@ call plug#begin(stdpath('data') . '/plugged') " Plug 'vim-airline/vim-airline' " exe 'source' (stdpath('config') . '/airline.vim') -" Plug 'neoclide/coc.nvim', {'branch': 'release'} -" exe 'source' (stdpath('config') . '/coc.vim') +Plug 'neoclide/coc.nvim', {'branch': 'release'} +exe 'source' (stdpath('config') . '/coc.vim') " Plug 'file://'.expand('~/Projects/coc-nvim-rs/') Plug 'preservim/nerdtree' @@ -36,9 +36,8 @@ Plug 'tomasiser/vim-code-dark' " Plug 'godlygeek/tabular' " Plug 'plasticboy/vim-markdown' -" Plug 'wakatime/vim-wakatime' +Plug 'wakatime/vim-wakatime' " Plug 'aurieh/discord.nvim', { 'do': ':UpdateRemotePlugins'} -" Plug 'wakatime/vim-wakatime' let g:go_fmt_command = 'goimports' diff --git a/dot_local/scripts/executable_toggle-vpn.sh b/dot_local/scripts/executable_toggle-vpn.sh index 10c2a27..2c58aca 100644 --- a/dot_local/scripts/executable_toggle-vpn.sh +++ b/dot_local/scripts/executable_toggle-vpn.sh @@ -13,6 +13,7 @@ ACTIVE=`nmcli con show --active | grep "$VPN"` if [ -z "$ACTIVE" ] then nmcli con up id "$VPN" + notify-send "VPN $VPN" "Connected." else nmcli con down id "$VPN" notify-send "VPN $VPN" "Disconnected." diff --git a/dot_local/share/applications/executable_Onivim2.desktop b/dot_local/share/applications/executable_Onivim2.desktop new file mode 100644 index 0000000..a94edc7 --- /dev/null +++ b/dot_local/share/applications/executable_Onivim2.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=Onivim2 +Exec=Oni2 +Icon=Onivim2 +Type=Application +Categories=Development; diff --git a/dot_local/share/private_proton-bridge/executable_run-proton-bridge.sh b/dot_local/share/private_proton-bridge/executable_run-proton-bridge.sh index 4f1d069..d69448a 100644 --- a/dot_local/share/private_proton-bridge/executable_run-proton-bridge.sh +++ b/dot_local/share/private_proton-bridge/executable_run-proton-bridge.sh @@ -1,14 +1,2 @@ #!/bin/bash - -export THIS=$HOME/.local/share/proton-bridge -export PASSWORD_STORE_DIR=$THIS/pass -export GNUPGHOME=$THIS/gpg - -echo $PASSWORD_STORE_DIR -pass ls - -echo $GNUPGHOME -gpg --list-keys - -exec $HOME/.local/bin/Desktop-Bridge $@ - +exec hydroxide serve diff --git a/dot_wakatime.cfg b/dot_wakatime.cfg index 52787af..f792e95 100644 --- a/dot_wakatime.cfg +++ b/dot_wakatime.cfg @@ -1,3 +1,3 @@ [settings] api_url=http://localhost:5800/api/v1/heartbeats.bulk -api_key=ff283e70-f48e-4c0c-81a7-8ecb2ca5d0cf +api_key=a2b783b6-f6ae-4a58-8cb8-63cc2921ac16 diff --git a/dot_zprofile b/dot_zprofile index c819c64..ad0b4e6 100644 --- a/dot_zprofile +++ b/dot_zprofile @@ -2,6 +2,7 @@ export PATH="$HOME/.cargo/bin:/usr/local/go/bin:$PATH" export TERMINAL="/usr/bin/alacritty" export EDITOR="/usr/bin/nvim" +export CUPS_SERVER="192.168.0.171:631" if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]] then diff --git a/dot_zshrc b/dot_zshrc index c8ff067..3658f31 100644 --- a/dot_zshrc +++ b/dot_zshrc @@ -22,15 +22,16 @@ export DOTNET_CLI_TELEMETRY_OPTOUT=1 # export RUST_SRC_PATH="$(rustc --print sysroot)/lib/rustlib/src/rust/src" export EDITOR=nvim export MAILDIR=$HOME/Mail -export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock +# export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock source_if_exists $HOME/.cargo/env source_if_exists $HOME/.ghcup/env export PATH="$HOME/.local/bin:$HOME/.local/scripts:$HOME/.dotnet/tools:$PATH:$HOME/go/bin:$HOME/.idris2/bin:$HOME/.opam/default/bin" +export PATH="$HOME/.local/share/prt:$PATH" [ -f "${GHCUP_INSTALL_BASE_PREFIX:=$HOME}/.ghcup/env" ] && source "${GHCUP_INSTALL_BASE_PREFIX:=$HOME}/.ghcup/env" -[[ -s /etc/profile.d/autojump.sh ]] && source /etc/profile.d/autojump.sh +[[ -s $HOME/.autojump/etc/profile.d/autojump.sh ]] && source $HOME/.autojump/etc/profile.d/autojump.sh autoload -U compinit && compinit -u # opam configuration diff --git a/executable_dot_xinitrc b/executable_dot_xinitrc index bbe1cd4..42f86db 100644 --- a/executable_dot_xinitrc +++ b/executable_dot_xinitrc @@ -8,4 +8,10 @@ export SSH_AUTH_SOCK eval $(ssh-agent) +exec_if_exist() { + test -x $1 && $1 +} + +exec_if_exist $HOME/.screenlayout/regular.sh + exec i3 diff --git a/private_dot_ssh/executable_config b/private_dot_ssh/executable_config index 9983c00..0cb71ef 100644 --- a/private_dot_ssh/executable_config +++ b/private_dot_ssh/executable_config @@ -6,6 +6,10 @@ Host hlab User michael HostName 142.93.75.170 +Host rpi + User michael + HostName 192.168.0.171 + # sift Host l0 User mzhang