From 73f9940a090795b9db612604695a6f08f8ee397f Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Wed, 17 Aug 2022 21:37:52 +0300
Subject: [PATCH] Add wayland variables and fix termux dotdrop profile

---
 config.toml                     | 12 ++++++++++++
 home/.config/mpv/mpv.conf       | 14 +++-----------
 home/.config/zsh/02-plugins.zsh | 10 +++++-----
 home/.config/zsh/03-aliases.zsh |  2 +-
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/config.toml b/config.toml
index 6dabc24..e095540 100644
--- a/config.toml
+++ b/config.toml
@@ -311,16 +311,25 @@ dotfiles = [
 include = ["os_arch", "email", "media", "sway", "gpg"]
 dotfiles = ["d_systemd"]
 
+[profiles.Mirkwood.variables]
+wayland = true
+
 [profiles.Moria]
 include = ["os_arch", "media", "gpg"]
 dotfiles = ["f_zprofile"]
 
+[profiles.Moria.variables]
+wayland = true
+
 [profiles.Gondor]
 include = ["os_arch"]
 
 [profiles.mko-laptop]
 include = ["os_ubuntu", "media", "gpg"]
 
+[profiles.mko-laptop.variables]
+wayland = false
+
 [profiles.Isengard]
 include = ["os_termux"]
 
@@ -330,6 +339,9 @@ include = ["os_arch"]
 [profiles.TakamakiPC]
 include = ["os_arch"]
 
+[profiles.TakamakiPC.variables]
+wayland = false
+
 [profiles.localhost]
 include = ["os_arch"]
 
diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf
index a088b56..2800d29 100644
--- a/home/.config/mpv/mpv.conf
+++ b/home/.config/mpv/mpv.conf
@@ -7,9 +7,10 @@ vo=gpu
 hwdec=vaapi
 hwdec-codecs=all
 
-{%@@ if profile == "Mirkwood" or profile == "Moria" @@%}
+{%@@ if wayland @@%}
 gpu-context=wayland
-{%@@ elif profile == "mko-laptop" @@%}
+{%@@ endif @@%}
+{%@@ if profile == "mko-laptop" @@%}
 script=~/.lib/mpris.so
 {%@@ endif @@%}
 
@@ -107,12 +108,3 @@ ytdl-format="bestvideo[height<=720]+bestaudio/best[height<=720]"
 ytdl-format="bestvideo[height<=2160]+bestaudio/best[height<=2160]"
 [best]
 ytdl-format="bestvideo+bestaudio"
-
-
-{%@@ if profile == "Mirkwood" @@%}
-# Vulkan hwdec profile
-[vulkan]
-gpu-api=vulkan
-gpu-context=waylandvk
-hwdec=vaapi-copy
-{%@@ endif @@%}
diff --git a/home/.config/zsh/02-plugins.zsh b/home/.config/zsh/02-plugins.zsh
index d8d5a65..6e34d74 100644
--- a/home/.config/zsh/02-plugins.zsh
+++ b/home/.config/zsh/02-plugins.zsh
@@ -39,12 +39,12 @@ zinit ice lucid atinit'zpcompinit'
 zinit light zdharma-continuum/fast-syntax-highlighting
 
 # use fzf with zsh
-{%@@ if profile == "mko-laptop" @@%}
-# Source from home directory since mko-laptop is ubuntu and it has an
+{%@@ if os == "arch" @@%}
+source /usr/share/fzf/key-bindings.zsh
+source /usr/share/fzf/completion.zsh
+{%@@ elif os == "ubuntu" @@%}
+# Source from home directory since ubuntu has
 # old version of FZF in it's repositories
 source ~/Software/fzf/shell/key-bindings.zsh
 source ~/Software/fzf/shell/completion.zsh
-{%@@ else @@%}
-source /usr/share/fzf/key-bindings.zsh
-source /usr/share/fzf/completion.zsh
 {%@@ endif @@%}
diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh
index aa414fa..85ad022 100644
--- a/home/.config/zsh/03-aliases.zsh
+++ b/home/.config/zsh/03-aliases.zsh
@@ -118,7 +118,7 @@ alias i='iwctl station wlan0'
 cpufreq() { watch -n 1 eval "cat /proc/cpuinfo | grep MHz" }
 
 # dotdrop
-dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml $@ }
+dotdrop() { source $DOTREPO/secrets/secrets && $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config.toml {%@@ if profile == "Isengard" @@%} -p isengard{%@@ endif @@%}$@ }
 sdotdrop() { source $DOTREPO/secrets/secrets && sudo -E $DOTREPO/dotdrop/dotdrop.sh --cfg=$DOTREPO/config-root.toml $@ }
 updatesecrets() { bash $DOTREPO/secrets/secrets.sh; chmod 600 $DOTREPO/secrets/secrets }
 compdef _dotdrop-completion.zsh sdotdrop