diff --git a/init.sh b/init.sh index 0a10c7f..f2b0199 100755 --- a/init.sh +++ b/init.sh @@ -2,7 +2,6 @@ mkdir -p ~/.backup mkdir -p ~/.config/qtile ln -snf `pwd`/vimrc ~/.vimrc ln -snf `pwd`/tmux.conf ~/.tmux.conf -ln -snf `pwd`/ohmyzshrc ~/.zshrc ln -snf `pwd`/qtile_config.py ~/.config/qtile/config.py ln -snf `pwd`/gitconfig ~/.gitconfig ln -snf `pwd`/gitignore ~/.gitignore @@ -10,5 +9,4 @@ ln -snf `pwd`/gitignore ~/.gitignore echo "Installing oh-my-zsh..." sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" -# set up vim -#vim +BundleInstall! +qall +ln -snf `pwd`/ohmyzshrc ~/.zshrc diff --git a/ohmyzshrc b/ohmyzshrc index 44c386e..aefe3bf 100644 --- a/ohmyzshrc +++ b/ohmyzshrc @@ -3,7 +3,7 @@ export ZSH_TMUX_AUTOSTART=true export ZSH_TMUX_FIXTERM=false # Path to your oh-my-zsh installation. - export ZSH=/home/asmaps/.oh-my-zsh +export ZSH=~/.oh-my-zsh # Set name of the theme to load. # Look in ~/.oh-my-zsh/themes/ @@ -53,7 +53,7 @@ ZSH_THEME="clean" # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=(git cp dirpersist tmux debian) +plugins=(git cp dirpersist tmux debian virtualenvwrapper) # User configuration @@ -86,4 +86,3 @@ source $ZSH/oh-my-zsh.sh # Example aliases # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" - diff --git a/qtile_config.py b/qtile_config.py index 9b33533..4775392 100644 --- a/qtile_config.py +++ b/qtile_config.py @@ -31,9 +31,19 @@ from libqtile.config import Key, Screen, Group, Drag, Click from libqtile.command import lazy from libqtile import layout, bar, widget, hook + +def run_cmd(cmd): + subprocess.call(cmd) + +home = os.path.expanduser('~') mod = "mod4" keys = [ + Key( + [mod, "control"], "1", + lazy.spawn("sh -c " + home + "/.screenlayout/office.sh"), + ), + # Switch between windows in current stack pane Key( [mod], "k", @@ -75,6 +85,7 @@ keys = [ lazy.layout.toggle_split() ), Key([mod], "Return", lazy.spawn("terminator")), + Key(["control", "mod1"], "l", lazy.spawn("i3lock -c 000000")), # Toggle between different layouts as defined below Key([mod], "Tab", lazy.next_layout()), @@ -83,6 +94,7 @@ keys = [ Key([mod, "control"], "r", lazy.restart()), Key([mod, "control"], "q", lazy.shutdown()), Key([mod], "r", lazy.spawncmd()), + Key([mod], "n", lazy.layout.normalize()), ] groups = [Group(i) for i in "12345"] @@ -99,9 +111,9 @@ for i in groups: ) layouts = [ + layout.tile.Tile(), layout.Max(), - layout.Stack(num_stacks=2), - layout.zoomy.Zoomy(), + layout.floating.Floating(), ] widget_defaults = dict( @@ -147,10 +159,12 @@ screens = [ widget.DF(), widget.Sep(), widget.Battery(), + widget.Sep(), + widget.CurrentLayout(), ], 15, ), - ), + ) for i in range(3) ] # Drag floating layouts. @@ -184,5 +198,4 @@ wmname = "LG3D" @hook.subscribe.startup_once def autostart(): - home = os.path.expanduser('~') - subprocess.call(['feh', '--bg-scale', home + '/Pictures/nywallpaper.jpg']) + run_cmd(['feh', '--bg-scale', home + '/Pictures/nywallpaper.jpg'])