merged changes from server

This commit is contained in:
Andrei Stoica 2017-11-20 01:46:06 -05:00
commit 291b79f9a4
8 changed files with 243 additions and 49 deletions

View File

@ -6,12 +6,17 @@ alias gpwd='pwd | xclip -i -selection clipboard'
alias cdclip="cd \$(xclip -o -selection clipboard)"
alias clipi='xclip -i -selection clipboard'
alias clipo='xclip -o -selection clipboard'
alias ml='livestreamer --config ~/.livestreamerrc -v'
alias jblive='mpv rtmp://jblive.videocdn.scaleengine.net/jb-live/play/jblive.stream'
alias twit='livestreamer --config ~/.livestreamerrc -v http://www.ustream.tv/leolaporte'
alias glog='git log --pretty=format:"%C(auto) %h,%Cgreen \"%s\"%Creset, %aN,%Cblue %cD"'
alias antlr4='java -cp ~/antlr-4.6-complete.jar:. org.antlr.v4.Tool '
alias antlr4c='javac -cp ~/antlr-4.6-complete.jar:. '
alias grun='java -cp ~/antlr-4.6-complete.jar:. org.antlr.v4.runtime.misc.TestRig '
alias ssh-agent='ssh-agent -t 1h'
alias tm='tmux new-session -A -s sys'
alias ssh-home='ssh home-server'
alias tmh='ssh home-server -t "tmux new -A -s sys"'
alias tm='tmux new -A -s '
alias tms='tmux new -A -s sys'
alias hsfs='sshfs andrei@home-server:/utility /hsfs'
alias uhsfs='sudo umount /hsfs'
alias exfs='sudo zpool import external'
alias uexfs='sudo zpool export external'
alias ta='rsync -avr /home/andrei/CSCI_1060/ home-server:/home/andrei/backups/school/TA/CSCI_1060'
alias thesis='rsync -avz /home/andrei/Thesis/ home-server:~/Thesis'
alias socks='ssh -D 8081 -C -q -N home-server'
alias gmonitor='while [ true ] ; do nvidia-smi; nvidia-settings -q gpucoretemp | grep gpu; sensors| grep CPU; sleep 1; clear; done'

View File

@ -129,6 +129,8 @@ if ! shopt -oq posix; then
fi
fi
TERM=xterm-256color
# Junit setup
export JUNIT_HOME=/home/andrei/.junit
export CLASSPATH=$JUNIT_HOME/junit4.12.jar:$JUNIT_HOME/hamcrest-core-1.3.jar
@ -137,3 +139,9 @@ export CLASSPATH=$JUNIT_HOME/junit4.12.jar:$JUNIT_HOME/hamcrest-core-1.3.jar
export VISUAL=vim
export EDITOR="$VISUAL"
export PATH=/usr/local/cuda-8.0/bin${PATH:+:${PATH}}
export LD_LIBRARY_PATH=/usr/local/cuda-8.0/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
export LD_LIBRARY_PATH=/usr/local/cuda-8.0/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/cuda/lib64:/usr/lib/nvidia-384:/usr/local/cuda/extras/CUPTI/lib64"
export CUDA_HOME=/usr/local/cuda

View File

