summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian T <julian@jtle.dk>2020-01-13 12:51:55 +0100
committerJulian T <julian@jtle.dk>2020-01-13 12:51:55 +0100
commit4486784f8003e3b73bb228443a359a32dc8f0e43 (patch)
tree80590c24122813cbaa938340fd1517249f674fba
parent2171f213d6c7d0443c52b736b12f4394b4e34655 (diff)
i3 and zsh cleanup, and passmenu smaller mod
-rw-r--r--i3/Scripts/mic.sh19
-rw-r--r--i3/Scripts/net.sh19
-rw-r--r--i3/Scripts/ram.sh19
-rw-r--r--i3/Scripts/runStat.sh6
-rw-r--r--i3/Scripts/status.sh20
-rw-r--r--scripts/Scripts/passmenu3
-rw-r--r--zsh/.zshrc16
7 files changed, 6 insertions, 96 deletions
diff --git a/i3/Scripts/mic.sh b/i3/Scripts/mic.sh
deleted file mode 100644
index 78afaa8..0000000
--- a/i3/Scripts/mic.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-PIDFILE=/tmp/statMic.pid
-STATUSFILE=/tmp/dsbAMic
-
-kill `cat $PIDFILE`
-if [ $? -eq 0 ]; then
- echo "Shutting down"
- rm $STATUSFILE
- exit
-fi
-
-echo $$ > $PIDFILE
-
-while true; do
-
- MIC=$(amixer get Capture | grep "Front Left:" | sed 's/.*\[\(.*\)\].*/\1/')
-
- echo "$MIC " > $STATUSFILE
- sleep 1
-done
diff --git a/i3/Scripts/net.sh b/i3/Scripts/net.sh
deleted file mode 100644
index d443091..0000000
--- a/i3/Scripts/net.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-PIDFILE=/tmp/statNet.pid
-STATUSFILE=/tmp/dsbANet
-
-kill `cat $PIDFILE`
-if [ $? -eq 0 ]; then
- echo "Shutting down"
- rm $STATUSFILE
- exit
-fi
-
-echo $$ > $PIDFILE
-
-while true; do
-
- IP=$( ip -4 a | grep "inet " | sed "s:inet \(.*\)/.*:\1:" | tr -d " " | grep -v "0.1" | tr "\n" " ")
-
- echo "$IP " > $STATUSFILE
- sleep 10
-done
diff --git a/i3/Scripts/ram.sh b/i3/Scripts/ram.sh
deleted file mode 100644
index b0c2442..0000000
--- a/i3/Scripts/ram.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-PIDFILE=/tmp/statRam.pid
-STATUSFILE=/tmp/dsbRfree
-
-kill `cat $PIDFILE`
-if [ $? -eq 0 ]; then
- echo "Shutting down"
- rm $STATUSFILE
- exit
-fi
-
-echo "Starting up"
-
-echo $$ > $PIDFILE
-
-while true; do
- echo " $(free -h | grep Mem: | awk '{print $3}') " > $STATUSFILE
- sleep 2
-done
-
diff --git a/i3/Scripts/runStat.sh b/i3/Scripts/runStat.sh
deleted file mode 100644
index 52b0536..0000000
--- a/i3/Scripts/runStat.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-elements="ram.sh status.sh mic.sh"
-
-if [ $1 = "dmenu" ]; then
- sh $(echo $elements | tr " " "\n" | dmenu -i -p ":")
-fi
-
diff --git a/i3/Scripts/status.sh b/i3/Scripts/status.sh
deleted file mode 100644
index 3d1eba4..0000000
--- a/i3/Scripts/status.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-PIDFILE=/tmp/stat.pid
-STATUSFILE=/tmp/dsbMain
-
-kill `cat $PIDFILE`
-if [ $? -eq 0 ]; then
- echo "Shutting down"
- rm $STATUSFILE
- exit
-fi
-
-echo $$ > $PIDFILE
-
-while true; do
-
- BATT=$( acpi -b | sed 's/.*[charging|unknown], \([0-9]*\)%.*/\1/gi' )
- TIME=$(/bin/date +"%H:%M")
-
- echo "$IP $TIME $BATT%" > $STATUSFILE
- sleep 10
-done
diff --git a/scripts/Scripts/passmenu b/scripts/Scripts/passmenu
index be2d206..71c9456 100644
--- a/scripts/Scripts/passmenu
+++ b/scripts/Scripts/passmenu
@@ -1,6 +1,7 @@
#!/usr/bin/env bash
DMENU="rofi -dmenu"
+NOTIFY="notify-send"
shopt -s nullglob globstar
@@ -26,5 +27,5 @@ else
xdotool type --clearmodifiers --file -
fi
-notify-send "Done"
+$NOTIFY "Done"
# pass $password | grep login | cut -d' ' -f2- | xclip -selection c
diff --git a/zsh/.zshrc b/zsh/.zshrc
index a3a4542..69dfa3a 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -1,13 +1,8 @@
export TERM="xterm-256color"
-# 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/julian/.oh-my-zsh
-# Set name of the theme to load. Optionally, if you set this to "random"
-# it'll load a random theme each time that oh-my-zsh is loaded.
# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
ZSH_THEME="af-magic"
@@ -16,7 +11,7 @@ ZSH_THEME="af-magic"
# Uncomment the following line to use hyphen-insensitive completion. Case
# sensitive completion must be off. _ and - will be interchangeable.
-# HYPHEN_INSENSITIVE="true"
+HYPHEN_INSENSITIVE="true"
# Uncomment the following line to disable bi-weekly auto-update checks.
# DISABLE_AUTO_UPDATE="true"
@@ -24,12 +19,6 @@ ZSH_THEME="af-magic"
# 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"
@@ -57,6 +46,9 @@ plugins=(git sudo pass)
source $ZSH/oh-my-zsh.sh
+autoload -Uz compinit
+compinit
+
# User configuration
# export MANPATH="/usr/local/man:$MANPATH"