fixed pushall script + update

diff --git a/.bashrc b/.bashrc
index e1d7e6b..f52a230 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -33,7 +33,7 @@ export WM="dwm"
 
 # aliaseseses
 alias ls='ls --color=auto'
 
 # aliaseseses
 alias ls='ls --color=auto'

-alias git-pushall='git-pushall ' # for alias chaining
+# alias git-pushall='git-pushall ' # for alias chaining

 alias dotfiles='git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
 alias suckless-clean='make clean && rm -rf config.h && git reset --hard home/master'
 alias musicdl="youtube-dl -f bestaudio"
 alias dotfiles='git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
 alias suckless-clean='make clean && rm -rf config.h && git reset --hard home/master'
 alias musicdl="youtube-dl -f bestaudio"

diff --git a/.config/taskell/bindings.ini b/.config/taskell/bindings.ini
index 0d5eba6..afc4531 100644 (file)
--- a/.config/taskell/bindings.ini
+++ b/.config/taskell/bindings.ini
@@ -47,6 +47,5 @@ moveMenu = m
 # lists
 listNew = N
 listEdit = E
 # lists
 listNew = N
 listEdit = E

-listDelete = X

 listRight = >
 listLeft = <
 listRight = >
 listLeft = <

diff --git a/.vim/mysnippets/tex.snippets b/.vim/mysnippets/tex.snippets
index f19a2de..9ee0f20 100644 (file)
--- a/.vim/mysnippets/tex.snippets
+++ b/.vim/mysnippets/tex.snippets
@@ -139,6 +139,30 @@ snippet tan "Tan" w
 \tan($1)
 endsnippet
 
 \tan($1)
 endsnippet
 

+snippet asin "Arcsin" w
+\sin^{-1}($1)
+endsnippet
+
+snippet acos "Arccos" w
+\cos^{-1}($1)
+endsnippet
+
+snippet atan "Arctan" w
+\tan^{-1}($1)
+endsnippet
+
+snippet sins "Sin Squared" w
+\sin^{2}($1)
+endsnippet
+
+snippet coss "Cos Squared" w
+\cos^{2}($1)
+endsnippet
+
+snippet tans "Tan Squared" w
+\tan^{2}($1)
+endsnippet
+

 snippet cis "Cis" w
 \mathrm{cis}($1)
 endsnippet
 snippet cis "Cis" w
 \mathrm{cis}($1)
 endsnippet

diff --git a/.vim/templates/skeleton.rkt b/.vim/templates/skeleton.rkt
new file mode 100644 (file)
index 0000000..6f1f7b4
--- /dev/null
+++ b/.vim/templates/skeleton.rkt
@@ -0,0 +1 @@
+#lang racket

diff --git a/.vimrc b/.vimrc
index db42bdc..f1faf02 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -9,13 +9,11 @@
 syntax on
 set number
 set relativenumber
 syntax on
 set number
 set relativenumber

-" set hlsearch

 set incsearch
 set encoding=utf-8
 set tabstop=4
 set shiftwidth=4
 set expandtab
 set incsearch
 set encoding=utf-8
 set tabstop=4
 set shiftwidth=4
 set expandtab

-" set formatoptions-=cro "disables auto comments (not working rn)

 
 " spell check
 setlocal spell
 
 " spell check
 setlocal spell


@@ -47,6 +45,8 @@ hi SpellBad ctermfg=Red ctermbg=Black cterm=underline
 " Templates
 augroup templates
     autocmd BufNewFile *.tex 0r ~/.vim/templates/skeleton.tex
 " Templates
 augroup templates
     autocmd BufNewFile *.tex 0r ~/.vim/templates/skeleton.tex

+    autocmd BufNewFile *.html 0r ~/.vim/templates/skeleton.html
+    autocmd BufNewFile *.rkt 0r ~/.vim/templates/skeleton.rkt

 augroup END
 
 " vim plug
 augroup END
 
 " vim plug

