Merge branch 'master' of ssh://gitea.ewpt3ch.dev:25213/ewpt3ch/dotfiles-old

Local-config.yoga2

@@ -1,5 +0,0 @@
-kernel cmdline altered in /boot/refind.conf
-added: i915.enable_psr=0 to workaround intel drm bug(appeared with kernel 4.6)
-
-removed xf86-video-intel in attempt to fix above bug, system appears 'smoother' without
-it, so leaving it out for now.

README.md

@@ -6,7 +6,3 @@ currently the repo is .dotfiles in ~ with symlinks from the default file to it's
 #### naming conventions
 Kernels: kernel.*machine-name* ie kernel.yoga2
 
-#### Local config
-Notes on local configuration stuff are in Local-config.*machine-name* ir Local-config.yoga2
-Things included kernel cmdline, Xorg config, other customizations for working around bugs
-or hardware issues.

Xresources

@@ -1,13 +1,13 @@
 !Xft settings
-Xft*dpi:192	
+Xft*dpi:	96
 Xft*antialias:	true
 Xft*hinting:	true
 Xft*hintstyle:	full
 Xft*rgba:	rgb
  
 !Xcursor
-Xcursor.theme: Bluecurve	
-Xcursor.size:	42
+Xcursor.theme:	gentoo-blue
+Xcursor.size:	22
 
 !xterm
 xterm*termName: 		xterm-256color
@@ -16,3 +16,58 @@ xterm*savelines:		4096
 xterm*VT100.geometry:		80x32
 xterm*faceName:			incosolata-10
 xterm*utf8: 1
+
+#define S_base03        #002b36
+#define S_base02        #073642
+#define S_base01        #586e75
+#define S_base00        #657b83
+#define S_base0         #839496
+#define S_base1         #93a1a1
+#define S_base2         #eee8d5
+#define S_base3         #fdf6e3
+#define S_yellow        #b58900
+#define S_orange        #cb4b16
+#define S_red           #dc322f
+#define S_magenta       #d33682
+#define S_violet        #6c71c4
+#define S_blue          #268bd2
+#define S_cyan          #2aa198
+#define S_green         #859900
+ 
+*background:            S_base03
+*foreground:            S_base00
+*cursorColor:           S_base1
+*pointerColorBackground:S_base01
+*pointerColorForeground:S_base1
+ 
+!! black dark/light
+*color0:                S_base02
+*color8:                S_base03
+ 
+!! red dark/light
+*color1:                S_red
+*color9:                S_orange
+ 
+!! green dark/light
+*color2:                S_green
+*color10:               S_base01
+ 
+!! yellow dark/light
+*color3:                S_yellow
+*color11:               S_base00
+ 
+!! blue dark/light
+*color4:                S_blue
+*color12:               S_base0
+ 
+!! magenta dark/light
+*color5:                S_magenta
+*color13:               S_violet
+ 
+!! cyan dark/light
+*color6:                S_cyan
+*color14:               S_base1
+ 
+!! white dark/light
+*color7:                S_base2
+*color15:               S_base3

archalias.bash

@@ -1,6 +0,0 @@
-#!/bin/bash
-alias pacman='sudo pacman'
-alias pacupg='pacman -Syu'
-alias pacins='pacman -U'
-alias pacdiff='sudo pacdiff'
-

aur-update.bash

