From b53f7f6290ab5f8f26392cb5ab23a8b18dc33633 Mon Sep 17 00:00:00 2001
From: Xerus <27jf@web.de>
Date: Thu, 19 Mar 2020 10:52:15 +0100
Subject: [PATCH] Move zsh config to .config

---
 .bash_aliases                |  2 +-
 .zshrc => .config/zsh/.zshrc |  0
 .gradle/gradle.properties    | 18 +-----------------
 .local/share/shell/functions |  9 +++++++--
 .xsessionrc                  |  6 ++++++
 5 files changed, 15 insertions(+), 20 deletions(-)
 rename .zshrc => .config/zsh/.zshrc (100%)
 mode change 100644 => 120000 .gradle/gradle.properties
 create mode 100644 .xsessionrc

diff --git a/.bash_aliases b/.bash_aliases
index 9cbcd71..8d6a613 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -1,4 +1,4 @@
-source ~/.lcaol/share/shell/functions
+source ~/.local/share/shell/functions
 
 # ls aliases
 
diff --git a/.zshrc b/.config/zsh/.zshrc
similarity index 100%
rename from .zshrc
rename to .config/zsh/.zshrc
diff --git a/.gradle/gradle.properties b/.gradle/gradle.properties
deleted file mode 100644
index 8457a06..0000000
--- a/.gradle/gradle.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-systemProp.org.gradle.internal.http.connectionTimeout=150000
-systemProp.org.gradle.internal.http.socketTimeout=150000
-
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-org.gradle.jvmargs=-mx2G -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-org.gradle.parallel=true
-
-# Enables new incubating mode that makes Gradle selective when configuring projects.
-# Only relevant projects are configured which results in faster builds for large multi-projects.
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:configuration_on_demand
-org.gradle.configureondemand=true
diff --git a/.gradle/gradle.properties b/.gradle/gradle.properties
new file mode 120000
index 0000000..d90f123
--- /dev/null
+++ b/.gradle/gradle.properties
@@ -0,0 +1 @@
+../Dropbox/tools/setup/gradle.properties
\ No newline at end of file
diff --git a/.local/share/shell/functions b/.local/share/shell/functions
index 9780d53..65fe9b5 100644
--- a/.local/share/shell/functions
+++ b/.local/share/shell/functions
@@ -1,12 +1,17 @@
 # Shell configuration for Zsh, works almost completely for Bash as well
+
 export LESS=-R
 export LC_MESSAGES=C
 
 export DIST=$(lsb_release --id | cut -d'	' -f2)
 
+#export PASSWORD_STORE_DIR=~/.local/share/pass
+
+# Some aliases
 alias println='printf "\n"'
 
-alias editgrub='sudo nvim /etc/default/grub && sudo update-grub'
+alias editgrub='sudoedit /etc/default/grub && sudo update-grub'
+alias editenv='sudoedit /etc/environment'
 
 alias startMinecraftServer='curl https://ipinfo.io/ip | xclip -sel clip && cd ~/daten/games/sharedgames/minecraft/server && java -jar forge-1.12.2-14.23.5.2768-universal.jar -mx 8G'
 
@@ -336,7 +341,7 @@ if test "$BASH_VERSION"
 then _clean_map=([m]=~/.mozilla [c]=~/.cache)
 else _clean_map=(m ~/.mozilla c ~/.cache)
 fi
-_clean_folders=(~/.oracle_jre_usage ~/.gradle-kotlin-dsl ~/.thumbnails ~/.zcompdump*)
+_clean_folders=(~/.oracle_jre_usage ~/.gradle-kotlin-dsl ~/.thumbnails $ZDOTDIR/.zcompdump*)
 clean() {
 	
 	for f in $_clean_folders
diff --git a/.xsessionrc b/.xsessionrc
new file mode 100644
index 0000000..22126eb
--- /dev/null
+++ b/.xsessionrc
@@ -0,0 +1,6 @@
+export XDG_DATA_DIRS="$HOME/.local/xdg:$XDG_DATA_DIRS"
+export KDEHOME="$HOME/.local/share/kdehome"
+export PASSWORD_STORE_DIR="$HOME/.local/share/pass"
+export ZDOTDIR="$HOME/.config/zsh"
+export _Z_DATA="$HOME/.config/zsh/z"
+export EDITOR=/usr/bin/nvim