@ -0,0 +1,106 @@
// This file is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; version 2 of the License.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with this file. If not, see <http://www.gnu.org/licenses/>.
// Copyright (C) Jussi Schultink 2009
// Custom ChatView Colors
Palette { marker-line: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop:0 #ff0000, stop: 0.1 transparent); }
ChatView { background: #131313; }
ChatLine[label="highlight"] {
foreground: #debc85;
background: #00583a;
}
ChatLine::timestamp { foreground: #707c70; }
ChatLine#plain { foreground: #debc85; }
ChatLine#notice { foreground: #916409; }
ChatLine#action { foreground: #007a80; font-weight: bold; font-style: italic; }
ChatLine#nick { foreground: #633b5a; }
ChatLine#mode { foreground: #346E9E; font-weight: bold; }
ChatLine#join { foreground: #005538; }
ChatLine#part { foreground: #633b5a; }
ChatLine#quit { foreground: #683A38; }
ChatLine#kick { foreground: #633b5a; }
ChatLine#kill { foreground: #633b5a; }
ChatLine#server { foreground: #916409; }
ChatLine#info { foreground: #916409; }
ChatLine#error { foreground: #916409; }
ChatLine#daychange { foreground: #916409; }
ChatLine#topic { foreground: #633b5a; }
// Sender Colors
ChatLine::sender#plain[sender="self"] { foreground: #009966; }
ChatLine::sender#plain[sender="00"] { foreground: #e90d7f; }
ChatLine::sender#plain[sender="01"] { foreground: #8e55e9; }
ChatLine::sender#plain[sender="02"] { foreground: #b30e0e; }
ChatLine::sender#plain[sender="03"] { foreground: #17b339; }
ChatLine::sender#plain[sender="04"] { foreground: #58afb3; }
ChatLine::sender#plain[sender="05"] { foreground: #9d54b3; }
ChatLine::sender#plain[sender="06"] { foreground: #b39775; }
ChatLine::sender#plain[sender="07"] { foreground: #3176b3; }
ChatLine::sender#plain[sender="08"] { foreground: #e90d7f; }
ChatLine::sender#plain[sender="09"] { foreground: #8e55e9; }
ChatLine::sender#plain[sender="0a"] { foreground: #b30e0e; }
ChatLine::sender#plain[sender="0b"] { foreground: #17b339; }
ChatLine::sender#plain[sender="0c"] { foreground: #58afb3; }
ChatLine::sender#plain[sender="0d"] { foreground: #9d54b3; }
ChatLine::sender#plain[sender="0e"] { foreground: #b39775; }
ChatLine::sender#plain[sender="0f"] { foreground: #3176b3; }
// BufferView Colors
ChatListItem { foreground: #debc85; }
ChatListItem[state="inactive"] { foreground: #a0a0a4; }
ChatListItem[state="channel-event"] { foreground: #008000; }
ChatListItem[state="unread-message"] { foreground: #ff7b00; }
ChatListItem[state="highlighted"] { foreground: #ff00bf; }
BufferView { background: #131313; }
// NickView Colors
NickListItem[type="category"] { foreground: #debc85; }
NickListItem[type="user"] { foreground: #debc85; }
NickListItem[type="user", state="away"] { foreground: #a0a0a4; }
NickView { background: #131313; }
MultiLineEdit { background: #131313; color: #debc85; }
StyledLabel#topicLabel { background: #131313; }
ChatLine#topic { foreground: #debc85; }
// Miscellaneous Colors
QTreeView::item:selected { color: #00004b; }
ChatMonitorSettingsPage BufferView::item { color: #debc85; }QTreeView#settingsTree { background: #131313; }
QTreeView::item#settingsTree { color: #debc85; }
QLineEdit:enabled { background: #131313; color: #debc85; }
QSpinBox:enabled { background: #131313; color: #debc85; }
QTableWidget { background-color: #131313; color: #debc85; }
QListWidget { background-color: #131313; color: #debc85; }
QTableView {
alternate-background-color: #42403B;
background-color: #42403B;
color: #debc85; }
Palette {
link: #539FA3; link-visited: #845B90;
window: #2b2b2b; window-text: #debc85; text: #00004b;
light: #B7B4AC; midlight: #debc85; button: #292929;
mid: #202553; dark: #000533; button-text: #B6B3AB; }
StyledLabel#topicLabel { background: #282828; }
MultiLineEdit { background: #131313; color: #debc85; }

View File

@ -0,0 +1,33 @@
// Style settings made in Quassel's configuration dialog
// This file is automatically generated, do not edit
// Custom ChatView Colors
Palette { marker-line: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ff0000, stop: 0.1 transparent); }
ChatView { background: #ffffff; }
ChatLine[label="highlight"] {
foreground: #000000;
background: #ff8000;
}
ChatLine::timestamp { foreground: #707c70; }
ChatLine#plain { foreground: #3a3a3a; }
ChatLine#notice { foreground: #916409; }
ChatLine#action { foreground: #0000c3; }
ChatLine#nick { foreground: #931293; }
ChatLine#mode { foreground: #931293; }
ChatLine#join { foreground: #931293; }
ChatLine#part { foreground: #931293; }
ChatLine#quit { foreground: #931293; }
ChatLine#kick { foreground: #931293; }
ChatLine#kill { foreground: #931293; }
ChatLine#server { foreground: #916409; }
ChatLine#info { foreground: #916409; }
ChatLine#error { foreground: #916409; }
ChatLine#daychange { foreground: #916409; }
ChatLine#topic { foreground: #931293; }
ChatLine#netsplit-join { foreground: #931293; }
ChatLine#netsplit-quit { foreground: #931293; }
ChatLine#invite { foreground: #931293; }

View File

@ -10,43 +10,35 @@ override_utf8_locale yes
#| SF: ${tztime US/Pacific %H:%M} | Free: $memfree | ${exec /home/andrei/.i3/pacvol.sh display} | $downspeed $upspeed | ${smapi_bat_perc 0}% ${smapi_bat_power 0} | CPU $cpu% [ ${cpu cpu1}.${cpu cpu2}.${cpu cpu3}.${cpu cpu4} ] | ${time %a %d %b | %H:%M} |
template1 ${if_match "${battery_short \1}"=="U"} ${battery_short \1} ${battery_percent \1}% $else ${battery_short \1} $endif
template0 {"full_text": " \1 ${template1 BAT0}/${template1 BAT1}","color":\2}
template1 ${if_match "${battery_short \1}"=="U"} ${battery_short \1} ${battery_percent}% $else ${battery_short \1} $endif
template0 {"full_text": " \1 %$battery_percent ","color":\2}
TEXT
,[{"full_text": " "},
{"full_text": " ▣ $cpu% [${cpu cpu1}.${cpu cpu2}.${cpu cpu3}.${cpu cpu4}] ","color": "\#99D7FF", "name":"cpu"},
{"full_text": " 🌡${exec sensors | awk '/Physical id 0/ {print substr($0,index($0,":")+2,index($0,"°")-index($0,":"))}' } ","color": "\#FB4646", "name":"temp"},
{"full_text": " 🌡 ${exec sensors | awk '/Package id 0/ {print substr($0,index($0,":")+2,index($0,"°")-index($0,":"))}' } ","color": "\#FB4646", "name":"temp"},
# {"full_text": " ☼ ${exec /home/andrei/.i3/blevel.sh} ","color": "\#DFD60C", "name":"bright"},
# {"full_text": " ${fs_free /} (${fs_free_perc /}%)", "color":"\#E98F15"},
{"full_text": " ${exec free -m | grep Mem | awk '{print $1, $3}'}", "color":"\#F3D194"},
{"full_text": " ${exec /home/andrei/.i3/pacvol.sh display} ","color":"\#6AFFD8", "name":"volume"},
# {"full_text": " $downspeed $upspeed ", "color":"\#FFFE6A"},
# ${if_existing /sys/class/power_supply/AC/online 0}
# ${if_match ${battery_percent BAT0} <= 20}
# ${if_match ${battery_percent BAT1} <= 20}
# ${template0 🔋 "\\#FF0000"},
# ${execi 120 notify-send -t 2000 -i "/usr/share/icons/Numix/status/48/battery-low.svg" "Battery Low"}
# $else
# ${template0 🔋 "\\#94F397"},
# $endif
# $else
# ${template0 🔋 "\\#94F397"},
# $endif
# $else
# ${template0 🔌 "\\#94F397"},
# $endif
${if_existing /sys/class/power_supply/AC/online 0}
${if_match ${battery_percent} <= 20}
${template0 🔋 "\\#FF0000"},
${execi 120 notify-send -t 2000 -i "/usr/share/icons/Pop/48x48/status/battery-empty.svg" "Battery Low"}
$else
${template0 🔋 "\\#94F397"},
$endif
$else
${template0 🔌 "\\#94F397"},
$endif
${if_existing /sys/class/net/enp0s25/operstate up}
{"full_text": "🜷", "color": "\#8BADF9"},
${endif}
${if_existing /sys/class/net/wlp3s0/operstate up}
{"full_text": " 📡 ${wireless_link_qual_perc wlp3s0}%", "color": "\#8BADF9"},
${if_up wlp2s0}
{"full_text": " 📡 ${upspeed wlp2s0}:${downspeed wlp2s0}", "color": "\#8BADF9"},
${endif}
{"full_text": " ${execi 1800 /home/andrei/.i3/update_count.sh} ", "name":"updates"},
# {"full_text": " Ft: ${tztime Europe/Berlin %H:%M} ","color": "\#909090"},
# {"full_text": " ${weather http://weather.noaa.gov/pub/data/observations/metar/stations/ EDDF temperature}° ${weather http://weather.noaa.gov/pub/data/observations/metar/stations/ EDDF cloud_cover} "},
# {"full_text": " ${weather http://weather.noaa.gov/pub/data/observations/metar/stations/ KOAK temperature}° ${weather http://weather.noaa.gov/pub/data/observations/metar/stations/ KOAK cloud_cover} "},
# {"full_text": " 🎧 ${exec /home/andrei/.i3/gmusicsong.pm}", "color": "\#FF905C", "name":"music"},
{"full_text": " ${time %a %d %b} ", "name":"date"},
{"full_text": " ${time %H:%M} "},

View File

@ -9,7 +9,7 @@
#
# Please see http://i3wm.org/docs/userguide.html for a complete reference!
set $mod Mod4
set $mod mod4
# Font for window titles. Will also be used by the bar unless a different font
# is used in the bar {} block below. ISO 10646 = Unicode
@ -24,18 +24,18 @@ set $mod Mod4
floating_modifier $mod
# set up gaps
gaps inner 14
#gaps inner 14
for_window [class="^.*"] border pixel 1
# start a terminal
bindsym $mod+Shift+Return exec terminator
bindsym $mod+Shift+Return exec gnome-terminal
# goto terminal
bindsym $mod+Return [class="^Terminator$"] focus
# start a browser window
bindsym $mod+Shift+b exec chromium
bindsym $mod+Shift+b exec vivaldi
# goto browser
bindsym $mod+b [window_role="^browser$"] focus
@ -53,7 +53,7 @@ bindsym $mod+s [class = "^Skype$"] focus
bindsym $mod+t [class = "^TeamSpeak 3$"] focus
# goto hexchat
bindsym $mod+c [class = "^Hexchat$"] focus
bindsym $mod+c [class = "^Slack"] focus
# kill focused window
bindsym $mod+Shift+q kill
@ -105,7 +105,6 @@ bindsym $mod+e layout toggle split
# toggle tiling / floating
bindsym $mod+Shift+space floating toggle
# change focus between tiling / floating windows
bindsym $mod+space focus mode_toggle
@ -146,7 +145,7 @@ bindsym $mod+Shift+r restart
# exit i3 (logs you out of your X session)
bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
# lock using i3lock
bindsym Ctrl+Break exec "i3lock -i '/home/andrei/Pictures/pcmr dye.png' -t"
bindsym Ctrl+Shift+l exec "i3lock -c 383A3B"
# suspend with lock
bindsym Shift+Ctrl+Break exec ~/.i3/suspend.sh
# shutdown computer
@ -192,7 +191,7 @@ mode "resize" {
bindsym $mod+r mode "resize"
# Volume controls
set $sink `pactl list short sinks | grep RUNNING | cut -f1`
set $sink `pactl list short sinks | grep alsa_output.pci-0000_00_1f.3.analog-stereo | cut -f1`
bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume $sink +1%
bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume $sink -1%
bindsym Shift+XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume $sink +10%
@ -205,6 +204,10 @@ bindsym XF86AudioStop exec playerctl stop
bindsym XF86AudioNext exec playerctl next
bindsym XF86AudioPrev exec playerctl previous
# Sreen brightness controls
bindsym XF86MonBrightnessUp exec xbacklight -inc 20 # increase screen brightness
bindsym XF86MonBrightnessDown exec xbacklight -dec 20 # decrease screen brightness
#scrot focused window
bindsym Print exec scrot -u -e 'mv $f ~/Dropbox/Pictures/Screenshots/'
@ -230,18 +233,18 @@ bindsym $mod+mod1+Right move workspace to output right
popup_during_fullscreen smart
# setup display
exec xrandr --output DP-0 -- primary --rotate left
exec xrandr --output HDMI-0 --right-of DP-0
exec xrandr --output HDMI-0 --pos 1441x1000
exec xrandr --dpi 220
#exec xrandr --output DP-0 -- primary --rotate left
#exec xrandr --output HDMI-0 --right-of DP-0
#exec xrandr --output HDMI-0 --pos 1441x1000
# set the background
exec feh --bg-fill "/home/andrei/Pictures/ArchGate2.png"
#exec feh --bg-fill "/home/andrei/Pictures/ArchGate2.png"
exec --no-startup-id compton --config ~/.comptonrc
# setup coding workspace
exec --no-startup-id i3-msg "workspace 1:Coding; exec terminator"
exec --no-startup-id i3-msg "workspace 1:Coding; exec terminator"
exec --no-startup-id i3-msg "workspace 1:Coding; exec "
# open a web browser

View File

@ -18,6 +18,9 @@ unbind '"'
bind | split-window -h
bind - split-window -v
# sync panes
bind S setw synchronize-panes
# setting vi mode
set-window-option -g mode-keys vi
@ -25,5 +28,5 @@ set-window-option -g mode-keys vi
set -g status-right '♥#(acpi | cut -d ',' -f 2) | %H:%m %d-%b-%y '
# default shell
set -g default-terminal "screen-256color" /bin/bash
#set -g default-terminal "screen-256color" /bin/bash
#set-option -g default-shell /bin/bash

46
.vimrc
View File

@ -1,3 +1,38 @@
set nocompatible " be iMproved, required
filetype off " required
" set the runtime path to include Vundle and initialize
set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin()
" alternatively, pass a path where Vundle should install plugins
"call vundle#begin('~/some/path/here')
" let Vundle manage Vundle, required
Plugin 'VundleVim/Vundle.vim'
Plugin 'scrooloose/nerdtree'
Plugin 'itchyny/lightline.vim'
Plugin 'airblade/vim-gitgutter'
Plugin 'altercation/vim-colors-solarized'
Plugin 'kannokanno/previm'
" All of your Plugins must be added before the following line
call vundle#end() " required
filetype plugin indent on " required
" To ignore plugin indent changes, instead use:
"filetype plugin on
"
" Brief help
" :PluginList - lists configured plugins
" :PluginInstall - installs plugins; append `!` to update or just :PluginUpdate
" :PluginSearch foo - searches for foo; append `!` to refresh local cache
" :PluginClean - confirms removal of unused plugins; append `!` to auto-approve removal
"
" see :h vundle for more details or wiki for FAQ
" Put your non-Plugin stuff after this line
set number
set linebreak
set showbreak=+++
@ -17,8 +52,17 @@ set ruler
set undolevels=1000
set backspace=indent,eol,start
set colorcolumn=80
" lastline plugin config
set laststatus=2
" colorscheme
syntax enable
"set background=dark
"colorscheme solarized
highlight colorcolumn ctermbg=grey ctermfg=blue
highlight OverLength ctermbg=red ctermfg=white
match OverLength /\%>80v.\+/
filetype plugin on
syntax on
nmap ne :NERDTreeToggle<cr>