This commit is contained in:
Michael Zhang 2021-04-15 02:29:54 -05:00
parent 58a884e38d
commit 2e7d6857a8
Signed by: michael
GPG key ID: BDA47A31A3C8EE6B
12 changed files with 67 additions and 40 deletions

View file

@ -150,7 +150,7 @@ font:
#style: Bold Italic #style: Bold Italic
# Point size # Point size
size: 7.5 size: 10
# Offset is the extra space around each character. `offset.y` can be thought # 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 # of as modifying the line spacing, and `offset.x` as modifying the letter

View file

@ -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+semicolon exec alacritty -e nvim $HOME/todos.md
bindsym $mod+m exec $HOME/.local/scripts/toggle-vpn.sh sift-vpn-mzhang 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 # 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. # 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) # resize window (you can also use the mouse for that)
mode "resize" { 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 windows width. # Pressing left will shrink the windows width.
# Pressing right will grow the windows width. # Pressing right will grow the windows width.
# Pressing up will shrink the windows height. # Pressing up will shrink the windows height.
# Pressing down will grow the windows height. # Pressing down will grow the windows height.
bindsym j resize shrink width 10 px or 10 ppt bindsym j resize shrink width 10 px or 10 ppt
bindsym k resize grow height 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 l resize shrink height 10 px or 10 ppt
bindsym semicolon resize grow width 10 px or 10 ppt bindsym semicolon resize grow width 10 px or 10 ppt
# same bindings, but for the arrow keys # same bindings, but for the arrow keys
bindsym Left resize shrink width 10 px or 10 ppt bindsym Left resize shrink width 10 px or 10 ppt
bindsym Down resize grow height 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 Up resize shrink height 10 px or 10 ppt
bindsym Right resize grow width 10 px or 10 ppt bindsym Right resize grow width 10 px or 10 ppt
# back to normal: Enter or Escape or $mod+r # back to normal: Enter or Escape or $mod+r
bindsym Return mode "default" bindsym Return mode "default"
bindsym Escape mode "default" bindsym Escape mode "default"
bindsym $mod+r mode "default" bindsym $mod+r mode "default"
} }
bindsym $mod+r mode "resize" 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 # Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available) # finds out, if available)
bar { bar {
status_command i3status tray_output HDMI-A-0
tray_output DisplayPort-0
status_command i3blocks
} }

View file

@ -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

View file

@ -3,8 +3,8 @@ call plug#begin(stdpath('data') . '/plugged')
" Plug 'vim-airline/vim-airline' " Plug 'vim-airline/vim-airline'
" exe 'source' (stdpath('config') . '/airline.vim') " exe 'source' (stdpath('config') . '/airline.vim')
" Plug 'neoclide/coc.nvim', {'branch': 'release'} Plug 'neoclide/coc.nvim', {'branch': 'release'}
" exe 'source' (stdpath('config') . '/coc.vim') exe 'source' (stdpath('config') . '/coc.vim')
" Plug 'file://'.expand('~/Projects/coc-nvim-rs/') " Plug 'file://'.expand('~/Projects/coc-nvim-rs/')
Plug 'preservim/nerdtree' Plug 'preservim/nerdtree'
@ -36,9 +36,8 @@ Plug 'tomasiser/vim-code-dark'
" Plug 'godlygeek/tabular' " Plug 'godlygeek/tabular'
" Plug 'plasticboy/vim-markdown' " Plug 'plasticboy/vim-markdown'
" Plug 'wakatime/vim-wakatime' Plug 'wakatime/vim-wakatime'
" Plug 'aurieh/discord.nvim', { 'do': ':UpdateRemotePlugins'} " Plug 'aurieh/discord.nvim', { 'do': ':UpdateRemotePlugins'}
" Plug 'wakatime/vim-wakatime'
let g:go_fmt_command = 'goimports' let g:go_fmt_command = 'goimports'

View file

@ -13,6 +13,7 @@ ACTIVE=`nmcli con show --active | grep "$VPN"`
if [ -z "$ACTIVE" ] if [ -z "$ACTIVE" ]
then then
nmcli con up id "$VPN" nmcli con up id "$VPN"
notify-send "VPN $VPN" "Connected."
else else
nmcli con down id "$VPN" nmcli con down id "$VPN"
notify-send "VPN $VPN" "Disconnected." notify-send "VPN $VPN" "Disconnected."

View file

@ -0,0 +1,6 @@
[Desktop Entry]
Name=Onivim2
Exec=Oni2
Icon=Onivim2
Type=Application
Categories=Development;

View file

@ -1,14 +1,2 @@
#!/bin/bash #!/bin/bash
exec hydroxide serve
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 $@

View file

@ -1,3 +1,3 @@
[settings] [settings]
api_url=http://localhost:5800/api/v1/heartbeats.bulk api_url=http://localhost:5800/api/v1/heartbeats.bulk
api_key=ff283e70-f48e-4c0c-81a7-8ecb2ca5d0cf api_key=a2b783b6-f6ae-4a58-8cb8-63cc2921ac16

View file

@ -2,6 +2,7 @@
export PATH="$HOME/.cargo/bin:/usr/local/go/bin:$PATH" export PATH="$HOME/.cargo/bin:/usr/local/go/bin:$PATH"
export TERMINAL="/usr/bin/alacritty" export TERMINAL="/usr/bin/alacritty"
export EDITOR="/usr/bin/nvim" export EDITOR="/usr/bin/nvim"
export CUPS_SERVER="192.168.0.171:631"
if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]] if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]
then then

View file

@ -22,15 +22,16 @@ export DOTNET_CLI_TELEMETRY_OPTOUT=1
# export RUST_SRC_PATH="$(rustc --print sysroot)/lib/rustlib/src/rust/src" # export RUST_SRC_PATH="$(rustc --print sysroot)/lib/rustlib/src/rust/src"
export EDITOR=nvim export EDITOR=nvim
export MAILDIR=$HOME/Mail 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/.cargo/env
source_if_exists $HOME/.ghcup/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/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" [ -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 autoload -U compinit && compinit -u
# opam configuration # opam configuration

View file

@ -8,4 +8,10 @@ export SSH_AUTH_SOCK
eval $(ssh-agent) eval $(ssh-agent)
exec_if_exist() {
test -x $1 && $1
}
exec_if_exist $HOME/.screenlayout/regular.sh
exec i3 exec i3

View file

@ -6,6 +6,10 @@ Host hlab
User michael User michael
HostName 142.93.75.170 HostName 142.93.75.170
Host rpi
User michael
HostName 192.168.0.171
# sift # sift
Host l0 Host l0
User mzhang User mzhang