summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiklas Halle <git@niklashalle.net>2019-11-14 12:35:16 +0100
committerNiklas Halle <git@niklashalle.net>2019-11-14 12:35:16 +0100
commit1c0e61c7caf8d98fb9f2164fac7e5e4a35556336 (patch)
tree6dccb86fe59be8d541d261954e4ff9d55c7696b2
parent3b33a047bedf0c10a938254b393aacee270fe6bc (diff)
downloaddotfiles-1c0e61c7caf8d98fb9f2164fac7e5e4a35556336.tar.gz
dotfiles-1c0e61c7caf8d98fb9f2164fac7e5e4a35556336.zip
Updated dotfiles
-rw-r--r--.Xresources2
-rwxr-xr-x.config/bspwm/bspwmrc3
-rw-r--r--.config/polybar/config8
-rw-r--r--.config/sxhkd/sxhkdrc2
-rw-r--r--.zshenv3
-rw-r--r--.zshrc41
-rwxr-xr-xbin/be_clear9
-rwxr-xr-xbin/device_removed.sh9
-rw-r--r--bin/enable_touch2click2
-rwxr-xr-xbin/lock2
-rwxr-xr-xbin/ssh_fingerprint2
-rw-r--r--modprobe.d/firewalld-sysctls.conf1
-rw-r--r--modprobe.d/sound.conf1
13 files changed, 71 insertions, 14 deletions
diff --git a/.Xresources b/.Xresources
index 34fd6f1..e86f41c 100644
--- a/.Xresources
+++ b/.Xresources
@@ -30,7 +30,7 @@ Xft.rgba: rgba
! clickable links, clipboard support, mouse wheel support, and on the fly font resizing
URxvt.perl-ext-common: default,matcher,clipboard,vtwheel,resize-font
-URxvt.url-launcher: /usr/bin/chromium
+URxvt.url-launcher: /usr/bin/firefox
URxvt.matcher.button: 1
URxvt.matcher.rend.0: Uline Bold fg6
diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
index ba5c178..69a70cf 100755
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@@ -1,6 +1,7 @@
#! /bin/bash
sxhkd &
+xautolock &
# bspwn settings
bspc monitor -d I II III IV V VI VII VIII IX X
@@ -18,5 +19,3 @@ bspc config click_to_focus true
bspc config normal_border_color "#3c3836"
bspc config focused_border_color "#665c54"
bspc config presel_feedback_color "#7c6f64"
-
-bspc rule -a Chromium desktop=^2
diff --git a/.config/polybar/config b/.config/polybar/config
index dc6ff8c..0c1743c 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -48,7 +48,7 @@ font-0 = SourceCodePro:size=12;1
font-1 = FontAwesome:size=12;1
font-3 = MaterialDesignIcons:size=14;0
-tray-background = ${bar/bottom.background}
+tray-background = ${colors.background}
tray-position = right
tray-padding = 2
@@ -69,7 +69,7 @@ ramp-4 = 🌑
[module/battery]
type = internal/battery
-full-at = 92
+full-at = 95
battery = BAT0
adapter = ADP1
@@ -159,7 +159,7 @@ type = internal/network
interface = enp2s0
interval = 3.0
-label-connected = LAN: %local_ip%
+label-connected = LAN: %local_ip%  %upspeed%  %downspeed%
[module/volume]
type = internal/volume
@@ -220,7 +220,7 @@ label =  %output% 
[module/vpncheck]
type = custom/script
-exec = ip link | grep -E "tun0|mullvad"
+exec = ip link | grep -iE "tun0|mullvad|wireguard"
interval = 1
label-foreground = #39d800
label = " VPN"
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index 15e3c15..4782dbc 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -11,7 +11,7 @@ super + shift + Return
# file explorer
super + e
- urxvt -depth 32 -bg rgba:2800/2800/2800/b500 -e "ranger"
+ thunar
# program launcher
super + @space
diff --git a/.zshenv b/.zshenv
index 0b32842..da8e478 100644
--- a/.zshenv
+++ b/.zshenv
@@ -3,7 +3,7 @@ export XDG_DATA_HOME=~/.config
export LANG=en_US.UTF-8
export EDITOR=vim
-export BROWSER=chromium
+export BROWSER=firefox
# add scripts to path
if [[ $UID -ge 1000 && -d $HOME/bin && -z $(echo $PATH | grep -o $HOME/bin) ]]
@@ -15,4 +15,3 @@ fi
if [ -n "$DISPLAY" ] && [ -z "$dmenu_args" ]; then
export dmenu_args="-i -w $(($(xrandr -q | grep Screen | awk '{print $8}') - 20)) -x 10 -y $(($(($(xrandr -q | grep Screen | awk '{print $10}' | sed s/,//) / 2)) - 250)) -fn "-*-terminus-*-*-*-*-*-*-*-*-*-*-*-*" -nb #282828 -nf #ebdbb2 -sb #8C9440 -sf #000 -dim 0.75"
fi
-
diff --git a/.zshrc b/.zshrc
index 633d3b0..a74c419 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,8 +1,6 @@
# make
export MAKEFLAGS="$MAKEFLAGS -j$(($(nproc)))"
-export GPG_TTY=$(tty)
-
HISTFILE=~/.histfile
HISTSIZE=1000000
SAVEHIST=100000
@@ -64,6 +62,39 @@ function gap() {
bspc config -d focused window_gap $((`bspc config -d focused window_gap` $1))
}
+# blockify cli control
+function bb() {
+ local signal
+ case "$1" in
+ '') blockify-dbus get 2>/dev/null && return 0;;
+ ex|exit)
+ signal='TERM';; # Exit
+ b|block)
+ signal='USR1';; # Block
+ u|unblock)
+ signal='USR2';; # Unblock
+ p|previous)
+ signal='RTMIN';; # Previous song
+ n|next)
+ signal='RTMIN+1';; # Next song
+ t|toggle)
+ signal='RTMIN+2';; # Toggle play song
+ tb|toggleblock)
+ signal='RTMIN+3';; # Toggle block song
+ ip|iprevious)
+ signal='RTMIN+10';; # Previous interlude song
+ in|inext)
+ signal='RTMIN+11';; # Next interlude song
+ it|itoggle)
+ signal='RTMIN+12';; # Toggle play interlude song
+ itr|itoggleresume)
+ signal='RTMIN+13';; # Toggle interlude resume
+ *) echo "Usage: bb ( b[lock] | u[nblock] | p[revious] | n[ext] | t[oggle] | t[oggle]b[lock] |...)" && return 0;;
+ esac
+ pkill --signal "$signal" -f 'python.*blockify'
+}
+
+
# ls
export COLUMNS # Remember columns for subprocesses.
eval "$(dircolors)"
@@ -109,4 +140,8 @@ function netctl() {
# prompt
autoload -Uz promptinit
promptinit
-prompt walters
+prompt walters2
+source /home/niklas/.git_prompt/zshrc.sh
+
+# nvm
+#source /usr/share/nvm/init-nvm.sh
diff --git a/bin/be_clear b/bin/be_clear
new file mode 100755
index 0000000..eb0986d
--- /dev/null
+++ b/bin/be_clear
@@ -0,0 +1,9 @@
+#!/bin/python
+import sys
+import os
+import subprocess as sp
+
+sp.call('clear', shell=True)
+rows, columns = sp.check_output(['stty', 'size']).split()
+
+print((" " + " ".join(sys.argv[1:]) + " ").center(int(columns), "*"))
diff --git a/bin/device_removed.sh b/bin/device_removed.sh
new file mode 100755
index 0000000..af6b8b6
--- /dev/null
+++ b/bin/device_removed.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# echo "USB device removed `date` $@" >>/tmp/xscreenlock.log
+
+user=niklas
+
+if [ ! -z "$user" ] ; then
+ DISPLAY=:0 sudo -n -H -u "$user" /home/niklas/bin/lock
+fi
diff --git a/bin/enable_touch2click b/bin/enable_touch2click
new file mode 100644
index 0000000..8cf8cf0
--- /dev/null
+++ b/bin/enable_touch2click
@@ -0,0 +1,2 @@
+#!/bin/zsh
+xinput set-prop "DLL0798:00 06CB:7E92 Touchpad" "libinput Tapping Enabled" 1
diff --git a/bin/lock b/bin/lock
index b3c21d2..805df5b 100755
--- a/bin/lock
+++ b/bin/lock
@@ -20,7 +20,7 @@ i3lock --verifcolor=deedd2ff --timecolor=deebb2ff --datecolor=deebb2ff --insidec
--ringcolor=fff419ff --keyhlcolor=456387ff --bshlcolor=bc3838ff --insidevercolor=456387ff \
--insidewrongcolor=bc3838ff --ringvercolor=83a2a6ff --ringwrongcolor=faab34ff \
--line-uses-inside --linecolor=666554ff --blur 5 --clock --indicator \
- --datestr="%A, %b %d" --timestr="%H:%M" --wrongtext="Nope!" --indpos="960:490"
+ --datestr="%A, %b %d" --timestr="%H:%M:%S" --wrongtext="Nope!" --indpos="960:490"
# revive dunst
#pkill -u $USER -USR2 dunst
diff --git a/bin/ssh_fingerprint b/bin/ssh_fingerprint
new file mode 100755
index 0000000..f030416
--- /dev/null
+++ b/bin/ssh_fingerprint
@@ -0,0 +1,2 @@
+#!/bin/zsh
+ssh-keygen -l -E md5 -f $1
diff --git a/modprobe.d/firewalld-sysctls.conf b/modprobe.d/firewalld-sysctls.conf
new file mode 100644
index 0000000..c313db1
--- /dev/null
+++ b/modprobe.d/firewalld-sysctls.conf
@@ -0,0 +1 @@
+install nf_conntrack /usr/bin/modprobe --ignore-install nf_conntrack $CMDLINE_OPTS && /sbin/sysctl --quiet --pattern 'net[.]netfilter[.]nf_conntrack.*' --system
diff --git a/modprobe.d/sound.conf b/modprobe.d/sound.conf
new file mode 100644
index 0000000..8bfee58
--- /dev/null
+++ b/modprobe.d/sound.conf
@@ -0,0 +1 @@
+options snd-hda-intel model=ideapad