diff --git a/.xinitrc b/.xinitrc
new file mode 100644 (file)
index 0000000..99ba04c
--- /dev/null
+++ b/.xinitrc
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+#           _       _ _
+#     __  _(_)_ __ (_) |_ _ __ ___
+#     \ \/ / | '_ \| | __| '__/ __|
+#    _ >  <| | | | | | |_| | | (__
+#   (_)_/\_\_|_| |_|_|\__|_|  \___|
+#
+ 
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+
+# merge in defaults and keymaps
+[ -f "$sysresources" ] && xrdb -merge "$sysresources"
+[ -f "$sysmodmap" ] && xmodmap "$sysmodmap"
+[ -f "$userresources" ] && xrdb -merge "$userresources"
+[ -f "$usermodmap" ] && xmodmap "$usermodmap"
+
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+ for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+  [ -x "$f" ] && . "$f"
+ done
+ unset f
+fi
+
+# bg
+feh --bg-scale "$(ls -d $HOME/Downloads/wallpapers/active/* | sort -R | tail -n1)"
+
+# ibus
+export GTK_IM_MODULE=ibus
+export XMODIFIERS=@im=ibus
+export QT_IM_MODULE=ibus
+ibus-daemon -drx
+
+# start some daemons
+tiramisu -j | notify &
+acpi_listen &
+redshift -l 55.7:12.6 -t 3000:3000 -g 0.85 -m randr -v &
+sxhkd &
+mpd &
+mpd-change &
+xbanish &
+picom &
+dwmblocks &
+#syncthing &
+
+exec dwm
+# while true; do
+#     /usr/local/bin/dwm 2> /dev/null
+# done
+

diff --git a/Scripts/fzfutil b/Scripts/fzfutil
index 3ecdea6..142042f 100755 (executable)
--- a/Scripts/fzfutil
+++ b/Scripts/fzfutil
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-fuzzy_dirs="$HOME/Scripts/* $HOME/School/* $HOME/.vim/mysnippets/* $HOME/.bashrc $HOME/.xinitrc $HOME/.Xresources $HOME/.Xmodmap $HOME/.config/* $HOME/Repos/* $HOME/installs/*"
+fuzzy_dirs="$HOME/Scripts/* $HOME/School/* $HOME/.vim/mysnippets/* $HOME/.bashrc $HOME/.xinitrc $HOME/.Xresources $HOME/.Xmodmap $HOME/.config/* $HOME/Repos/* $HOME/Installs/*"

 
 fvi() { 
     [ -z "$1" ] && search="$fuzzy_dirs" || search="$1"
 
 fvi() { 
     [ -z "$1" ] && search="$fuzzy_dirs" || search="$1"

diff --git a/Scripts/git-pushall b/Scripts/git-pushall
index 0d7def6..311da79 100755 (executable)
--- a/Scripts/git-pushall
+++ b/Scripts/git-pushall
@@ -4,13 +4,21 @@
 # e.g
 # git-pushall git --git-dir=$HOME/.dotfiles --work-tree=$HOME
 
 # e.g
 # git-pushall git --git-dir=$HOME/.dotfiles --work-tree=$HOME
 

-cmd="$@"
-[ -z "$cmd" ] && cmd="git"
+# cmd="$@"
+# [ -z "$cmd" ] && cmd="git"

 
 

-config_path="$($cmd config --local -l)" 2>/dev/null
+# config_path="$($cmd config --local -l)" 2>/dev/null
+# [ ! "$?" = 0 ] && echo "Failed: not a git repo." && exit 1
+
+# echo "$config_path" | grep '^remote.*.url=' |\
+#     sed 's/^remote.*.url=//' |\
+#     xargs printf "$cmd push %s master\n" |\
+
+[ -z "$1" ] && echo "Please provide a branch to push to" && exit 1
+
+config_path="$(git config --local -l)" 2>/dev/null

 [ ! "$?" = 0 ] && echo "Failed: not a git repo." && exit 1
 
 echo "$config_path" | grep '^remote.*.url=' |\
     sed 's/^remote.*.url=//' |\
 [ ! "$?" = 0 ] && echo "Failed: not a git repo." && exit 1
 
 echo "$config_path" | grep '^remote.*.url=' |\
     sed 's/^remote.*.url=//' |\

-    xargs printf "$cmd push %s master\n" |\
-
+    xargs -I _ git push _ "$1"