Merge branch 'master' of vaes.uk:public/dotfiles

5 files changed, 90 insertions, 1 deletions

diff --git a/bin/bin/references b/bin/bin/references
new file mode 100755
index 0000000..a578728
--- /dev/null
+++ b/bin/bin/references
@@ -0,0 +1,5 @@
+#!/bin/bash
+REF_DIR="$HOME/phd/references"
+PDF=$(locate "$REF_DIR/**/*.pdf")
+TARGET=$(echo "${PDF//"$REF_DIR/"/}" | dmenu -i -p "Open File:")
+[[ -n $TARGET ]] && zathura "$REF_DIR/$TARGET" &
diff --git a/conky/.config/conky/conky.conf b/conky/.config/conky/conky.conf
new file mode 100644
index 0000000..5499b07
--- /dev/null
+++ b/conky/.config/conky/conky.conf
@@ -0,0 +1,82 @@
+-- vim: ts=4 sw=4 noet ai cindent syntax=lua
+--[[
+Conky, a system monitor, based on torsmo
+
+Any original torsmo code is licensed under the BSD license
+
+All code written since the fork of torsmo is licensed under the GPL
+
+Please see COPYING for details
+
+Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
+Copyright (c) 2005-2012 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
+All rights reserved.
+
+This program 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, either version 3 of the License, or
+(at your option) any later version.
+
+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 program.  If not, see <http://www.gnu.org/licenses/>.
+]]
+
+conky.config = {
+    alignment = 'top_right',
+    background = true,
+    border_width = 1,
+    cpu_avg_samples = 2,
+    default_color = 'white',
+    default_outline_color = 'white',
+    default_shade_color = 'white',
+    double_buffer = true,
+    draw_borders = false,
+    draw_graph_borders = true,
+    draw_outline = false,
+    draw_shades = false,
+    use_xft = true,
+    font = 'DejaVu Sans Mono:size=12',
+    gap_x = 10,
+    gap_y = 10,
+    minimum_height = 5,
+    minimum_width = 5,
+    net_avg_samples = 2,
+    no_buffers = true,
+    out_to_console = false,
+    out_to_stderr = false,
+    extra_newline = false,
+    own_window = false,
+    stippled_borders = 0,
+    update_interval = 1.0,
+    uppercase = false,
+    use_spacer = 'none',
+    show_graph_scale = false,
+    show_graph_range = false
+}
+
+conky.text = [[
+$hr
+${color grey}Uptime:$color $uptime
+${color grey}Frequency (in MHz):$color $freq
+${color grey}Frequency (in GHz):$color $freq_g
+${color grey}RAM Usage:$color $mem/$memmax - $memperc% ${membar 4}
+${color grey}Swap Usage:$color $swap/$swapmax - $swapperc% ${swapbar 4}
+${color grey}CPU Usage:$color $cpu% ${cpubar 4}
+${color grey}Processes:$color $processes  ${color grey}Running:$color $running_processes
+$hr
+${color grey}File systems:
+ / $color${fs_used /}/${fs_size /} ${fs_bar 6 /}
+ /home $color${fs_used /home}/${fs_size /home} ${fs_bar 6 /home}
+${color grey}Networking:
+Up:$color ${upspeed eth0} ${color grey} - Down:$color ${downspeed eth0}
+$hr
+${color grey}Name              PID   CPU%   MEM%
+${color lightgrey} ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1}
+${color lightgrey} ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2}
+${color lightgrey} ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3}
+${color lightgrey} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4}
+]]
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index d6e36ca..a1b28cb 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -9,7 +9,7 @@ bind s send-prefix
 unbind r
 bind r source-file ~/.tmux.conf
 
-set -s escape-time 0
+set -sg escape-time 0
 set-option -g allow-rename off
 
 is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?)(diff)?$"'
diff --git a/vim/.vimrc b/vim/.vimrc
index 3ffe129..f8192d8 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -28,6 +28,7 @@ Plug 'justinmk/vim-dirvish'
 Plug 'justinmk/vim-sneak'
 Plug 'klen/python-mode'
 Plug 'lervag/vimtex'
+Plug 'LnL7/vim-nix'
 Plug 'majutsushi/tagbar'
 Plug 'mhinz/vim-startify'
 Plug 'mhinz/vim-grepper'
diff --git a/xinit/.xinitrc b/xinit/.xinitrc
index d978132..5ae3595 100755
--- a/xinit/.xinitrc
+++ b/xinit/.xinitrc
@@ -28,5 +28,6 @@ eval $(ssh-agent)
 nm-applet &
 dropbox &
 dunst &
+conky
 
 exec i3