commit 767230c65b378280aef6a67af7f284ae42a6b9b9
parent ac26cd527bd6bb96f43420554b95b03640d5a67d
Author: jacob <jacobdoeslinux@protonmail.com>
Date: Mon, 28 Oct 2019 20:08:09 -0700
updated, reduced clutter
Diffstat:
3 files changed, 38 insertions(+), 147 deletions(-)
diff --git a/bash/.bashrc b/bash/.bashrc
@@ -1,98 +1,20 @@
-#
# ~/.bashrc
#
-#Ibus settings if you need them
-#type ibus-setup in terminal to change settings and start the daemon
-#delete the hashtags of the next lines and restart
-#export GTK_IM_MODULE=ibus
-#export XMODIFIERS=@im=dbus
-#export QT_IM_MODULE=ibus
-
-# If not running interactively, don't do anything
[[ $- != *i* ]] && return
-
export HISTCONTROL=ignoreboth:erasedups
+
+
PS1="[\e[1;36m\u\e[0;1m@\e[1;36m\h\e[0;0m] [\e[1;34m\w\e[0;0m]\n: "
-#PS1="\n\[\[\033[01;33m\][\w]\[\033[00m\]\n\[\033[\[\e[1;37m\]\$\[\e[0m\] "
-
-
-#list
-alias ls='ls --color=auto'
-alias grep='grep --color=auto'
-alias la='ls -a'
-alias ll='ls -la'
-alias l='ls'
-alias l.="ls -A | egrep '^\.'"
-#fix obvious typo's
-alias cd..='cd ..'
-alias pdw="pwd"
-alias udpate='sudo pacman -Syyu'
-## Colorize the grep command output for ease of use (good for log files)##
+
alias grep='grep --color'
alias egrep='egrep --color'
alias fgrep='fgrep --color'
-#readable output
alias df='df -h'
-
-#pacman unlock
-alias unlock="sudo rm /var/lib/pacman/db.lck"
-
-#free
-alias free="free -mt"
-
-#continue download
-alias wget="wget -c"
-
-#userlist
-alias userlist="cut -d: -f1 /etc/passwd"
-
-#merge new settings
-alias merge="xrdb -merge ~/.Xresources"
-
-# Aliases for software managment
-# pacman or pm
-alias pacman='sudo pacman --color auto'
-alias update='sudo pacman -Syyu'
-
-# yay as aur helper - updates everything
-alias pksyua="yay -Syu --noconfirm"
-
-#ps
-alias ps="ps auxf"
-alias psgrep="ps aux | grep -v grep | grep -i -e VSZ -e"
-
-#grub update
-alias update-grub="sudo grub-mkconfig -o /boot/grub/grub.cfg"
-
-#improve png
-alias fixpng="find . -type f -name "*.png" -exec convert {} -strip {} \;"
-
-#add new fonts
alias fc='sudo fc-cache -fv'
-#copy/paste all content of /etc/skel over to home folder - Beware
-alias skel='cp -rf /etc/skel/* ~'
-#backup contents of /etc/skel to hidden backup folder in home/user
-alias bupskel='cp -Rf /etc/skel ~/.skel-backup-$(date +%Y.%m.%d-%H.%M.%S)'
-
-#copy bashrc-latest over on bashrc - cb= copy bashrc
-alias cb="cp ~/.bashrc-latest ~/.bashrc && source ~/.bashrc && sudo cp /etc/skel/.bashrc-latest /etc/skel/.bashrc"
-
-#quickly kill conkies
-alias kc='killall conky'
-
-#hardware info --short
-alias hw="hwinfo --short"
-
-#skip integrity check
-alias yayskip='yay -S --mflags --skipinteg'
-alias trizenskip='trizen -S --skipinteg'
-
-#check vulnerabilities microcode
-alias microcode='grep . /sys/devices/system/cpu/vulnerabilities/*'
#get fastest mirrors in your neighborhood
alias mirror="sudo reflector -f 30 -l 30 --number 10 --verbose --save /etc/pacman.d/mirrorlist"
@@ -100,8 +22,7 @@ alias mirrord="sudo reflector --latest 50 --number 20 --sort delay --save /etc/p
alias mirrors="sudo reflector --latest 50 --number 20 --sort score --save /etc/pacman.d/mirrorlist"
alias mirrora="sudo reflector --latest 50 --number 20 --sort age --save /etc/pacman.d/mirrorlist"
-#mounting the folder Public for exchange between host and guest on virtualbox
-alias vbm="sudo mount -t vboxsf -o rw,uid=1000,gid=1000 Public /home/$USER/Public"
+
#shopt
shopt -s autocd # change to named directory
@@ -111,33 +32,23 @@ shopt -s dotglob
shopt -s histappend # do not overwrite history
shopt -s expand_aliases # expand aliases
-#youtube-dl
-alias yta-aac="youtube-dl --extract-audio --audio-format aac "
-alias yta-best="youtube-dl --extract-audio --audio-format best "
-alias yta-flac="youtube-dl --extract-audio --audio-format flac "
-alias yta-m4a="youtube-dl --extract-audio --audio-format m4a "
-alias yta-mp3="youtube-dl --extract-audio --audio-format mp3 "
-alias yta-opus="youtube-dl --extract-audio --audio-format opus "
-alias yta-vorbis="youtube-dl --extract-audio --audio-format vorbis "
-alias yta-wav="youtube-dl --extract-audio --audio-format wav "
-alias ytv-best="youtube-dl -f bestvideo+bestaudio "
#Recent Installed Packages
alias rip="expac --timefmt='%Y-%m-%d %T' '%l\t%n %v' | sort | tail -100"
+
+
#Cleanup orphaned packages
alias cleanup='sudo pacman -Rns $(pacman -Qtdq)'
-#create a file called .bashrc-personal and put all your personal aliases
-#in there. They will not be overwritten by skel.
-[[ -f ~/.bashrc-alias ]] && . ~/.bashrc-alias
+
+
+[[ -f ~/.bashrc-alias ]] && . ~/.bashrc-alias
PATH="$HOME/bin:$PATH"
export PATH
PATH="$HOME/.xmobar/scripts:$PATH"
export PATH
-
-#neofetch --ascii_distro arcolinux_small
diff --git a/xmobar/.xmobarrc b/xmobar/.xmobarrc
@@ -27,29 +27,15 @@ Config {
, overrideRedirect = True
--launch
- , commands = [
- -- Run Memory ["-t","<usedratio>%"] 35
- Run Date "%R <fc=#545454>%A %b/%e</fc>" "date" 100
- , Run BatteryP ["BAT0"]
- [ "-t", "<fc=#545454><acstatus></fc> <fc=#ff8f8f><left></fc>%"
- , "--", "-O", "AC"
- , "-o", ""
- , "-a", "systemctl suspend"
- , "-A", "5"
- ] 600
-
-
-
--- .xmobar/scripts/
- , Run ComX "XMBspotify" [""] "N/A" "spotify" 10
- , Run ComX "XMBlastBackup" [""] "N/A" "backup" 300
- , Run ComX "XMBpackages" [""] "N/A" "packages" 100
- -- me , Run ComX "XMBsshalive" ["10.0.1.38","541","thinkpad"] "N/A" "thinkpad" 100
- -- , Run ComX "XMBsshalive" ["10.0.1.6","361","NZXT"] "N/A" "nzxt" 100
- -- , Run ComX "XMBsshalive" ["10.0.1.33","187","cloud"] "N/A" "cloud" 100
- ]
+ , commands = [
+ Run StdinReader
+ , Run Date "%R <fc=#545454>%A %b/%e</fc>" "date" 100
+ , Run ComX "XMBspotify" [""] "N/A" "spotify" 10
+ , Run ComX "XMBlastBackup" [""] "N/A" "backup" 300
+ , Run ComX "XMBpackages" [""] "N/A" "packages" 100
+ ]
, sepChar = "%"
, alignSep = "||"
- , template = "%date% | <fc=#1DB954>%spotify%</fc> | <fc=#787878>ssh</fc><fc=#454545> %backup%</fc> <fc=#787878>Packages</fc><fc=#454545> %packages%</fc> %battery% "
+ , template = "%date% %StdinReader% | <fc=#1DB954>%spotify%</fc> | <fc=#787878>ssh</fc><fc=#454545> %backup%</fc> <fc=#787878>Packages</fc><fc=#454545> %packages%</fc> "
}
diff --git a/xmonad/.xmonad/xmonad.hs b/xmonad/.xmonad/xmonad.hs
@@ -17,27 +17,28 @@ import XMonad.Layout.ThreeColumns
import qualified Data.Map as M
import qualified XMonad.StackSet as S
-
------------------------------------------
+
myBaseConfig = defaultConfig
myModMask = mod1Mask
+
+-- Borders
myBorderWidth = 1
myNormalBorderColor = "#000000"
myFocusedBorderColor = "#f3c300"
+
myWorkspaces = ["1:term","2:web","3:code","4:vm","5:media"] ++ map show [6..9]
myLayoutHook = avoidStruts (
--- ThreeColMid 1 (3/100) (1/2) |||
- Tall 1 (3/100) (1/2) |||
--- Mirror (Tall 1 (3/100) (1/2)) |||
--- Full |||
- spiral (6/7)) |||
- noBorders (fullscreenFull Full)
+ Tall 1 (3/100) (1/2) |||
+ noBorders (fullscreenFull Full))
myKeys conf = M.fromList $
+ --
+ -- Spawns
[ ((myModMask .|. shiftMask , xK_Return), spawn "kitty")
, ((myModMask .|. shiftMask , xK_h ), spawn "kitty htop")
, ((myModMask .|. shiftMask , xK_v ), spawn "kitty vim")
@@ -47,11 +48,15 @@ myKeys conf = M.fromList $
, ((myModMask .|. shiftMask , xK_a ), spawn "pcmanfm")
, ((myModMask .|. shiftMask , xK_r ), spawn "dmenu_run -sf red -sb white -nf gray -nb black")
, ((myModMask .|. shiftMask , xK_q ), kill)
- -- Media / Basic Keys
+ --
+ -- Basic Keys
+-- , ((0, 0x1008ff02), spawn "/home/jacob/bin/xbacklight-script inc")
+ -- , ((0, 0x1008ff03), spawn "/home/jacob/bin/xbacklight-script dec")
, ((0, xK_F11 ), spawn "playerctl previous")
, ((0, xK_F9 ), spawn "playerctl play-pause")
, ((0, xK_F12 ), spawn "playerctl next")
- -- defaults
+ --
+ -- Window Controls
, ((myModMask , xK_space ), sendMessage NextLayout)
, ((myModMask .|. shiftMask , xK_space ), setLayout $ XMonad.layoutHook conf)
, ((myModMask , xK_n ), refresh)
@@ -68,27 +73,19 @@ myKeys conf = M.fromList $
, ((myModMask , xK_comma ), sendMessage (IncMasterN 1))
, ((myModMask , xK_period ), sendMessage (IncMasterN (-1)))
, ((myModMask , xK_q ), restart "xmonad" True)
- ]++ -- workspaces
-
- [((myModMask , k), windows $ S.greedyView i)
- | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d]
- ]++
+ ]++
+ --
- [((mod4Mask , k), (windows $ S.shift i) >> (windows $ S.greedyView i))
- | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d]
- ]++
-
- [((mod4Mask .|. shiftMask, k), (windows $ S.shift i))
- | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d]
+ -- Workspaces
+ [((myModMask , k), (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_p]]++
+ [((mod4Mask , k), (windows $ S.shift i ) >> (windows $ S.greedyView i)) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_p]]++
+ [((mod4Mask .|. shiftMask, k), (windows $ S.shift i )) | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_q, xK_w, xK_e, xK_a, xK_s, xK_d, xK_p]
]
-
-
---myConfig = defaultConfig
main = xmonad =<< xmobar myBaseConfig
{ modMask = myModMask
, borderWidth = myBorderWidth
@@ -97,8 +94,5 @@ main = xmonad =<< xmobar myBaseConfig
, focusedBorderColor = myFocusedBorderColor
, keys = myKeys
, manageHook = manageDocks
- , handleEventHook = docksEventHook
+ , handleEventHook = docksEventHook
}
-
---main = xmonad . myConfig =<< spawnPipe "xmobar"
-
