From 437ceadb6a8d67a61be8bcb97a476b954f184e87 Mon Sep 17 00:00:00 2001
From: yushyin <yushyin@saga>
Date: Mon, 14 Dec 2020 03:12:45 +0100
Subject: Add base16-shell, add playerctl hotkey

---
 .gitmodules                  | 3 +++
 base16-shell/config.zsh      | 4 ++++
 base16-shell/package.toml    | 9 +++++++++
 base16-shell/repo            | 1 +
 config.toml                  | 5 ++++-
 herbstluftwm/files/autostart | 2 +-
 vim/files/vimrc              | 1 +
 zsh/.zshrc                   | 7 ++++---
 zsh/package.toml             | 6 ++++--
 9 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 .gitmodules
 create mode 100644 base16-shell/config.zsh
 create mode 100644 base16-shell/package.toml
 create mode 160000 base16-shell/repo

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..fc9290a
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "base16-shell/repo"]
+	path = base16-shell/repo
+	url = https://github.com/chriskempson/base16-shell
diff --git a/base16-shell/config.zsh b/base16-shell/config.zsh
new file mode 100644
index 0000000..c94494b
--- /dev/null
+++ b/base16-shell/config.zsh
@@ -0,0 +1,4 @@
+# base16-shell
+base16_shell_theme_script=$HOME/.local/share/base16-shell/scripts/base16-monokai.sh
+[ -n "$PS1" ] && [ -s $base16_shell_theme_script ] && . $base16_shell_theme_script
+unset base16_shell_theme_script
diff --git a/base16-shell/package.toml b/base16-shell/package.toml
new file mode 100644
index 0000000..e4fc69d
--- /dev/null
+++ b/base16-shell/package.toml
@@ -0,0 +1,9 @@
+# base16-shell package
+
+[[files]]
+source = './repo'
+dest   = '~/.local/share/base16-shell/'
+
+[[files]]
+source     = './config.zsh'
+collection = 'zshrc'
diff --git a/base16-shell/repo b/base16-shell/repo
new file mode 160000
index 0000000..ce8e1e5
--- /dev/null
+++ b/base16-shell/repo
@@ -0,0 +1 @@
+Subproject commit ce8e1e540367ea83cc3e01eec7b2a11783b3f9e1
diff --git a/config.toml b/config.toml
index 601044e..a39faa5 100644
--- a/config.toml
+++ b/config.toml
@@ -2,7 +2,10 @@
 repositories = { main = { path = './' } }
 
 [configurations.interactive]
-packages = ['git', 'vim', 'tmux']
+packages = ['git', 'vim', 'tmux', 'zsh', 'base16-shell']
+
+[configurations.interactive.collections.zshrc]
+destination = '~/.zshrc'
 
 [configurations.desktop]
 dependencies = ['interactive']
diff --git a/herbstluftwm/files/autostart b/herbstluftwm/files/autostart
index e4c106c..00214f5 100755
--- a/herbstluftwm/files/autostart
+++ b/herbstluftwm/files/autostart
@@ -63,7 +63,7 @@ hc keybind $Mod-Control-Right   resize right +$resizestep
 
 # mediakeys
 
-hc keybind XF86AudioPlay spawn playerctl play-pause
+hc keybind XF86AudioPlay spawn playerctl -i firefox play-pause
 
 # tags
 tag_names=( eins zwei drei vier )
diff --git a/vim/files/vimrc b/vim/files/vimrc
index 7861cc9..aeaacf3 100644
--- a/vim/files/vimrc
+++ b/vim/files/vimrc
@@ -148,6 +148,7 @@ if dein#tap('vim-lsp')
 	function! s:on_lsp_buffer_enabled() abort
 		setl omnifunc=lsp#complete
 		setl signcolumn=yes
+		setl completeopt-=preview
 	endfunction
 
 	augroup lsp_install
diff --git a/zsh/.zshrc b/zsh/.zshrc
index be1bfb0..9046706 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -10,8 +10,8 @@ unsetopt notify
 # History
 setopt append_history hist_ignore_dups hist_ignore_space
 HISTFILE=~/.cache/zsh/histfile
-HISTSIZE=1000
-SAVEHIST=100000
+HISTSIZE=100000
+SAVEHIST=1000000
 
 # Zle
 setopt beep
@@ -41,6 +41,7 @@ compinit -d $HOME/.cache/zsh/zcompdump
 # Misc
 typeset -U path
 path+=(~/.local/bin)
+path+=(~/.ghcup/bin ~/.cabal/bin)
 
 REPORTTIME=2
 PROMPT=": "
@@ -56,4 +57,4 @@ alias p='pacman'
 alias sc='systemctl'
 alias aria2c="aria2c --conf-path=$HOME/.config/aria2/config"
 alias chat="ssh karif -t 'TERM=\"xterm\" /usr/bin/bash -l -c \"tmux attach -t weechat\"'"
-alias tmux='tmux -f ~/.config/tmux/tmux.conf'
+alias tmux='tmux -f ~/.config/tmux/config'
diff --git a/zsh/package.toml b/zsh/package.toml
index 090d08e..4231fdc 100644
--- a/zsh/package.toml
+++ b/zsh/package.toml
@@ -1,6 +1,8 @@
+# zsh package
+
 [[files]]
-source = './.zshrc'
-dest   = '~/.zshrc'
+source     = './.zshrc'
+collection = 'zshrc'
 
 [[files]]
 source = './.zprofile'
-- 
cgit v1.2.3-24-g4f1b