commit 04dadacc0fab984f026229295f158b4315d85f9e
parent 8c06c24b5b89030fee1e6fd5aa4bdf15a882c6e6
Author: Ryan Jeffrey <ryan@ryanmj.xyz>
Date: Tue, 29 Sep 2020 13:34:43 -0700
Simplify
Diffstat:
12 files changed, 21 insertions(+), 386 deletions(-)
diff --git a/.Xdefaults b/.Xdefaults
@@ -1,53 +0,0 @@
-URxvt.termName: rxvt-256color
-
-XTerm.vt100.saveLines: 4096
-
-*faceName: Ubuntu Mono
-*faceSize: 12
-*renderFont: true
-
-URxvt*depth: 32
-
-! URxvt*foreground: grey
-!URxvt*background: rgba:0000/0000/0200/e500
-
-!// URxvt*background: rgba:
-
-
-*selectToClipboard: true
-
-URxvt*font: xft:Monaco:style=Regular:size=12:antialias=true
-! // URxvt.font: xft:Menlo:size=12:antialias=true
-URxvt*boldFont: xft:Monaco:bold:size=12:antialias=true
-
-URxvt*background: black
-URxvt*foreground: grey
-
-URxvt.scrollBar: false
-
-URxvt.keysym.Control-Left:\033[1;5D
-
-URxvt.keysym.Control-Right:\033[1;5C
-
-URxvt.perl-ext-common: ...,font-size
-
-URxvt.keysym.Meta-Up: perl:font-size:increase
-URxvt.keysym.Meta-Down: perl:font-size:decrease
-
-xterm*background: black
-xterm*foreground: lightgray
-
-! // URxvt.keysym.Meta:
-
-Emacs.FontBackend: xft,x
-Emacs.font: Monaco:size=12:weight=light
-XTerm*metaSendsEscape: true
-
-
-*.font:deja vu sans mono:size=14:antialias=true:autohint=true
-*.color0: #000
-
-*.alpha: 0.8
-
-
-*.background: #000-
\ No newline at end of file
diff --git a/.Xresources b/.Xresources
@@ -1,79 +1,39 @@
-URxvt.termName: rxvt-256color
-
-XTerm.vt100.saveLines: 4096
-
-*faceName: Ubuntu Mono
-*faceSize: 12
-*renderFont: true
-
-URxvt*depth: 32
-
-! URxvt*foreground: grey
-!URxvt*background: rgba:0000/0000/0200/e500
-
-!// URxvt*background: rgba:
-
-
*selectToClipboard: true
-URxvt*font: xft:Monaco:style=Regular:size=12:antialias=true
-! // URxvt.font: xft:Menlo:size=12:antialias=true
-URxvt*boldFont: xft:Monaco:bold:size=12:antialias=true
-
-URxvt*background: black
-URxvt*foreground: grey
-
-URxvt.scrollBar: false
-
-URxvt.keysym.Control-Left:\033[1;5D
-
-URxvt.keysym.Control-Right:\033[1;5C
-
-URxvt.perl-ext-common: ...,font-size
-
-URxvt.keysym.Meta-Up: perl:font-size:increase
-URxvt.keysym.Meta-Down: perl:font-size:decrease
-
-xterm*background: black
-xterm*foreground: lightgray
-
-! // URxvt.keysym.Meta:
-
-Emacs.FontBackend: xft,x
-Emacs.font: Monaco:size=10:weight=light
XTerm*metaSendsEscape: true
-*.font:UbuntuMono-R:size=16:antialias=true:autohint=true
+st.font:Hack:size=12:antialias=true:autohint=true:family=mono
! Black
-st*.color0: #2e3436
-st*.color8: #6e706b
+st.color0: #2e3436
+st.color8: #6e706b
! Red
-st*.color1: #cc0000
-st*.color9: #ef2929
+st.color1: #cc0000
+st.color9: #ef2929
! Green
-st*.color2: #9ece9e
-st*.color10: #9ece9e
+st.color2: #9ece9e
+st.color10: #9ece9e
! Yellow
-st*.color3: #f0dfaf
-st*.color11: #f0dfaf
+st.color3: #f0dfaf
+st.color11: #f0dfaf
! Blue
-st*.color4: #4169E1
-st*.color12: #4169E1
+st.color4: #4169E1
+st.color12: #4169E1
! Magenta
!*.color5: #c0bed1
!*.color13: #c0bed1
! Cyan
-st*.color6: #07c7ca
-st*.color14: #63e9e9
+st.color6: #07c7ca
+st.color14: #63e9e9
! White
-st*.color7: #808080
-st*.color15: #808080
+st.color7: #808080
+st.color15: #808080
-*.alpha: 0.8
+st.alpha: 0.8
-st*.background: #000
+st.background: #1f1f2a
+st.foreground: #bcbcc6
! xscreensaver
xscreensaver.fade: false
diff --git a/.bashrc b/.bashrc
@@ -1,181 +0,0 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
-# fortune | cowsay
-
-
-# If not running interactively, don't do anything
-case $- in
- *i*) ;;
- *) return;;
-esac
-
-
-# en_US.UTF-8 UTF-8
-export DICPATH='/usr/share/hunspell'
-
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=1000
-HISTFILESIZE=2000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# If set, the pattern "**" used in a pathname expansion context will
-# match all files and zero or more directories and subdirectories.
-#shopt -s globstar
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
- debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
- xterm-color|*-256color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-#force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
- if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
- # We have color support; assume it's compliant with Ecma-48
- # (ISO/IEC-6429). (Lack of such support is extremely rare, and such
- # a case would tend to support setf rather than setaf.)
- color_prompt=yes
- else
- color_prompt=
- fi
-fi
-
-unset color_prompt force_color_prompt
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
- PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
- ;;
-*)
- ;;
-esac
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
- test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
- alias ls='ls --color=auto'
- #alias dir='dir --color=auto'
- #alias vdir='vdir --color=auto'
-
- alias grep='grep --color=auto'
- alias fgrep='fgrep --color=auto'
- alias egrep='egrep --color=auto'
-fi
-
-# colored GCC warnings and errors
-#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-
-# Add an "alert" alias for long running commands. Use like so:
-# sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
-if [ -f ~/.bash_aliases ]; then
- . ~/.bash_aliases
-fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if ! shopt -oq posix; then
- if [ -f /usr/share/bash-completion/bash_completion ]; then
- . /usr/share/bash-completion/bash_completion
- elif [ -f /etc/bash_completion ]; then
- . /etc/bash_completion
- fi
-fi
-
-export SCRIPTS="$HOME/CSProjects/scripts/"
-export GOARCH="amd64"
-export GOOS="linux"
-export CC="gcc"
-export CXX="g++"
-export CGO_ENABLED="1"
-export GOROOT="/usr/lib/go"
-export GOBIN="/home/ryan/CSProjects/goproj/bin/"
-export GOPATH="/home/koolade/CSProjects/goproj/"
-export PATH="$PATH:/bin/go/bin:$SCRIPTS:/home/ryan/.gem/ruby/2.6.0/bin:/root/.gem/ruby/2.6.0/bin"
-export MUSIC='~/Music/'
-export TERMINAL='xterm'
-export EDITOR='joe'
-
-alias vim='nvim'
-alias comd='pandoc --pdf-engine=xelatex -o '
-alias rip='abcde -o opus'
-alias ls='ls --color -h --group-directories-first'
-alias e='emacs'
-alias v='nvim'
-alias up='sudo pacman -Syy && sudo pacman -Su'
-alias pac='sudo pacman -S'
-alias aur='yay -S'
-alias latex='lualatex'
-alias cls='clear'
-alias j='joe'
-alias jr='joe -rdonly'
-alias mkd="mkdir -pv"
-alias untar='tar -xzvf'
-alias scheme='guile'
-alias lisp='sbcl'
-alias pdf='zathura'
-alias occ='sudo gcc `gnustep-config --objc-flags` -lgnustep-base -lobjc'
-
-stty -ixon # Disable ctrl-s and ctrl-q.
-shopt -s autocd #Allows you to cd into directory merely by typing the directory name.
-HISTSIZE= HISTFILESIZE= # Infinite history.
-
-# Setting Bash prompt. Capitalizes username and host if root user (my root user uses this same config file).
-if [ "$EUID" -ne 0 ]
- then export PS1="\[$(tput bold)\]\[$(tput setaf 1)\][\[$(tput setaf 3)\]\u\[$(tput setaf 2)\]@\[$(tput setaf 4)\]\h \[$(tput setaf 5)\]\W\[$(tput setaf 1)\]]\[$(tput setaf 7)\]\\$ \[$(tput sgr0)\]"
- else export PS1="\[$(tput bold)\]\[$(tput setaf 1)\][\[$(tput setaf 3)\]ROOT\[$(tput setaf 2)\]@\[$(tput setaf 4)\]$(hostname | awk '{print toupper($0)}') \[$(tput setaf 5)\]\W\[$(tput setaf 1)\]]\[$(tput setaf 7)\]\\$ \[$(tput sgr0)\]"
-fi
-
-extract () {
- if [ -f $1 ] ; then
- case $1 in
- *.tar.bz2) tar xvjf $1;;
- *.tar.gz) tar xvzf $1;;
- *.bz2) bunzip2 $1 ;;
- *.rar) unrar x $1 ;;
- *.gz) gunzip $1 ;;
- *.tar) tar xvf $1 ;;
- *.tbz2) tar xvjf $1;;
- *.tgz) tar xvzf $1;;
- *.zip) unzip $1 ;;
- *.Z) uncompress $1 ;;
- *.7z) 7z x $1;;
- *tar.xz) tar xf $1;;
- *) echo "don't know how to extract '$1'..." ;;
- esac
- else
- echo "'$1' is not a valid file!"
- fi
-}
-
-[ -n "$XTERM_VERSION" ] && transset-df --id "$WINDOWID" --min .9 >/dev/null
diff --git a/.gitignore b/.gitignore
@@ -85,6 +85,9 @@ flycheck_*.el
!/.config/dunst/
!/.config/dunst/dunstrc
!/.config/mimeapps.list
+!/.config/zsh/
+!/.config/zsh/zshrc
+
/.emacs.d/**/*
!/.emacs.d/init.el
!/.emacs.d/lisp/
diff --git a/TODO b/TODO
@@ -1,2 +0,0 @@
-* emacs
-** begin the move to use-package
diff --git a/dir-locals.el b/dir-locals.el
@@ -1 +0,0 @@
-((c++-mode . ((flycheck-clang-include-path . ("/home/ryan/src/misc-sdl-projects/arkanoid/head/")))))
diff --git a/scripts/albart b/scripts/albart
@@ -1,10 +0,0 @@
-#/usr/bin/env zsh
-
-OIFS="$IFS"
-IFS=$'\n'
-for i in `find $1 -type f -name "*.mp3"`; do
- file=`echo "$i" | sed 's/ /\\ /g'`
- ffmpeg -i $file -i $2 -b 192k -map_metadata 0 -map 0 -map 1 output.mp3
- mv output.mp3 $file
- exit
-done
diff --git a/scripts/faw b/scripts/faw
@@ -1,11 +0,0 @@
-#!/usr/bin/env zsh
-
-default="C:"
-search=$default
-
-[ $ARGC -eq 1 ] && search=$1
-
-for file in ./**/*(.); do
- grep $search -Hin $file
-done
-
diff --git a/scripts/ffe b/scripts/ffe
@@ -1,10 +0,0 @@
-#/usr/bin/env zsh
-
-default=".c"
-search=$default
-
-[ $ARGC -eq 1 ] && search=$1
-
-for file in ./**/*(.); do
- echo $file | grep $search -i
-done
diff --git a/scripts/mix b/scripts/mix
Binary files differ.
diff --git a/scripts/shuf.zsh b/scripts/shuf.zsh
@@ -1,50 +0,0 @@
-#!/usr/bin/env zsh
-
-# This scripts shuffles the inputs and runs them in as music files.
-
-RED='\033[0;31m'
-YELL='\033[;33m'
-NC='\033[0m' # No Color
-
-# Echo to stderr
-echoerr() {
- echo "$@" 1>&2
-}
-
-# Alter these values as necessary
-# Takes the file extension of the file and returns the music player associated with it
-getplayer() {
- case $1 in
- "mp3")
- echo "cvlc"
- ;;
- "m4a")
- echo "cvlc"
- ;;
- "modPlayer")
- echo "cvlc"
- ;;
- "webm")
- echo "cvlc"
- ;;
- *)
- echoerr "The music file type $1 is not supported."
- return -1
- ;;
- esac
-}
-
-songs=( $(echo "$@" | sed -r 's/(.[^;]*;)/ \1 /g' | tr " " "\n" | shuf | tr -d " " ) )
-
-for song in $songs; do
- filename=`basename -- "$song"`
- extension="${filename##*.}"
-
- player=$(getplayer "$extension")
-
- # If getting the type did not failed then play the song
- [[ $? == 0 ]] && echo "${YELL}Now playing $song${NC}" && $player "$song"
-done
-
-
-
diff --git a/scripts/updoot.zsh b/scripts/updoot.zsh
@@ -1,9 +0,0 @@
-#!/usr/bin/env zsh
-
-pacman -Syy && pacman -Su --noconfirm
-
-
-latestKernel=$(mhwd-kernel -l | grep -v rt | tail -1 | sed "s/\s*//g ; s/*//g")
-latestInstalled=$(mhwd-kernel -li | grep -v rt | tail -1 | sed "s/\s*//g ; s/*//g")
-
-[[ $latestKernel != $latestInstalled ]] && mhwd-kernel -i "$latestKernel"
