summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--i3/.config/i3/config2
-rw-r--r--nixhome/.config/nixpkgs/home.nix6
-rwxr-xr-xscripts/Scripts/xrotate9
-rw-r--r--zsh/.zshrc1
4 files changed, 10 insertions, 8 deletions
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index fcab76a..76f27bd 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -181,7 +181,7 @@ bindsym $mod+semicolon exec --no-startup-id Scripts/lc --dmenu
bindsym $mod+o exec --no-startup-id Scripts/lc goto
# Password manager
-bindsym $mod+p exec --no-startup-id Scripts/lc bwpass
+bindsym $mod+p exec --no-startup-id Scripts/lc pass
# default app workspaces
assign [class="firefox"] $ws9
diff --git a/nixhome/.config/nixpkgs/home.nix b/nixhome/.config/nixpkgs/home.nix
index 4c8cc4a..ed76cc0 100644
--- a/nixhome/.config/nixpkgs/home.nix
+++ b/nixhome/.config/nixpkgs/home.nix
@@ -13,15 +13,15 @@
xbindkeys
# Developing
- gcc go clang-tools
+ gcc go clang-tools # haskell-language-server
gdb php ghc stack racket chez
# Email and calendar
- evolution gnome3.gnome-calendar evolution-data-server
+ evolution gnome3.gnome-calendar evolution-data-server evolution-ews
# Gui applications
firefox pavucontrol evince leafpad inkscape gimp
- meld pinentry gnome3.gnome-system-monitor
+ meld pinentry gnome3.gnome-system-monitor guake
termite quasselClient wireshark spotify
gnome3.file-roller gnome3.gnome-calculator
gnome3.simple-scan vlc mpv xorg.xev vimHugeX
diff --git a/scripts/Scripts/xrotate b/scripts/Scripts/xrotate
index fabe98b..5518df3 100755
--- a/scripts/Scripts/xrotate
+++ b/scripts/Scripts/xrotate
@@ -11,9 +11,6 @@ function help() {
echo " -h, --help this help message"
}
-# Fix hardcode
-DISP=LVDS1
-
BINNAME="xrotate"
# Parse some args
@@ -39,6 +36,12 @@ while [[ $# -gt 0 ]]; do
esac
done
+if [ -z "${DISP}" ]; then
+ # TODO, this will break with more displays
+ DISP=$(xrandr | awk -F ' ' '/ connected/ {print $1}')
+fi
+
+
O=$1
MOUSE=$(xinput list | grep "slave pointer" | awk '{print $6}' | awk -F '=' '{print $2}')
diff --git a/zsh/.zshrc b/zsh/.zshrc
index c251635..48b93f5 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -116,7 +116,6 @@ alias vim="$EDITOR"
alias ls='ls --color=auto'
alias python="python3"
alias ipy="ipython"
-alias nvim="echo no"
#
# Functions