aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xScripts/.config/Scripts/launch_polybar.sh20
-rwxr-xr-xScripts/.config/Scripts/lock.sh2
-rwxr-xr-xScripts/.config/Scripts/startdwm44
-rwxr-xr-xScripts/.config/Scripts/suckmerge9
-rw-r--r--Scripts/.config/lock.pngbin0 -> 5016 bytes
-rwxr-xr-xbspwm/.config/bspwm/bspwmrc2
-rw-r--r--bspwm/.config/sxhkd/sxhkdrc3
-rw-r--r--compton/.config/compton.conf2
m---------dwm/dwm0
-rw-r--r--polybar/.config/polybar/mybar5
-rw-r--r--profile/.bashrc1
-rw-r--r--profile/.xinitrc4
-rw-r--r--zsh/.zsh_history147
-rw-r--r--zsh/.zshrc134
14 files changed, 357 insertions, 16 deletions
diff --git a/Scripts/.config/Scripts/launch_polybar.sh b/Scripts/.config/Scripts/launch_polybar.sh
index 9ef7345..245a8bb 100755
--- a/Scripts/.config/Scripts/launch_polybar.sh
+++ b/Scripts/.config/Scripts/launch_polybar.sh
@@ -8,13 +8,15 @@ killall -q polybar
while pgrep -x polybar >/dev/null; do sleep 1; done
# Launch in all monitors
-MONS=$(polybar -m | sed -e 's/:.*$//g')
-for MON in ${MONS[@]}
-do
- #echo $MON
- MONITOR=$MON polybar mybar -q -c ~/.config/polybar/mybar &
- echo $MONITOR
- #polybar example
-done
+#MONS=$(polybar -m | sed -e 's/:.*$//g')
+#for MON in ${MONS[@]}
+#do
+# #echo $MON
+# MONITOR=$MON polybar mybar -q -c ~/.config/polybar/mybar &
+# echo $MONITOR
+# #polybar example
+#done
-echo "Bar launched..."
+#echo "Bar launched..."
+
+MONITOR="LVDS-1" polybar mybar -q -c ~/.config/polybar/mybar &
diff --git a/Scripts/.config/Scripts/lock.sh b/Scripts/.config/Scripts/lock.sh
index b812302..adaf31a 100755
--- a/Scripts/.config/Scripts/lock.sh
+++ b/Scripts/.config/Scripts/lock.sh
@@ -3,6 +3,6 @@ scrot /tmp/screen.png
#convert /tmp/screen.png -scale 10% -scale 1000% /tmp/screen.png
#convert /tmp/screen.png -paint 3 -modulate 80 /tmp/screen.png
convert /tmp/screen.png -paint 3 /tmp/screen.png
-[[ -f ~/.config/$1/lock.png ]] && convert /tmp/screen.png ~/.config/$1/lock.png -gravity center -composite -matte /tmp/screen.png
+[[ -f ~/.config/lock.png ]] && convert /tmp/screen.png ~/.config/lock.png -gravity center -composite -matte /tmp/screen.png
mocp -P
i3lock -u -e -i /tmp/screen.png
diff --git a/Scripts/.config/Scripts/startdwm b/Scripts/.config/Scripts/startdwm
new file mode 100755
index 0000000..8bf41c5
--- /dev/null
+++ b/Scripts/.config/Scripts/startdwm
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+function run {
+ SERVICE="$@"
+ RUNNING=$(ps aux | grep -v grep | grep "$SERVICE")
+ if [ "${RUNNING:-null}" = null ];
+ then
+ $@ &
+ fi
+}
+
+
+setxkbmap -layout us -variant altgr-intl -option caps:escape
+xmodmap -e "keycode 135 = Super_R"
+run mpd
+run nm-applet
+run compton
+run wal -i ~/.config/wall1.jpg
+run synclient TouchpadOff=1
+run /usr/bin/xflux -l 43.6404 -g -79.3995
+run ~/.config/Scripts/screen.sh d
+run st -c email -e neomutt
+run firefox
+run keepassxc
+amixer -c 0 set Headphone 100% unmute
+#run dropbox
+
+disk_used=$(df -hl --total / | awk '{print $5}' | sed -n 2p)
+
+while true; do
+ disk_used=$(df -hl --total / | awk '{print $5}' | sed -n 2p)
+ sleep 60s
+done &
+while true; do
+ vol=$(pamixer --get-volume)
+ xsetroot -name "/: ${disk_used} || V:${vol} || $(date)"
+ sleep 3
+done &
+while true; do
+ # Log stderror to a file
+ dwm 2> ~/.dwm.log
+ # No error logging
+ #dwm >/dev/null 2>&1
+done
diff --git a/Scripts/.config/Scripts/suckmerge b/Scripts/.config/Scripts/suckmerge
new file mode 100755
index 0000000..ccb4f62
--- /dev/null
+++ b/Scripts/.config/Scripts/suckmerge
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+#suckdiff &&
+git reset --hard origin/master &&
+for branch in $(git for-each-ref --format='%(refname)' refs/heads/ | cut -d'/' -f3); do
+ if [ "$branch" != "master" ];then
+ git merge $branch -m $branch
+ fi
+done
+make && sudo make clean install
diff --git a/Scripts/.config/lock.png b/Scripts/.config/lock.png
new file mode 100644
index 0000000..cd8b228
--- /dev/null
+++ b/Scripts/.config/lock.png
Binary files differ
diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
index 6fe4a03..5bdce90 100755
--- a/bspwm/.config/bspwm/bspwmrc
+++ b/bspwm/.config/bspwm/bspwmrc
@@ -15,7 +15,7 @@ else
fi
bspc config border_width 0
-bspc config window_gap 35
+bspc config window_gap 0
bspc config split_ratio 0.52
bspc config borderless_monocle true
diff --git a/bspwm/.config/sxhkd/sxhkdrc b/bspwm/.config/sxhkd/sxhkdrc
index dc636fd..7fbcded 100644
--- a/bspwm/.config/sxhkd/sxhkdrc
+++ b/bspwm/.config/sxhkd/sxhkdrc
@@ -31,6 +31,9 @@ super + BackSpace
super + shift + BackSpace
shutdown now
+alt + space
+ polybar-msg cmd toggle
+
#
# bspwm hotkeys
#
diff --git a/compton/.config/compton.conf b/compton/.config/compton.conf
index 4dc905b..866095c 100644
--- a/compton/.config/compton.conf
+++ b/compton/.config/compton.conf
@@ -1,5 +1,5 @@
# Shadow
-shadow = true;
+shadow = false;
no-dnd-shadow = true;
no-dock-shadow = true;
clear-shadow = false;
diff --git a/dwm/dwm b/dwm/dwm
new file mode 160000
+Subproject cfccc30109914f201b1d2e47b87d997099c3b17
diff --git a/polybar/.config/polybar/mybar b/polybar/.config/polybar/mybar
index 24d7379..d9fdcb6 100644
--- a/polybar/.config/polybar/mybar
+++ b/polybar/.config/polybar/mybar
@@ -46,7 +46,7 @@ battery_color = ${self.highlight}
[bar/mybar]
monitor = ${env:MONITOR:fallback-value}
width = 100%
-height = 30
+height = 25
offset-x = 0%
offset-y = 0%
radius = 1.0
@@ -83,7 +83,8 @@ tray-background = ${colors.background}
;wm-restack = bspwm
;wm-restack = i3
-;override-redirect = true
+override-redirect = true
+enable-ipc = true
;scroll-up = bspwm-desknext
;scroll-down = bspwm-deskprev
diff --git a/profile/.bashrc b/profile/.bashrc
index 54b19cf..a6634bf 100644
--- a/profile/.bashrc
+++ b/profile/.bashrc
@@ -34,6 +34,7 @@ alias refresh="python ~/.config/Scripts/shortcuts.py"
alias mailsync="bash ~/.config/Scripts/get_email.sh"
alias ref="python ~/.config/Scripts/shortcuts.py && source ~/.bashrc"
alias ka="killall"
+alias fullclean="make clean && rm -f config.h && git reset --hard origin/master"
# alias docker="sudo docker"
diff --git a/profile/.xinitrc b/profile/.xinitrc
index e80cb92..b1814ca 100644
--- a/profile/.xinitrc
+++ b/profile/.xinitrc
@@ -12,5 +12,5 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
fi
-sxhkd & exec bspwm
-#exec i3
+#sxhkd & exec bspwm
+exec dwm &
diff --git a/zsh/.zsh_history b/zsh/.zsh_history
new file mode 100644
index 0000000..911b3f8
--- /dev/null
+++ b/zsh/.zsh_history
@@ -0,0 +1,147 @@
+: 1556803092:0;ls
+: 1556803106:0;dotfiles
+: 1556803108:0;git status
+: 1556803110:0;cd ..
+: 1556803126:0;v
+: 1556803133:0;vim .zshrc
+: 1556803475:0;git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
+: 1556803485:0;.oh-my-zsh/custom/plugins
+: 1556803489:0;ls
+: 1556803493:0;cd
+: 1556803500:0;vim .zshrc
+: 1556803532:0;exit
+: 1556803549:0;git status
+: 1556803551:0;dot
+: 1556803564:0;dotfiles/
+: 1556803579:0;git status
+: 1556803582:0;git statatus
+: 1556803585:0;git stattus
+: 1556803586:0;git status
+: 1556803622:0;cd
+: 1556803630:0;vim .zshrc
+: 1556803667:0;exit
+: 1556803676:0;dotfiles/
+: 1556803678:0;git status
+: 1556803683:0;dwm
+: 1556803688:0;cd dwm
+: 1556803689:0;ls
+: 1556803697:0;r
+: 1556803697:0;ls
+: 1556803706:0;ls++
+: 1556803712:0;dwm
+: 1556803715:0;cd dwm
+: 1556803717:0;git stauts
+: 1556803719:0;git status
+: 1556803729:0;v config.h
+: 1556803977:0;ls
+: 1556803993:0;cd dwm
+: 1556804002:0;cd
+: 1556804010:0;cd -
+: 1556804019:0;ls
+: 1556804032:0;cd
+: 1556816548:0;ls
+: 1556816571:0;vim .bashrc
+: 1556816580:0;v .zshrc
+: 1556816585:0;vim .zshrc
+: 1556816649:0;source .zshrc
+: 1556816833:0;vim .zshrc
+: 1556816955:0;source .zshrc
+: 1556816969:0;vim .zshrc
+: 1556817019:0;source .zshrc
+: 1556817023:0;ls
+: 1556817042:0;vim .zshrc
+: 1556817099:0;cfz
+: 1556817172:0;ls
+: 1556817179:0;v .zshrc
+: 1556817187:0;ls
+: 1556817194:0;cd st
+: 1556817196:0;cd
+: 1556817198:0;ls
+: 1556817248:0;v dwm/config.h
+: 1556817630:0;sudo make clean install
+: 1556817634:0;cd dw
+: 1556817637:0;cd dwm
+: 1556817641:0;sudo make clean install
+: 1556817676:0;s
+: 1556817685:0;screen.sh d
+: 1556817735:0;htop
+: 1556817813:0;du
+: 1556817821:0;du -h
+: 1556817953:0;cd dwm
+: 1556817959:0;v config.h
+: 1556818029:0;htop
+: 1556818359:0;exit
+: 1556818550:0;screen.sh d
+: 1556818554:0;exit
+: 1556818564:0;cd dwm
+: 1556818566:0;v config.h
+: 1556818914:0;alsamixer
+: 1556818933:0;EXIT
+: 1556818935:0;exit
+: 1556819011:0;cd dwm
+: 1556819202:0;exit
+: 1556819206:0;eixt
+: 1556819207:0;exit
+: 1556819277:0;htop
+: 1556819467:0;lsa
+: 1556819480:0;exit
+: 1556819526:0;rm .zshrc.pre-oh-my-zsh
+: 1556819532:0;cd .oh-my-zsh
+: 1556819533:0;ls
+: 1556819538:0;v oh-my-zsh.sh
+: 1556819564:0;cd
+: 1556819570:0;cd dwm
+: 1556819643:0;exit
+: 1556819650:0;sudo make clean install
+: 1556819720:0;htop
+: 1556819754:0;systemctl stop teamviewerd
+: 1556819870:0;neofetch
+: 1556819876:0;vifm .
+: 1556819916:0;v dwm/config.h
+: 1556831676:0;sudo make clean install
+: 1556831685:0;cd dwm
+: 1556831688:0;sudo make clean install
+: 1556831702:0;v config.h
+: 1556832056:0;sudo make clean install
+: 1556832082:0;v config.h
+: 1556832115:0;sudo make clean install
+: 1556832121:0;v config.h
+: 1556832156:0;sudo make clean install
+: 1556832160:0;v config.h
+: 1556833306:0;s
+: 1556833316:0;v startdwm
+: 1556833388:0;locate dwm.desktop
+: 1556833405:0;sudo vim /usr/share/xsessions/dwm.desktop
+: 1556833433:0;v startdwm
+: 1556833558:0;r
+: 1556833612:0;cd
+: 1556833613:0;ls
+: 1556833634:0;cfp
+: 1556833701:0;ls
+: 1556833710:0;cd Downloads
+: 1556833710:0;ls
+: 1556833717:0;rm zoom_x86_64.pkg.tar.xz
+: 1556833721:0;cd
+: 1556833753:0;g
+: 1556833776:0;gst
+: 1556833782:0;dotfiles
+: 1556833782:0;ls
+: 1556833785:0;gst
+: 1556833818:0;git add Scripts/.config/Scripts/launch_polybar.sh
+: 1556833843:0;git add bspwm/.config/*
+: 1556833867:0;git add compton/.config/compton.conf polybar/.config/polybar/mybar
+: 1556833878:0;git status
+: 1556833903:0;git add profile/.bashrc
+: 1556833906:0;gst
+: 1556833915:0;r
+: 1556834013:0;cd
+: 1556834015:0;bash
+: 1556834046:0;dotfiles
+: 1556834048:0;cd
+: 1556834055:0;v .zshrc
+: 1556834061:0;vim .zshrc
+: 1556834368:0;git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
+: 1556834388:0;dotfiles
+: 1556834390:0;git stauts
+: 1556834393:0;gst
+: 1556834405:0;git add zsh
diff --git a/zsh/.zshrc b/zsh/.zshrc
new file mode 100644
index 0000000..25d6f5f
--- /dev/null
+++ b/zsh/.zshrc
@@ -0,0 +1,134 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
+
+# Path to your oh-my-zsh installation.
+ export ZSH="/home/kdam0/.oh-my-zsh"
+
+# Set name of the theme to load --- if set to "random", it will
+# load a random theme each time oh-my-zsh is loaded, in which case,
+# to know which specific one was loaded, run: echo $RANDOM_THEME
+# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
+ZSH_THEME="robbyrussell"
+
+# Set list of themes to pick from when loading at random
+# Setting this variable when ZSH_THEME=random will cause zsh to load
+# a theme from this variable instead of looking in ~/.oh-my-zsh/themes/
+# If set to an empty array, this variable will have no effect.
+# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion.
+# Case-sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment the following line to disable bi-weekly auto-update checks.
+# DISABLE_AUTO_UPDATE="true"
+
+# Uncomment the following line to change how often to auto-update (in days).
+# export UPDATE_ZSH_DAYS=13
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load?
+# Standard plugins can be found in ~/.oh-my-zsh/plugins/*
+# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(git zsh-autosuggestions)
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+# export EDITOR='vim'
+# else
+# export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+
+bindkey '^ ' autosuggest-accept
+
+# Example aliases
+alias v="vim"
+alias r="vifm ."
+alias ls='ls++'
+alias lsa='ls -A'
+alias mkd="mkdir -pv"
+
+alias yt="youtube-dl -ic"
+alias yta="youtube-dl -xic"
+alias youtube-mp3="youtube-dl --extract-audio --audio-format mp3 --audio-quality 320k -o '~/Music/recent/%(title)s.%(ext)s'"
+#alias youtube-mp3="youtube-dl -t --extract-audio --audio-format mp3 --audio-quality 320k"
+alias youtube-video="youtube-dl -i --no-mtime --prefer-free-formats -c -o '~/Videos/recent/%(title)s.%(ext)s'"
+
+alias newnet="sudo sv restart NetworkManager"
+alias caltime="sudo timedatectl set-timezone America/Calgary && i3 restart"
+alias tortime="sudo timedatectl set-timezone America/Toronto && i3 restart"
+alias extract="~/.config/Scripts/extract.sh"
+alias refresh="python ~/.config/Scripts/shortcuts.py"
+alias mailsync="bash ~/.config/Scripts/get_email.sh"
+alias ref="python ~/.config/Scripts/shortcuts.py && source ~/.bashrc"
+alias ka="killall"
+alias fullclean="make clean && rm -f config.h && git reset --hard origin/master"
+alias h="cd ~ && ls -a"
+alias d="cd ~/Documents && ls -a"
+alias D="cd ~/Downloads && ls -a"
+alias s="cd ~/.config/Scripts && ls -a"
+alias c="cd ~/Dropbox/winter2019 && ls -a"
+alias w="cd ~/Downloads/wallpapers && ls -a"
+alias cfb="vim ~/.bashrc"
+alias cfv="vim ~/.config/Scripts/vimrc"
+alias cfr="vim ~/.config/vifm/vifmrc"
+alias cfi="vim ~/.config/i3/config"
+alias cfm="vim ~/.config/mutt/muttrc"
+alias cff="vim ~/.config/Scripts/folders"
+alias cfc="vim ~/.config/Scripts/configs"
+alias cfT="vim ~/.config/Scripts/tmux.conf"
+alias cfa="vim ~/.config/mutt/aliases"
+alias cfp="vim ~/.config/polybar/mybar"
+alias cfs="vim ~/.config/sxhkd/sxhkdrc"
+alias cfB="vim ~/.config/bspwm/bspwmrc"
+
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-02 06:19:33 +0000