From faeb7bd0d2287228e8f6b0e4ca7f9d4736d13888 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Fri, 23 Oct 2020 11:01:31 -0500
Subject: [PATCH] Various updates

---
 apps/de/x/resources                 |  2 +-
 apps/kak/colors/selenized-black.kak | 83 ++++++++++++++++++++++++++
 apps/kak/colors/selenized-dark.kak  | 83 ++++++++++++++++++++++++++
 apps/kak/colors/selenized-light.kak | 90 +++++++++++++++++++++++++++++
 apps/kak/colors/selenized-white.kak | 90 +++++++++++++++++++++++++++++
 apps/mpd/mpd.conf                   | 28 +++++++++
 apps/ncmpcpp/config                 |  7 +++
 apps/neovim/plugins.vim             |  4 +-
 env/desktop/bin/reboot-to-windows   |  2 +-
 setup.bash                          |  6 ++
 10 files changed, 391 insertions(+), 4 deletions(-)
 create mode 100644 apps/kak/colors/selenized-black.kak
 create mode 100644 apps/kak/colors/selenized-dark.kak
 create mode 100644 apps/kak/colors/selenized-light.kak
 create mode 100644 apps/kak/colors/selenized-white.kak
 create mode 100644 apps/mpd/mpd.conf
 create mode 100644 apps/ncmpcpp/config

diff --git a/apps/de/x/resources b/apps/de/x/resources
index 3d47fe4..4171b2d 100755
--- a/apps/de/x/resources
+++ b/apps/de/x/resources
@@ -1,5 +1,5 @@
 ! font
-#define mono_font iosevka-lyte
+#define mono_font Iosevka
 #define mono_font_size 14
 #define bar_font_size 12
 #define mono_font_letterspace 0
