aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--bash/.bashrc15
-rw-r--r--i3/.config/i3/config4
-rw-r--r--vim/.vim/after/ftplugin/tr.vim2
-rw-r--r--vim/.vim/ftplugin/haskell.vim7
-rw-r--r--vim/.vim/ftplugin/nroff.vim3
-rw-r--r--vim/.vim/ftplugin/rst.vim5
-rw-r--r--vim/.vimrc5
8 files changed, 39 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 5d9095b..c51a51e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
vim/.vim/.netrwhist
+newsboat/.newsboat/queue
+newsboat/.newsboat/history.*
+newsboat/.newsboat/cache.db
diff --git a/bash/.bashrc b/bash/.bashrc
index f1463cc..dc18213 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -12,6 +12,19 @@ HISTFILESIZE=8000
alias ls='ls --color=auto'
alias ll='ls -laF'
+alias landmark='cd /home/tje/Documents/landmark'
+alias embed='landmark && cd CS2771'
+alias os='landmark && cd CS3871'
+alias web='landmark && cd CSC2621'
+alias mobile='landmark && cd CSC2636'
+alias pol='landmark && cd POL1011'
+alias art='landmark && cd HIS1031'
+
+alias school='cd /home/tje/Documents/clarkson'
+alias fa='school && cd CS345'
+alias pl='school && cd CS341'
+alias phys='school && cd PH131'
+alias calc='school && cd MA131'
alias xcopy='xclip -selection clipboard'
alias xpaste='xclip -selection clipboard -o'
@@ -55,3 +68,5 @@ GIT_PROMPT_THEME_FILE=~/.git-prompt-colors.sh
source /home/tje/.git-prompt/gitprompt.sh
+alias dwarf="/home/tje/Downloads/programs/df_linux/df"
+alias tele="telegram -k /home/tje/Downloads/programs/tg/tg-server.pub"
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index f849312..0d82aa3 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -30,7 +30,7 @@ font pango: Courier 8
floating_modifier $mod
# start a terminal
- bindsym $mod+Return exec uxterm
+ bindsym $mod+Return exec st
# kill focused window
bindsym $mod+Shift+q kill
@@ -158,7 +158,7 @@ bindsym $mod+r mode "resize"
# client.urgent #F6F6F2 #9A4C4C #BCBFCD
bar {
- status_command i3status
+ status_command LC_ALL=C i3status
separator_symbol " | "
font pango: GohuFonmmmt 10
# colors {
diff --git a/vim/.vim/after/ftplugin/tr.vim b/vim/.vim/after/ftplugin/tr.vim
deleted file mode 100644
index 3098f3d..0000000
--- a/vim/.vim/after/ftplugin/tr.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-set spell
-autocmd BufWritePost * !pic % | tbl | eqn | troff -ms | grops > %:r.ps
diff --git a/vim/.vim/ftplugin/haskell.vim b/vim/.vim/ftplugin/haskell.vim
new file mode 100644
index 0000000..b0ce109
--- /dev/null
+++ b/vim/.vim/ftplugin/haskell.vim
@@ -0,0 +1,7 @@
+" Tab specific option
+set tabstop=8 "A tab is 8 spaces
+set expandtab "Always uses spaces instead of tabs
+set softtabstop=4 "Insert 4 spaces when tab is pressed
+set shiftwidth=4 "An indent is 4 spaces
+set shiftround "Round indent to nearest shiftwidth multiple
+
diff --git a/vim/.vim/ftplugin/nroff.vim b/vim/.vim/ftplugin/nroff.vim
new file mode 100644
index 0000000..fd5afa6
--- /dev/null
+++ b/vim/.vim/ftplugin/nroff.vim
@@ -0,0 +1,3 @@
+set spell
+
+autocmd BufWritePost * silent! execute "!grap % | pic | tbl | eqn | troff -ms | grops > %:r.ps" | redraw!
diff --git a/vim/.vim/ftplugin/rst.vim b/vim/.vim/ftplugin/rst.vim
new file mode 100644
index 0000000..4403a97
--- /dev/null
+++ b/vim/.vim/ftplugin/rst.vim
@@ -0,0 +1,5 @@
+" Tab specific option
+set tabstop=8 "A tab is 8 spaces
+set noexpandtab "Always uses spaces instead of tabs
+set shiftwidth=2 "An indent is 4 spaces
+
diff --git a/vim/.vimrc b/vim/.vimrc
index 1fc49ff..1f8075c 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -12,13 +12,16 @@ set spell
set tw=70
set ruler
+set encoding=utf-8
+
+
set list
set listchars=eol:\ ,tab:\|\ ,trail:~,extends:>,precedes:<,space:ยท
map K i<enter><esc>
map W <esc>:WordCount<enter>
-colorscheme moonfly
+colorscheme default
au BufRead,BufNewFile *.go set filetype=go
au BufRead,BufNewFile *.ldg set filetype=ledger