@@ -1,22 +0,0 @@
-#!/bin/bash
-#script to update packages installed from aur
-#uses cower -ud and makepkg -i
-#written because meat stopped working
-
-#path variables
-AURBUILD=/tmp/makepkg
-
-#create necessary dirs if not exist
-mkdir -p ${AURBUILD}
-
-cower --update --download --target=${AURBUILD}
-
-cd ${AURBUILD}
-for dir in ${AURBUILD}/*
-do
-  cd ${dir}
-  twmnc -t "aur-build" -c "building ${dir}" -d 5000
-  makepkg --install
-  cd ${AURBUILD}
-  rm -r ${dir}
-done

bashrc

@@ -12,25 +12,14 @@ if [[ $- != *i* ]] ; then
 	return
 fi
 
-#Shell Variables 
-export EDITOR=vim
-export PAGER=less
-export LIBVA_DRIVER_NAME=vdpau
-export BROWSER=firefox-developer
-export GOPATH="/home/ewpt3ch/go"
-PATH="/home/ewpt3ch/bin:/home/ewpt3ch/tmux:${GOPATH}/bin:${PATH}:./:"
-
-#Create dirs for things that won't themselves
-mkdir -p /tmp/ewpt3ch-cache/chrome
-mkdir -p /tmp/ewpt3ch-cache/chromium
-mkdir -p /tmp/makepkg
-
+# Put your fun stuff here.
 #source /etc/profile.d/bash-completion.sh
 source ~/todo.txt-cli/todo_completion
-source ~/bin/npm_completion
-#bring in aliases for arch
-source ~/.dotfiles/archalias.bash
-#alias
+#pacman aliases
+alias pacman='sudo pacman'
+alias pacupg='pacman -Syu'
+alias pacins='pacman -U'
+#
 alias t='clear && $HOME/Dropbox/todo/todo.sh -d $HOME/Dropbox/todo/todo.cfg'
 alias nano='nano -w'
 alias ls='ls --color=auto'
@@ -38,7 +27,21 @@ alias grep='grep --color=auto'
 alias fgrep='fgrep --color=auto'
 alias egrep='egrep --color=auto'
 complete -F _todo t
-eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ed25519)
-export NVM_DIR="/home/ewpt3ch/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[[ -r $NVM_DIR/bash_completion ]] && . $NVM_DIR/bash_completion
+PATH="/home/ewpt3ch/bin:/home/ewpt3ch/tmux:${PATH}:./:"
+export VMWARE_USE_SHIPPED_GTK="yes"
+export EDITOR=vim
+export PAGER=less
+export LIBVA_DRIVER_NAME=vdpau
+#create cache-dir for chrome
+mkdir -p /tmp/ewpt3ch-cache
+eval $(keychain --eval --agents ssh -Q --quiet ~/.ssh/id_ecdsa ~/.ssh/id_rsa)
+#Check if dropbox is running
+if  dropbox.py running  ; then
+  #start dropbox
+  ~/bin/dropbox.py start
+fi
+#check if btsync running and start
+#if ! ps -A | grep -q btsync ; then
+  #start btsync
+#  btsync --config ~/.config/btsync/btsync.conf
+#fi

blog.bash

@@ -1,18 +0,0 @@
-#!/bin/bash
-#script to make blogging easier
-
-#activate nikola
-source ~/nikola/bin/activate
-
-#create a new post
-cd ~/myblog
-nikola new_post -e
-
-#build the new site
-nikola build
-
-#deploy
-rsync -av --delete output/ ewpt3ch.com:/srv/http/ewpt3ch.com/blog/
-
-#deactivate nikola
-deactivate

chrome

@@ -1,2 +1,2 @@
 #!/bin/bash
-exec google-chrome-beta --disk-cache-dir="/tmp/ewpt3ch-cache/chrome"
+exec google-chrome-beta --disk-cache-dir="/tmp/ewpt3ch-cache"

cmus-stats.sh

@@ -4,7 +4,7 @@ then
   status=`cmus-remote -Q | grep status | awk '{print $2}'`
   if [ $status == "paused" ]
   then
-    status="→"
+    status="ç"
   else
     status="æ"
   fi

conkyrc

@@ -12,4 +12,4 @@ total_run_times 0
 use_spacer none
 
 TEXT
-${battery_short BAT1} ${exec ~/bin/cmus-stats.sh} ${exec ~/bin/volume.sh} C${cpu}% M${memperc}% ${wireless_essid wlp1s0} ${addr wlp1s0} ↓${downspeed wlp1s0} ↑${upspeed wlp1s0} $time
+${exec ~/bin/cmus-stats.sh} ${exec ~/bin/volume.sh} ${exec ~/bin/power.sh} ${wireless_essid wlp0s29f7u1} ${addr wlp0s29f7u1} $time

dircolors.ansi-dark

@@ -97,7 +97,6 @@ TERM xterm-256color
 TERM xterm-88color
 TERM xterm-color
 TERM xterm-debian
-TERM xterm-termite
 
 # EIGHTBIT, followed by '1' for on, '0' for off. (8-bit output)
 EIGHTBIT 1

dpass.bash

@@ -1,28 +0,0 @@
-#!/bin/bash
-#based on https://github.com/cdown/passmenu
-#and jasnowryan.com/blog
-
-shopt -s nullglob globstar
-
-nb='#2F4F4F'
-nf='#00FFFF'
-sb='#2F4F4F'
-sf='#ADFF2F'
-font="Inconsolataicon-12"
-dmenucmd=( dmenu -i -fn "$font" -nb "$nb" -nf "$nf" -sb "$sb" -sf "$sf" )
-
-prefix=${PASSWORD_STORE_DIR:-~/.password-store}
-files=( "$prefix"/**/*.gpg )
-files=( "${files[@]#"$prefix"/}" )
-files=( "${files[@]%.gpg}" )
-fbase=( "${files[@]##*/}" )
-
-word=$(printf '%s\n' "${fbase[@]}" | "${dmenucmd[@]}" "$@")
-
-if [[ -n $word ]]; then
-  for match in "${files[@]}"; do
-    if [[ $word == ${match#*/} ]]; then
-      /usr/bin/pass show -c "$match" 2>/dev/null
-    fi
-  done
-fi

dwm-start.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-# Script to start dwm in loop
-
-while true; do
-		$HOME/bin/dwmstatus
-   	sleep 2
-done &
-
-while true; do
-	dwm >/dev/null
-	# to log stderrors to a file 
-	#dwm 2> /tmp/dwm.log
-done 

dwm.config.h

@@ -59,30 +59,22 @@ static const Layout layouts[] = {
 static const char  *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", colors[0][ColBG], "-nf", colors[0][ColFG], "-sb", colors[1][ColBG], "-sf", colors[1][ColFG], NULL };
 static const char *termcmd[]  = { "termite", NULL };
 /*functions for volume control*/
-static const char *upvol[] = { "volumeset", "up", NULL };
-static const char *downvol[] = { "volumeset", "down", NULL };
-static const char *mute[] = { "volumeset", "mute", NULL };
+static const char *upvol[] = { "amixer", "sset", "Master", "1%+", NULL};
+static const char *downvol[] = { "amixer", "sset", "Master", "1%-", NULL};
+static const char *mute[] = { "amixer", "sset", "Master", "toggle", NULL};
 /*cmus functions*/
 static const char *cmusplaypause[] = { "cmus-remote", "-u", NULL};
 static const char *cmusnext[] = { "cmus-remote", "--next", NULL};
 static const char *cmusprev[] = { "cmus-remote", "--prev", NULL};
-/*screenshot*/
-static const char *screenshot[] = { "scrot", NULL};
-/*multi-head*/
-static const char *multihead[] = { "hdmi-plug.sh", NULL};
 
 static Key keys[] = {
 	/* modifier                     key        function        argument */
   { 0,              XF86XK_AudioRaiseVolume, spawn,          {.v = upvol} },
   { 0,              XF86XK_AudioLowerVolume, spawn,          {.v = downvol} },
   { 0,              XF86XK_AudioMute,        spawn,          {.v = mute } },
-  { 0,              XF86XK_AudioPlay,        spawn,          {.v = cmusplaypause} },
-  { 0,              XF86XK_AudioPause,       spawn,          {.v = cmusplaypause} },
   { MODKEY,                       XK_u,      spawn,          {.v = cmusplaypause} },
   { MODKEY,                       XK_bracketright,     spawn,          {.v = cmusnext} },
   { MODKEY,                       XK_bracketleft,      spawn,          {.v = cmusprev} },
-  { MODKEY|ControlMask,           XK_s,      spawn,          {.v = screenshot} },
-  { MODKEY|ControlMask,           XK_m,      spawn,          {.v = multihead} },
   { MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
 	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
 	{ MODKEY,                       XK_b,      togglebar,      {0} },

dwmstatus.sh

@@ -1,117 +0,0 @@
-#!/bin/bash
-# status script for dwm
-# influenced by:
-# https://bitbucket.org/jasonwryan/shiv/Scripts/dwm-status
-# https://github.com/w0ng/bin/blob/master/dwm-statusbar
-########################
-## eric@ewpt3ch.com ####
-## dwmstatus ###########
-########################
-
-# colors from dwm.config.h
-color_normal="\x01"    #normal
-color_selected="\x02"  #selected
-color_urgent="\x03"    #urgent
-color_important="\x04" #important
-color_yellow="\x05"    #yellow
-color_blue="\x06"      #blue
-color_cyan="\x07"      #cyan
-color_magenta="\x08"   #magenta
-color_grey="\x09"      #grey
-
-# Icon glyphs from Inconsolataicon
-glyph_cpu="\u01B0"
-glyph_mem="\u01B1"
-glyph_dl="\u01A5"
-glyph_pow="\u01B2"
-glyph_clk="\u01Af"
-glyph_bln="\u01AA"
-glyph_msc="\u01AB"
-glyph_vol="\u01AC"
-glyph_mute="\u01B4"
-glyph_mail="\u01AD"
-glyph_wifi="\u01AE"
-glyph_plug="\u01A4"
-
-# Song info
-msc(){
-  if [ -x /usr/bin/cmus-remote ]
-  then
-    artist=`cmus-remote -Q | grep -w artist | cut -d ' ' -f3-`
-    song=`cmus-remote -Q | grep title | cut -d ' ' -f3-`
-    song_info=${artist}-${song}
-  fi
-
-  echo -ne "${color_selected}${glyph_msc} ${song_info}${color_normal}"
-}
-
-#Date
-dte(){
-  datetime="$(date "+%F %T")"
-  echo -ne "${color_selected}${glyph_clk} ${datetime}${color_normal}"
-}
-
-#Power and Battery
-bat(){
-  on1="$(</sys/class/power_supply/ADP1/online)"
-  charge="$(</sys/class/power_supply/BAT1/capacity)"
-  if [[ $on1 -eq "0" && $charge -lt "25" ]]
-  then
-    #below 25%
-    echo -ne "${color_urgent}${glyph_pow} ${charge}%${color_normal}"
-    #send pushbullet to phone
-    if [[ ! -f /run/user/1050/batpush ]]
-    then
-      touch /run/user/1050/batpush
-      battery-push
-    fi
-  elif [[ $on1 -eq "0" && $charge -lt "35" ]]
-  then
-    #between 25% and 35%
-    echo -ne "${color_important}${glyph_pow} ${charge}%${color_normal}"
-  elif [ $on1 -eq "0" ]
-  then
-    #above 50%
-    echo -ne "${color_selected}${glyph_pow} ${charge}%${color_normal}"
-  else
-    #charging
-    echo -ne "${color_selected}${glyph_plug} ${charge}%${color_normal}"
-    #reset battery push
-    if [[ -f /run/user/1050/batpush ]]
-    then
-      rm /run/user/1050/batpush
-    fi
-  fi
-}
-
-#Volume
-vol(){
-  mute=`amixer get Master | grep "Front Left:" | awk '{print $6}'`
-  if [ ${mute} == "[on]" ]
-  then
-    echo -ne "${glyph_vol}"
-  else
-    echo -ne "${glyph_mute}"
-  fi
-}
-
-#Memory
-mem(){
-  memused="$(free -m | awk 'NR==2 {print $3}')"
-  echo -ne "${glyph_mem}${memused}M"
-}
-
-#CPU
-load(){
-  cpu="$(cat /proc/loadavg | awk '{print $1, $2, $3}')"
-  echo -ne "${glyph_cpu} ${cpu}"
-}
-
-#Internet Connection
-int(){
-  host google.com > /dev/null &&
-  echo -ne "${glyph_wifi}" || echo -ne "${color_important}${glyph_wifi}${color_normal}"
-}
-
-# Pipe to statusbar
-xsetroot -name "$(msc) $(vol) $(load) $(mem) $(int) $(bat) $(dte) "

gpg-yubikey.MD

@@ -1,19 +0,0 @@
-####How to install and maintain GPG keys on my Yubikey
-From: [PGP and SSH on Yubikey](https://www.esev.com/blog/post/2015-01-pgp-ssh-key-on-yubikey-neo/)
-
-We want to keep out Master Key on a USB drive that a) doesn't leave the house or office and b) is rarely connected to a computer.  You can also use a livecd and airgapped machine for even more security.  I deem for my attack profile that having the Master Key offline most of the time is good enough.  This may change in the future. My USB drive is also used to back up sensitive info so gpg stuff is under gnupg/
-
-```bash
-#Store Master key on USB drive
-mv .gnupg .gnupg.orig
-ln -s /PATHTOUSBDRIVE/gnupg .gnupg
-
-#Check gpg.conf for strong hash and encryption preferences
-cert-digest-algo SHA512
-default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES
-
-#generate a Master key if there isn't one
-
-#if we have a secret key
-
-

hdmi-plug.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-status=$(cat /sys/class/drm/card0-HDMI-A-1/status)
-
-if [ $status = 'connected' ]; then
-  xrandr --output eDP-1 --auto --output HDMI-1 --auto --scale 2x2 --right-of eDP-1
-  twmnc -t 'display' -c 'HDMI plugged'
-else
-  xrandr --output HDMI-1 --off
-  twmnc -t 'display' -c 'HDMI unplugged'
-fi

interrobangrc

@@ -1,71 +0,0 @@
-## | InterobangRC
-## |
-## | Lines starting with a # are ignored as comments, but this file is
-## | not processed by a shell interpreter.
-
-
-## BASIC CONFIGURATION
-
-#set font      = fixed
-set font      = -*-terminus-medium-*-*-*-32-*-*-*-*-*-*-*
-set geometry  = top
-set geometry  = 3200x35-1+0
-set colors	  = #00FFFF #2F4F4F #48E084 #242424 #64FFAA #484848
-set border    = 0px #BBE0EE
-set bangchar  = !
-set run_hook  = %s
-#set run_hook  = %s || (notify-send "Error: command not found";interrobang)
-#set autocomp  = 1
-set list      = true
-set last      = true
-set margin    = -80
-set shell     = /bin/bash
-set flags     = -c
-
-
-## COMMON BANGS AND COMPLETITON OPTIONS
-
-bang term     = termite -e %s
-bang web      = ewpt3chfirefox %s
-bang pdf      = mupdf %s
-bang man      = termite -e man %s
-bang ddg      = ewpt3chfirefox https://duckduckgo.com/?q=%s
-bang calc     = echo "interrobang ignored \"%s\""
-bang ?        = echo "interrobang ignored \"%s\""
-
-tab default   = percontation "%s" %s | sort -u
-tab calc      = str="%s%s"; echo "!calc $(echo ${str#\!calc} | bc -l)"
-tab ?         = ignore="%s%s"; awk '/^bang/ {print "!"$2" ";}' ~/.interrobangrc
-
-
-## EXAMPLES OF COMPLEX COMPLETION OR SCRIPTING
-
-#####
-## percontation can find .desktop files:
-##   path: (default) show binaries in $PATH
-##   desktop: list desktop files that match
-##   desktop+: same as above, plus substring matching with comments
-##  NOTE: see the desktop bang definition below
-## compgen uses bash's default completion
-#tab default   = percontation desktop path "%s" %s | sort -u
-#tab default   = percontation desktop+ path "%s" %s | sort -u
-#tab default   = compgen -P "%s" -cf %s
-
-#####
-## Example logout tool:
-##   uncomment the following bang and tab lines
-#bang logout   = case "%s" in shutdown) sudo systemctl poweroff ;; sleep) sudo systemctl suspend ;; reboot) sudo systemctl reboot ;; logout) killall xinit ;; cancel) exit ;; esac
-
-#tab logout    = echo -e "cancel\nshutdown\nsleep\nreboot\nlogout" | grep "^%s%s"
-
-#####
-## desktop bangs
-##   The first version ignores any parameters to the desktop file and
-##     just executes the associated binary
-##   The second version passes parameters and parses the desktop file
-##     properly, but requires an external tool to do so.  This tool
-##     is not included in the interrobang package.
-#bang desktop  = ARG="%s"; FILE=$(find /usr/share/applications/ -name ${ARG%% *}.desktop | head -1); $(awk '/^Exec=/ {sub(/Exec=/,"",$1); print $1;}' $FILE)
-
-#bang desktop  = ARG="%s"; FILE=$(find /usr/share/applications/ -name ${ARG%% *}.desktop | head -1); PARAM=${ARG#* }; desktop-exec $FILE $PARAM
-

muttrc

@@ -1,29 +0,0 @@
-#fetch passwords
-source "gpg -dq $HOME/.mutt/zoho-mutt-pass.gpg |"
-
-#ewpt3ch.com imap
-set folder    = imaps://imappro.zoho.com
-set imap_user = eric@ewpt3ch.com
-set imap_pass = $my_pass
-set spoolfile = +INBOX
-mailboxes     = +INBOX
-set imap_keepalive = 300
-set mail_check = 120
-
-#ewpt3ch.com smtp
-set realname = 'Eric W Phillips'
-set from = eric@ewpt3ch.com
-set use_from = yes
-set smtp_url=smtps://$imap_user:$imap_pass@smtp.zoho.com
-
-#options for gpgme
-set crypt_use_gpgme = yes
-set crypt_replysign = yes
-set crypt_replyencrypt = yes
-set crypt_replysignencrypted = yes
-set crypt_verify_sig = yes
-
-#view html in a browser
-set mailcap_path = ~/.mutt/mailcap
-alternative_order text/plain text/html
-auto_view text/html

redshift

@@ -3,8 +3,6 @@
 temp-day=6300
 temp-night=4000
 transition=1
-location-provider=manual
-
 
 [manual]
 ;denver

sway.config

@@ -1,198 +0,0 @@
-# Default config for sway
-#
-# Copy this to ~/.config/sway/config and edit it to your liking.
-#
-# Read `man 5 sway` for a complete reference.
-
-### Variables
-#
-# Logo key. Use Mod1 for Alt.
-set $mod Mod1
-# Home row direction keys, like vim
-set $left h
-set $down j
-set $up k
-set $right l
-# Your preferred terminal emulator
-set $term termite
-# Your preferred application launcher
-set $menu dmenu_run
-
-### Output configuration
-#
-# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
-#
-# Example configuration:
-#
-#   output HDMI-A-1 resolution 1920x1080 position 1920,0
-#
-# You can get the names of your outputs by running: swaymsg -t get_outputs
-output eDP-1 scale 2
-output eDP-1 resolution 3200x1800 position 0,0
-### Input configuration
-#
-# Example configuration:
-#
-#   input "2:14:SynPS/2_Synaptics_TouchPad" {
-#       dwt enabled
-#       tap enabled
-#       natural_scroll enabled
-#       middle_emulation enabled
-#   }
-#
-# You can get the names of your inputs by running: swaymsg -t get_inputs
-# Read `man 5 sway-input` for more information about this section.
-
-### Key bindings
-#
-# Basics:
-#
-    # start a terminal
-    bindsym $mod+Return exec $term
-
-    # kill focused window
-    bindsym $mod+Shift+q kill
-
-    # start your launcher
-    bindsym $mod+d exec $menu
-
-    # Drag floating windows by holding down $mod and left mouse button.
-    # Resize them with right mouse button + $mod.
-    # Despite the name, also works for non-floating windows.
-    # Change normal to inverse to use left mouse button for resizing and right
-    # mouse button for dragging.
-    floating_modifier $mod normal
-
-    # reload the configuration file
-    bindsym $mod+Shift+c reload
-
-    # exit sway (logs you out of your wayland session)
-    bindsym $mod+Shift+e exit
-#
-# Moving around:
-#
-    # Move your focus around
-    bindsym $mod+$left focus left
-    bindsym $mod+$down focus down
-    bindsym $mod+$up focus up
-    bindsym $mod+$right focus right
-    # or use $mod+[up|down|left|right]
-    bindsym $mod+Left focus left
-    bindsym $mod+Down focus down
-    bindsym $mod+Up focus up
-    bindsym $mod+Right focus right
-
-    # _move_ the focused window with the same, but add Shift
-    bindsym $mod+Shift+$left move left
-    bindsym $mod+Shift+$down move down
-    bindsym $mod+Shift+$up move up
-    bindsym $mod+Shift+$right move right
-    # ditto, with arrow keys
-    bindsym $mod+Shift+Left move left
-    bindsym $mod+Shift+Down move down
-    bindsym $mod+Shift+Up move up
-    bindsym $mod+Shift+Right move right
-#
-# Workspaces:
-#
-    # switch to workspace
-    bindsym $mod+1 workspace 1
-    bindsym $mod+2 workspace 2
-    bindsym $mod+3 workspace 3
-    bindsym $mod+4 workspace 4
-    bindsym $mod+5 workspace 5
-    bindsym $mod+6 workspace 6
-    bindsym $mod+7 workspace 7
-    bindsym $mod+8 workspace 8
-    bindsym $mod+9 workspace 9
-    bindsym $mod+0 workspace 10
-    # move focused container to workspace
-    bindsym $mod+Shift+1 move container to workspace 1
-    bindsym $mod+Shift+2 move container to workspace 2
-    bindsym $mod+Shift+3 move container to workspace 3
-    bindsym $mod+Shift+4 move container to workspace 4
-    bindsym $mod+Shift+5 move container to workspace 5
-    bindsym $mod+Shift+6 move container to workspace 6
-    bindsym $mod+Shift+7 move container to workspace 7
-    bindsym $mod+Shift+8 move container to workspace 8
-    bindsym $mod+Shift+9 move container to workspace 9
-    bindsym $mod+Shift+0 move container to workspace 10
-    # Note: workspaces can have any name you want, not just numbers.
-    # We just use 1-10 as the default.
-#
-# Layout stuff:
-#
-    # You can "split" the current object of your focus with
-    # $mod+b or $mod+v, for horizontal and vertical splits
-    # respectively.
-    bindsym $mod+b splith
-    bindsym $mod+v splitv
-
-    # Switch the current container between different layout styles
-    bindsym $mod+s layout stacking
-    bindsym $mod+w layout tabbed
-    bindsym $mod+e layout toggle split
-
-    # Make the current focus fullscreen
-    bindsym $mod+f fullscreen
-
-    # Toggle the current focus between tiling and floating mode
-    bindsym $mod+Shift+space floating toggle
-
-    # Swap focus between the tiling area and the floating area
-    bindsym $mod+space focus mode_toggle
-
-    # move focus to the parent container
-    bindsym $mod+a focus parent
-#
-# Scratchpad:
-#
-    # Sway has a "scratchpad", which is a bag of holding for windows.
-    # You can send windows there and get them back later.
-
-    # Move the currently focused window to the scratchpad
-    bindsym $mod+Shift+minus move scratchpad
-
-    # Show the next scratchpad window or hide the focused scratchpad window.
-    # If there are multiple scratchpad windows, this command cycles through them.
-    bindsym $mod+minus scratchpad show
-#
-# Resizing containers:
-#
-mode "resize" {
-    # left will shrink the containers width
-    # right will grow the containers width
-    # up will shrink the containers height
-    # down will grow the containers height
-    bindsym $left resize shrink width 10 px or 10 ppt
-    bindsym $down resize grow height 10 px or 10 ppt
-    bindsym $up resize shrink height 10 px or 10 ppt
-    bindsym $right resize grow width 10 px or 10 ppt
-
-    # ditto, with arrow keys
-    bindsym Left resize shrink width 10 px or 10 ppt
-    bindsym Down resize grow height 10 px or 10 ppt
-    bindsym Up resize shrink height 10 px or 10 ppt
-    bindsym Right resize grow width 10 px or 10 ppt
-
-    # return to default mode
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-}
-bindsym $mod+r mode "resize"
-
-#
-# Status Bar:
-#
-# Read `man 5 sway-bar` for more information about this section.
-bar {
-    position top
-    colors {
-        statusline #ffffff
-        background #323232
-        inactive_workspace #32323200 #32323200 #5c5c5c
-    }
-}
-
-include /etc/sway/config.d/*

termite.config

@@ -1,47 +1,33 @@
 #Customizations
 [options]
-font = Inconsolata 12
-urgent_on_bell = true
+font = Inconsolata 10 
 
 # Solarized dark color scheme
 
 [colors]
-
-# special
-foreground      = #93a1a1
-foreground_bold = #93a1a1
-cursor          = #93a1a1
+foreground = #839496
+foreground_bold = #eee8d5
+#foreground_dim = #888888
 background = #002b36
+cursor = #93a1a1
 
-# black
-color0  = #002b36
-color8  = #657b83
+# if unset, will reverse foreground and background
+#highlight = #839496
 
-# red
+# colors from color0 to color254 can be set
+color0 = #073642
 color1 = #dc322f
-color9  = #dc322f
-
-# green
 color2 = #859900
-color10 = #859900
-
-# yellow
 color3 = #b58900
-color11 = #b58900
-
-# blue
 color4 = #268bd2
-color12 = #268bd2
-
-# magenta
-color5  = #6c71c4
-color13 = #6c71c4
-
-# cyan
+color5 = #d33682
 color6 = #2aa198
-color14 = #2aa198
-
-# white
-color7  = #93a1a1
+color7 = #eee8d5
+color8 = #002b36
+color9 = #cb4b16
+color10 = #586e75
+color11 = #657b83
+color12 = #839496
+color13 = #6c71c4
+color14 = #93a1a1
 color15 = #fdf6e3
-

twmn.conf

@@ -1,31 +0,0 @@
-[gui]
-absolute_position=
-always_on_top=true
-background_color=#4B0082
-bounce=true
-bounce_duration=500
-font=Inconsolataicon
-font_size=50
-font_variant=medium
-foreground_color=#7FF000
-height=55
-in_animation=38
-in_animation_duration=1000
-opacity=100
-out_animation=13
-out_animation_duration=1000
-position=top_right
-screen=
-
-[icons]
-critical_icon=
-info_icon=
-warning_icon=
-
-[main]
-activate_command=
-duration=3000
-enable_shortcuts=true
-host=127.0.0.1
-port=9797
-sound_command=

vimrc

@@ -0,0 +1,8 @@
+syntax enable
+set background=dark
+colorscheme solarized
+set smartindent
+set tabstop=2
+set shiftwidth=2
+set expandtab
+iabbrev <// </<C-X><C-O>

volume.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+mute=`amixer get Master | grep "Front Left:" | awk '{print $6}'`
+if [ $mute == "[on]" ]
+then
+  vol=`amixer get Master | grep "Front Left:" | awk '{print $5}' | tr -d '[]'`
+  echo "ì" $vol
+else
+  echo "ë"
+fi

volumeset.sh

@@ -1,31 +0,0 @@
-#!/bin/bash
-# script for changing the volume and sending
-# notification to twmn using twmnc
-
-step=1
-sink="@DEFAULT_SINK@"
-
-if [[ $# -eq 1 ]]; then
-  case $1 in
-    "up")
-      pactl set-sink-mute $sink false
-      pactl set-sink-volume $sink +$step%
-      direction='increased to';;
-    "down")
-      pactl set-sink-volume $sink -$step%
-      direction='decreased to';;
-    "mute")
-      pactl set-sink-mute $sink toggle;;
-    *)
-      echo "Invalid option";;
-  esac
-fi
-
-muted=`pactl list sinks | grep "Mute" | awk '{print $2}'`
-vol=`pactl list sinks | grep "front-left" | awk '{print $5}'`
-
-if [[ $muted == "yes" ]]; then
-  twmnc -t 'volume' -c 'muted' -d 100
-else
-  twmnc -t 'volume' -c "${direction}${vol}" -d 100
-fi

xinitrc

@@ -1,43 +1,7 @@
-#!/bin/sh
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-sysresources=/etc/X11/xinit/.Xresources
-sysmodmap=/etc/X11/xinit/.Xmodmap
-
-# merge in defaults and keymaps
-
-if [ -f $sysresources ]; then
-
-    xrdb -merge $sysresources
-
-fi
-
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-
-if [ -f "$userresources" ]; then
-
-    xrdb -merge "$userresources"
-
-fi
-
-if [ -f "$usermodmap" ]; then
-    xmodmap "$usermodmap"
-fi
-
-# start some nice programs
-
-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
-
+[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
+#exec openbox-session
+conky | while read -r; do xsetroot -name "$REPLY"; done &
 redshift &
-unclutter -noevents &
-setxkbmap -layout us -option ctrl:nocaps &
-twmnd &
-exec $HOME/bin/dwm-start
+pulseaudio --start &
+google-musicmanager &
+exec dbus-launch --exit-with-session --sh-syntax dwm

xinitrc.old

@@ -1,8 +0,0 @@
-[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
-tresorit --hidden &
-redshift &
-start-pulseaudio-x11 &
-google-musicmanager &
-unclutter -noevents &
-setxkbmap -layout us -option ctrl:nocaps &
-exec dbus-launch --exit-with-session --sh-syntax $HOME/bin/dwm-start