diff --git a/apps/kak/colors/selenized-black.kak b/apps/kak/colors/selenized-black.kak
new file mode 100644
index 0000000..c5c3c09
--- /dev/null
+++ b/apps/kak/colors/selenized-black.kak
@@ -0,0 +1,83 @@
+####################
+# SELENIZED BLACK  #
+####################
+# theme by Jan Warchoł
+# ported by TeddyDD
+
+evaluate-commands %sh{
+
+bg="rgb:181818"
+black="rgb:252525"
+br_black="rgb:3b3b3b"
+white="rgb:777777"
+fg="rgb:b9b9b9"
+br_white="rgb:dedede"
+
+red="rgb:ed4a46"
+green="rgb:70b433"
+yellow="rgb:dbb32d"
+blue="rgb:368aeb"
+magenta="rgb:eb6eb7"
+cyan="rgb:3fc5b7"
+orange="rgb:e67f43"
+violet="rgb:a580e2"
+
+br_red="rgb:ff5e56"
+br_green="rgb:83c746"
+br_yellow="rgb:efc541"
+br_blue="rgb:4f9cfe"
+br_magenta="rgb:ff81ca"
+br_cyan="rgb:56d8c9"
+br_orange="rgb:fa9153"
+br_violet="rgb:b891f5"
+
+## code
+echo "
+set-face global value ${orange}+b
+set-face global type ${br_orange}
+set-face global variable ${magenta}
+set-face global module ${blue}
+set-face global function ${br_cyan}
+set-face global string ${br_green}
+set-face global keyword ${violet}+b
+set-face global operator ${br_cyan}
+set-face global attribute ${orange}
+set-face global comment ${white}
+set-face global meta ${br_orange}
+set-face global builtin ${fg}+b
+
+set-face global title ${blue}+u
+set-face global header ${br_cyan}+u
+set-face global bold ${br_white}+b
+set-face global italic ${br_white}+i
+set-face global mono ${br_green}
+set-face global block ${orange}
+set-face global link $blue
+set-face global bullet ${br_magenta}
+set-face global list ${magenta}
+
+set-face global Default ${fg},${bg}
+set-face global PrimarySelection $black,$white
+set-face global SecondarySelection ${fg},$br_black+i
+set-face global PrimaryCursor $bg,$red+b
+set-face global SecondaryCursor $black,$br_cyan+i
+set-face global MatchingChar $black,$blue
+set-face global Search $br_white,$green
+set-face global CurrentWord $white,$blue
+
+set-face global MenuForeground $cyan,$br_black+b
+set-face global MenuBackground $fg,$black
+
+set-face global Information $br_yellow,$black
+set-face global Error $black,$br_red
+
+set-face global BufferPadding $black,$black
+set-face global Whitespace $white
+set-face global StatusLine $fg,$black
+set-face global StatusLineInfo $yellow,$black
+
+set-face global LineNumbers default
+set-face global LineNumberCursor default,default+r
+"
+
+}
diff --git a/apps/kak/colors/selenized-dark.kak b/apps/kak/colors/selenized-dark.kak
new file mode 100644
index 0000000..fc2f6e1
--- /dev/null
+++ b/apps/kak/colors/selenized-dark.kak
@@ -0,0 +1,83 @@
+##################
+# SELENIZED DARK #
+##################
+# theme by Jan Warchoł
+# ported by Delapouite
+
+evaluate-commands %sh{
+
+bg="rgb:103c48"
+black="rgb:184956"
+br_black="rgb:2d5b69"
+white="rgb:72898f"
+fg="rgb:adbcbc"
+br_white="rgb:cad8d9"
+
+red="rgb:fa5750"
+green="rgb:75b938"
+yellow="rgb:dbb32d"
+blue="rgb:4695f7"
+magenta="rgb:f275be"
+cyan="rgb:41c7b9"
+orange="rgb:ed8649"
+violet="rgb:af88eb"
+
+br_red="rgb:ff665c"
+br_green="rgb:84c747"
+br_yellow="rgb:ebc13d"
+br_blue="rgb:58a3ff"
+br_magenta="rgb:ff84cd"
+br_cyan="rgb:53d6c7"
+br_orange="rgb:fd9456"
+br_violet="rgb:bd96fa"
+
+## code
+echo "
+set-face global value ${orange}+b
+set-face global type ${br_orange}
+set-face global variable ${magenta}
+set-face global module ${blue}
+set-face global function ${br_cyan}
+set-face global string ${br_green}
+set-face global keyword ${violet}+b
+set-face global operator ${br_cyan}
+set-face global attribute ${orange}
+set-face global comment ${white}
+set-face global meta ${br_orange}
+set-face global builtin ${fg}+b
+
+set-face global title ${blue}+u
+set-face global header ${br_cyan}+u
+set-face global bold ${br_white}+b
+set-face global italic ${br_white}+i
+set-face global mono ${br_green}
+set-face global block ${orange}
+set-face global link $blue
+set-face global bullet ${br_magenta}
+set-face global list ${magenta}
+
+set-face global Default ${fg},${bg}
+set-face global PrimarySelection $black,$white
+set-face global SecondarySelection ${fg},$br_black+i
+set-face global PrimaryCursor $bg,$red+b
+set-face global SecondaryCursor $black,$br_cyan+i
+set-face global MatchingChar $black,$blue
+set-face global Search $br_white,$green
+set-face global CurrentWord $white,$blue
+
+set-face global MenuForeground $cyan,$br_black+b
+set-face global MenuBackground $fg,$black
+
+set-face global Information $br_yellow,$black
+set-face global Error $black,$br_red
+
+set-face global BufferPadding $black,$black
+set-face global Whitespace $white
+set-face global StatusLine $fg,$black
+set-face global StatusLineInfo $yellow,$black
+
+set-face global LineNumbers default
+set-face global LineNumberCursor default,default+r
+"
+
+}
diff --git a/apps/kak/colors/selenized-light.kak b/apps/kak/colors/selenized-light.kak
new file mode 100644
index 0000000..96ae169
--- /dev/null
+++ b/apps/kak/colors/selenized-light.kak
@@ -0,0 +1,90 @@
+####################
+# SELENIZED LIGHT  #
+####################
+# theme by Jan Warchoł
+# ported by TeddyDD
+
+evaluate-commands %sh{
+
+bg='rgb:fbf3db'
+black='rgb:ece3cc'
+br_black='rgb:d5cdb6'
+white='rgb:909995'
+fg='rgb:53676d'
+br_white='rgb:3a4d53'
+
+red='rgb:d2212d'
+green='rgb:489100'
+yellow='rgb:ad8900'
+blue='rgb:0072d4'
+magenta='rgb:ca4898'
+cyan='rgb:009c8f'
+orange='rgb:c25d1e'
+violet='rgb:8762c6'
+
+br_red='rgb:cc1729'
+br_green='rgb:428b00'
+br_yellow='rgb:a78300'
+br_blue='rgb:006dce'
+br_magenta='rgb:c44392'
+br_cyan='rgb:00978a'
+br_orange='rgb:bc5819'
+br_violet='rgb:825dc0'
+
+## code
+echo "
+set-face global value ${orange}+b
+set-face global type ${br_orange}
+set-face global variable ${magenta}
+set-face global module ${green}
+set-face global function ${br_cyan}
+set-face global string ${green}
+set-face global keyword ${violet}+b
+set-face global operator ${br_cyan}
+set-face global attribute ${orange}
+set-face global comment ${br_black}
+set-face global meta ${br_orange}
+set-face global builtin ${fg}+b
+"
+
+## markup
+echo "
+set-face global title ${blue}+u
+set-face global header ${br_cyan}
+set-face global bold ${br_orange}+b
+set-face global italic ${orange}+i
+set-face global mono ${green}
+set-face global block ${orange}
+set-face global link $blue
+set-face global bullet ${br_magenta}
+set-face global list ${magenta}
+"
+
+echo "
+set-face global Default ${br_white},${bg}
+set-face global PrimarySelection ${fg},$br_black+i
+set-face global SecondarySelection $black,$white
+set-face global PrimaryCursor $black,$red+b
+set-face global SecondaryCursor $bg,$br_cyan+i
+set-face global MatchingChar $black,$blue
+set-face global Search $br_white,$green
+set-face global CurrentWord $white,$blue
+
+# when item focused in menu
+set-face global MenuForeground $orange,$br_black+d
+# default bottom menu and autocomplete
+set-face global MenuBackground $fg,$black
+
+set-face global Information $yellow,$black
+set-face global Error $black,$red
+
+set-face global BufferPadding $black,$black
+set-face global Whitespace $br_black
+set-face global StatusLine $fg,$br_black
+set-face global StatusLineInfo $blue,$br_black
+
+set-face global LineNumbers default
+set-face global LineNumberCursor default,default+r
+"
+
+}
diff --git a/apps/kak/colors/selenized-white.kak b/apps/kak/colors/selenized-white.kak
new file mode 100644
index 0000000..0e8cc63
--- /dev/null
+++ b/apps/kak/colors/selenized-white.kak
@@ -0,0 +1,90 @@
+###################
+# SELENIZED WHITE #
+###################
+# theme by Jan Warchoł
+# ported by Delapouite
+
+evaluate-commands %sh{
+
+bg='rgb:ffffff'
+black='rgb:ebebeb'
+br_black='rgb:cdcdcd'
+white='rgb:878787'
+fg='rgb:474747'
+br_white='rgb:282828'
+
+red='rgb:d6000c'
+green='rgb:1d9700'
+yellow='rgb:c49700'
+blue='rgb:0064e4'
+magenta='rgb:dd0f9d'
+cyan='rgb:00ad9c'
+orange='rgb:d04a00'
+violet='rgb:7f51d6'
+
+br_red='rgb:bf0000'
+br_green='rgb:008400'
+br_yellow='rgb:af8500'
+br_blue='rgb:0054cf'
+br_magenta='rgb:c7008b'
+br_cyan='rgb:009a8a'
+br_orange='rgb:ba3700'
+br_violet='rgb:6b40c3'
+
+## code
+echo "
+set-face global value ${orange}+b
+set-face global type ${br_orange}
+set-face global variable ${magenta}
+set-face global module ${green}
+set-face global function ${br_cyan}
+set-face global string ${green}
+set-face global keyword ${violet}+b
+set-face global operator ${br_cyan}
+set-face global attribute ${orange}
+set-face global comment ${br_black}
+set-face global meta ${br_orange}
+set-face global builtin ${fg}+b
+"
+
+## markup
+echo "
+set-face global title ${blue}+u
+set-face global header ${br_cyan}
+set-face global bold ${br_orange}+b
+set-face global italic ${orange}+i
+set-face global mono ${green}
+set-face global block ${orange}
+set-face global link $blue
+set-face global bullet ${br_magenta}
+set-face global list ${magenta}
+"
+
+echo "
+set-face global Default ${br_white},${bg}
+set-face global PrimarySelection ${fg},$br_black+i
+set-face global SecondarySelection $black,$white
+set-face global PrimaryCursor $black,$red+b
+set-face global SecondaryCursor $bg,$br_cyan+i
+set-face global MatchingChar $black,$blue
+set-face global Search $br_white,$green
+set-face global CurrentWord $white,$blue
+
+# when item focused in menu
+set-face global MenuForeground $orange,$br_black+d
+# default bottom menu and autocomplete
+set-face global MenuBackground $fg,$black
+
+set-face global Information $yellow,$black
+set-face global Error $black,$red
+
+set-face global BufferPadding $black,$black
+set-face global Whitespace $br_black
+set-face global StatusLine $fg,$br_black
+set-face global StatusLineInfo $blue,$br_black
+
+set-face global LineNumbers default
+set-face global LineNumberCursor default,default+r
+"
+
+}
diff --git a/apps/mpd/mpd.conf b/apps/mpd/mpd.conf
new file mode 100644
index 0000000..27e271a
--- /dev/null
+++ b/apps/mpd/mpd.conf
@@ -0,0 +1,28 @@
+auto_update "yes"
+
+audio_output {
+	type "pulse"
+	name "pulse audio"
+}
+
+db_file      "~/.local/mpd/database"
+log_file     "syslog"
+pid_file     "~/.local/mpd/pid"
+state_file   "~/.local/mpd/pid"
+sticker_file "~/.local/mpd/sticker.sql"
+
+playlist_directory "~/../music/mpd-playlists"
+music_directory    "~/../music"
+
+# bind_to_address "~/.local/mpd/socket"
+bind_to_address "any"
+port "6600"
+restore_paused "yes"
+log_level "verbose"
+
+input {
+  plugin "curl"
+  # proxy "proxy.isp.com:8080"
+  # proxy_user "user"
+  # proxy_password "password"
+}
diff --git a/apps/ncmpcpp/config b/apps/ncmpcpp/config
new file mode 100644
index 0000000..422b610
--- /dev/null
+++ b/apps/ncmpcpp/config
@@ -0,0 +1,7 @@
+mpd_music_dir = "~/../music"
+lyrics_directory  = ~/.ncmpcpp/lyrics
+ncmpcpp_directory  = ~/.ncmpcpp
+mpd_host = "localhost"
+mpd_port = "6600"
+mpd_connection_timeout = "5"
+mpd_crossfade_time = "5"
diff --git a/apps/neovim/plugins.vim b/apps/neovim/plugins.vim
index 7d6abbb..852873b 100644
--- a/apps/neovim/plugins.vim
+++ b/apps/neovim/plugins.vim
@@ -46,13 +46,13 @@ let g:polyglot_disabled = ['cue', 'cuesheet']
 if exists('asmanviewer') || exists('nosession')
 	let g:prosession_dir = '/dev/null'
 else
