update

README.md

@@ -0,0 +1,8 @@
+# dotfiles for linux/wsl
+
+clone to `.dotfiles`.
+
+Start by installing the base configuration via `./install.sh`.
+Then choose relevant configuration bundles with `./dotfiles.sh bundname`
+(i.e. `./dotfiles.sh gui`)
+

install.sh

@@ -14,16 +14,6 @@ else
 	echo "zgen already exists."
 fi
 
-# Powerlevel9k Theme
-if [ ! -d "$HOME/.zim/modules/prompt/external-themes/powerlevel9k" ]; then
-	echo "Installing Powerlevel9k theme"
-	git clone --depth=1 https://github.com/bhilburn/powerlevel9k.git \
-		~/.zim/modules/prompt/external-themes/powerlevel9k
-	ln -s ~/.zim/modules/prompt/external-themes/powerlevel9k/powerlevel9k.zsh-theme ~/.zim/modules/prompt/functions/prompt_powerlevel9k_setup
-else
-	echo "Powerlevel9k already exists."
-fi
-
 # Conda and pip
 if [ ! -d "$HOME/conda" ]; then
 	echo "Installing Conda"

profiles.md

@@ -1,5 +0,0 @@
-- base: base config files. includes zshrc, vim, fonts, etc
-- shared: configs shared between several computers 
-- workplace: configs related to workplace pc 
-- laptop: config related to laptop
-- pymol: Pymol plugins and config files

profiles/base/.condarc

@@ -1,3 +1,5 @@
 channels:
+  - conda-forge
   - salilab
   - defaults
+channel_priority: strict

profiles/base/.environment

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-setxkbmap -option caps:escape
-
 # system preferences
 export LANG=en_US.UTF-8
 export SSH_KEY_PATH="~/.ssh/rsa_id"

profiles/laptop/.Xresources

@@ -1,7 +0,0 @@
-Xft.dpi: 130
-Xft.autohint: 0
-Xft.lcdfilter:  lcddefault
-Xft.hintstyle:  hintfull
-Xft.hinting: 1
-Xft.antialias: 1
-Xft.rgba: rgb

profiles/laptop/.config/polybar/config

@@ -1,31 +0,0 @@
-
-include-file = ~/.config/polybar/config.d/colors
-include-file = ~/.config/polybar/config.d/settings
-include-file = ~/.config/polybar/config.d/modules
-include-file = ~/.config/polybar/config.d/base_bar
-
-[bar/laptop]
-inherit = bar/base
-monitor = ${env:MONITOR:}
-
-modules-left = i3 xwindow 
-modules-right = previous playpause next spotify pulseaudio cpu memory battery1 date notifyd
-
-tray-position = right
-tray-padding = 2
-
-
-[bar/laptop_standalone]
-inherit = bar/laptop
-monitor = ${env:MONITOR:}
-
-modules-right = previous playpause next spotify pulseaudio backlight-acpi cpu memory battery1 date notifyd
-
-[bar/laptop_secondary]
-inherit = bar/base
-monitor = ${env:MONITOR:}
-
-modules-left = i3 xwindow 
-modules-right = previous playpause next spotify pulseaudio cpu memory battery1 date
-
-tray-position = none

profiles/laptop/.config/polybar/polybar.sh

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-killall -q polybar
-
-# Wait until the processes have been shut down
-while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
-
-if type "xrandr"; then
-    NUM_DEVICES=$(xrandr --query | grep " connected" | cut -d" " -f1 | wc -l);
-    if [[ $NUM_DEVICES -lt 2 ]]; then
-        for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do
-            MONITOR=$m polybar --reload laptop &
-        done  
-    else
-        # primary screen
-        for m in $(xrandr --query | grep " connected" | grep "primary" | cut -d" " -f1); do
-            MONITOR=$m polybar --reload laptop &
-        done
-        # other screens
-        for m in $(xrandr --query | grep " connected" | grep -v "primary" | cut -d" " -f1); do
-            MONITOR=$m polybar --reload laptop_secondary &
-        done
-    fi
-else
-  polybar --reload laptop &
-fi
-# polybar -c ~/.config/polybar/config laptop &
-# polybar -c ~/.config/polybar/config laptop_extern &
-
-echo "Bars launched..."

profiles/shared/.config/.xmodmaprc

@@ -1,5 +0,0 @@
-! Swap caps lock and escape
-remove Lock = Caps_Lock
-!keysym Escape = Caps_Lock
-keysym Caps_Lock = Escape
-add Lock = Caps_Lock

profiles/workplace/.config/polybar/config

@@ -1,20 +0,0 @@
-
-include-file = ~/.config/polybar/config.d/colors
-include-file = ~/.config/polybar/config.d/settings
-include-file = ~/.config/polybar/config.d/modules
-include-file = ~/.config/polybar/config.d/base_bar
-
-[bar/workstation]
-inherit = bar/base
-monitor = ${env:MONITOR:DP-4}
-modules-left = i3 xwindow
-modules-right = spotify previous playpause next mpd pulseaudio filesystem cpu gpu memory date xkeyboard 
-
-font-0 = "Noto Sans:size=12:style=Regular;1"
-font-1 = unifont:fontformat=truetype:size=12:antialias=false;0
-font-2 = FontAwesome:size=12;0
-
-[bar/workstation2]
-inherit = bar/workstation
-monitor = ${env:MONITOR:DP-2}
-tray-position = right

profiles/workplace/.config/polybar/polybar.sh

@@ -1,14 +0,0 @@
-#!/bin/bash
-
-killall -q polybar
-
-# Wait until the processes have been shut down
-while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
-
-# Launch bar1 and bar2
-polybar -c ~/.config/polybar/config workstation &
-polybar -c ~/.config/polybar/config workstation2 & 
-polybar -c ~/.config/polybar/config laptop &
-polybar -c ~/.config/polybar/config laptop_station &
-
-echo "Bars launched..."