From 346b81410537291737cca3f54738b0212e07ffc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Dudr?= <vladimir@tango-dj.cz>
Date: Tue, 4 Oct 2022 12:41:51 +0200
Subject: [PATCH] sync

---
 dot_config/git/config                            | 2 +-
 dot_config/herbstluftwm/executable_panel-handler | 9 +++++++--
 dot_config/nvim/lua/configs/neotree.lua          | 4 ++--
 dot_config/paru/paru.conf                        | 4 +++-
 dot_config/php/72/fpm/php-fpm.conf.tmpl          | 8 ++++----
 dot_zshrc                                        | 2 +-
 6 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/dot_config/git/config b/dot_config/git/config
index 41559bb..1f7352d 100644
--- a/dot_config/git/config
+++ b/dot_config/git/config
@@ -32,7 +32,7 @@
 
 [diff]
 	algorithm = patience
-    external = difft
+	external = difft
 
 [sendemail]
     smtpserver = /usr/bin/msmtp
diff --git a/dot_config/herbstluftwm/executable_panel-handler b/dot_config/herbstluftwm/executable_panel-handler
index c8fcd73..2658729 100644
--- a/dot_config/herbstluftwm/executable_panel-handler
+++ b/dot_config/herbstluftwm/executable_panel-handler
@@ -1,6 +1,11 @@
 #!/bin/bash
 
-hc() { herbstclient "$@" ;}
+hc() {
+    t="$EPOCHREALTIME"
+    herbstclient "$@"
+    t2="$EPOCHREALTIME"
+    echo "hc: $( bc<<<"$t2 - $t")" >&2
+}
 panel_height=18
 # bgcolor=$(hc get frame_border_normal_color)
 # selbg=$(hc get window_border_active_color)
@@ -160,7 +165,7 @@ hc --idle | {
                 ;;
             player)
                 # declare -A player_status
-                if [[ "${cmd[1]}" = cmus ]]
+                if [[ "${cmd[1]}" = cmus ]] || [[ "${cmd[1]}" = mpd ]]
                 then
                     play_line=" ${cmd[3]:0:20}/${cmd[4]:0:20}"
                     [[ -n ${cmd[5]} ]] && play_line="$play_line: ${cmd[5]:0:20}"
diff --git a/dot_config/nvim/lua/configs/neotree.lua b/dot_config/nvim/lua/configs/neotree.lua
index 95ef829..e33952a 100644
--- a/dot_config/nvim/lua/configs/neotree.lua
+++ b/dot_config/nvim/lua/configs/neotree.lua
@@ -18,7 +18,7 @@ function M.setup()
         close_if_last_window = false, -- Close Neo-tree if it is the last window left in the tab
         popup_border_style = "rounded",
         enable_git_status = true,
-        enable_diagnostics = true,
+        enable_diagnostics = false,
         sort_case_insensitive = false, -- used when sorting files and directories in the tree
         sort_function = nil, -- use a custom function for sorting files and directories in the tree
         -- sort_function = function (a,b)
@@ -176,7 +176,7 @@ function M.setup()
                     ["<bs>"] = "navigate_up",
                     ["."] = "set_root",
                     ["H"] = "toggle_hidden",
-                    ["/"] = "fuzzy_finder",
+                    ["/"] = "noop",
                     ["D"] = "fuzzy_finder_directory",
                     ["f"] = "filter_on_submit",
                     ["<c-x>"] = "clear_filter",
diff --git a/dot_config/paru/paru.conf b/dot_config/paru/paru.conf
index 78c0ad3..4848fd2 100644
--- a/dot_config/paru/paru.conf
+++ b/dot_config/paru/paru.conf
@@ -13,6 +13,7 @@ CombinedUpgrade
 #CleanAfter
 #UpgradeMenu
 NewsOnUpgrade
+BatchInstall
 
 LocalRepo = paru
 Chroot
@@ -23,7 +24,8 @@ Chroot
 #
 # Binary OPTIONS
 #
-#[bin]
+[bin]
 #FileManager = vifm
 #MFlags = --skippgpcheck
 #Sudo = doas
+Pager=less
diff --git a/dot_config/php/72/fpm/php-fpm.conf.tmpl b/dot_config/php/72/fpm/php-fpm.conf.tmpl
index 594dcb7..f462355 100644
--- a/dot_config/php/72/fpm/php-fpm.conf.tmpl
+++ b/dot_config/php/72/fpm/php-fpm.conf.tmpl
@@ -1,5 +1,5 @@
 [global]
-error_log = /proc/self/fd/2
+error_log = /tmp/php72.log
 daemonize = no
 
 [www]
@@ -13,7 +13,7 @@ pm.max_spare_servers = 3
 
 pm.status_path = /fpm-status
 
-access.log = /proc/self/fd/2
+access.log = /tmp/php72.access.log
 access.format = "%R - %u %t \"%m %r\" %s %d"
 request_terminate_timeout = 0
 
@@ -22,5 +22,5 @@ catch_workers_output = yes
 php_admin_value[error_log] = /dev/stderr
 ;php_admin_flag[log_errors] = on
 ;php_admin_value[memory_limit] = 32M
-php_admin_value[sendmail_path] = {{.chezmoi.homeDir}}/bin/pipemail
-php_admin_value[sys_temp_dir] = {{.chezmoi.homeDir}}/jopixel/webserver/temp
+php_admin_value[sendmail_path] = {{ .chezmoi.homeDir }}/bin/pipemail
+php_admin_value[sys_temp_dir] = {{ .chezmoi.homeDir }}/jopixel/webserver/temp
diff --git a/dot_zshrc b/dot_zshrc
index c027e6d..feb9dc3 100644
--- a/dot_zshrc
+++ b/dot_zshrc
@@ -57,7 +57,7 @@ source $ZSH/oh-my-zsh.sh
 # User configuration
 
 export GOPATH=~/go
-export PATH=$PATH:~/bin:~/.cargo/bin:$GOPATH/bin
+export PATH=~/bin:~/.cargo/bin:$GOPATH/bin:$PATH
 #export MANPAGER="bat -p -l manpage"
 export MANPAGER="sh -c 'col -bx | bat -l man -p'"
 # export MANPATH="/usr/local/man:$MANPATH"