From d8cf77a93a4af16a17c295c4cdba9edddefbb79b Mon Sep 17 00:00:00 2001
From: Sergey Besedin <kr3ssh@pm.me>
Date: Tue, 22 Mar 2022 11:29:45 +0400
Subject: [PATCH] Update

---
 config/htop/htoprc           |  2 +-
 taskrc => config/task/taskrc | 17 ++++-------------
 gitignore_global             |  2 ++
 xinitrc                      |  3 +++
 4 files changed, 10 insertions(+), 14 deletions(-)
 rename taskrc => config/task/taskrc (71%)

diff --git a/config/htop/htoprc b/config/htop/htoprc
index 5214022..6c6ea13 100644
--- a/config/htop/htoprc
+++ b/config/htop/htoprc
@@ -3,7 +3,7 @@
 htop_version=3.1.2
 config_reader_min_version=2
 fields=0 48 17 18 38 39 40 2 46 47 49 1
-sort_key=46
+sort_key=47
 sort_direction=-1
 tree_sort_key=46
 tree_sort_direction=1
diff --git a/taskrc b/config/task/taskrc
similarity index 71%
rename from taskrc
rename to config/task/taskrc
index 9efd989..48a689b 100644
--- a/taskrc
+++ b/config/task/taskrc
@@ -13,19 +13,9 @@
 weekstart=Monday
 
 # Files
-data.location=~/.task
-
-# Color theme (uncomment one to use)
-# include /usr/share/task/rc/light-16.theme
-# include /usr/share/task/rc/light-256.theme
-include /usr/share/task/rc/dark-256.theme
-# include /usr/share/task/rc/dark-red-256.theme
-# include /usr/share/task/rc/dark-green-256.theme
-# include /usr/share/task/rc/dark-blue-256.theme
-# include /usr/share/task/rc/dark-violets-256.theme
-# include /usr/share/task/rc/dark-yellow-green.theme
-# include /usr/share/task/rc/dark-gray-256.theme
-# include /usr/share/task/rc/solarized-dark-256.theme
+data.location=$HOME/.config/task
+hooks.location=$HOME/.config/task/hooks/
+include $HOME/.config/task/themes/dark-256.theme
 
 search.case.sensitive=no
 
@@ -48,3 +38,4 @@ report.active.labels=ID,Project,Description,Time
 
 report.list.labels=ID,Active,Age,Time,D,P,Project,Tags,R,Sch,Due,Until,Description,Urg
 report.list.columns=id,start.age,entry.age,totalactivetime,depends.indicator,priority,project,tags,recur.indicator,scheduled.countdown,due,until.remaining,description.count,urgency
+news.version=2.6.0
diff --git a/gitignore_global b/gitignore_global
index fe1b1db..152bc99 100644
--- a/gitignore_global
+++ b/gitignore_global
@@ -23,3 +23,5 @@ report*.json
 .clinic/
 
 /.elixir_ls/
+
+.gitignore.local
diff --git a/xinitrc b/xinitrc
index b09cfe5..52ac6e5 100755
--- a/xinitrc
+++ b/xinitrc
@@ -10,6 +10,9 @@ export COLORTERM=truecolor
 export QT_QPA_PLATFORMTHEME=qt5ct
 unset QT_STYLE_OVERRIDE
 
+export XDG_CONFIG_HOME=$HOME/.config
+export XDG_DATA_HOME=$HOME/.local/share
+
 # export VDPAU_DRIVER=radeonsi
 
 # https://github.com/robbert-vdh/yabridge#environment-configuration