+	Plug 'tpope/vim-obsession'        " session ease-of-use
+	Plug 'dhruvasagar/vim-prosession' " more session ease-of-use
 endif
 
 Plug 'junegunn/vim-plug'                                        " plugin manager should manage itself
 Plug 'junegunn/fzf', {'dir': '~/.fzf', 'do': './install --all'} " fuzzy file finding
 Plug 'junegunn/fzf.vim'                                         " helpers for using fzf in vim
-Plug 'tpope/vim-obsession'                                      " session ease-of-use
-Plug 'dhruvasagar/vim-prosession'                               " more session ease-of-use
 Plug 'vim-airline/vim-airline'                                  " status line
 Plug 'vim-airline/vim-airline-themes'                           " more minimal status line
 Plug 'nathanaelkane/vim-indent-guides'                          " indentation guides
diff --git a/env/desktop/bin/reboot-to-windows b/env/desktop/bin/reboot-to-windows
index b37e5bc..cfd84f6 100755
--- a/env/desktop/bin/reboot-to-windows
+++ b/env/desktop/bin/reboot-to-windows
@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
-sudo efibootmgr -n 0001
+sudo efibootmgr -n 0000
 sudo reboot
diff --git a/setup.bash b/setup.bash
index 67f3925..22280f9 100755
--- a/setup.bash
+++ b/setup.bash
@@ -116,6 +116,12 @@ links=(
 
 	# XDG user directories
 	"apps/shell/user-dirs"              "$XDG_CONFIG_HOME/user-dirs.dirs"
+
+	# Music Player Daemon
+	"apps/mpd"                          "$XDG_CONFIG_HOME/mpd"
+
+	# MPD client
+	"apps/ncmpcpp"                      "$HOME/.ncmpcpp"
 )
 
 chmod 700 -R "$HOME/.bin"