From 2da1116e9d2192af9ac10024ef723fd4c23f854f Mon Sep 17 00:00:00 2001
From: LinuxSquare <7436714-OfficialLinuxSquare@users.noreply.gitlab.com>
Date: Fri, 29 Sep 2023 18:13:56 +0200
Subject: [PATCH] Rework shell

---
 system/files/shell_zshenv.jinja | 14 --------------
 system/files/shell_zshrc.jinja  |  6 ------
 system/shell.sls                | 14 --------------
 3 files changed, 34 deletions(-)
 delete mode 100644 system/files/shell_zshenv.jinja
 delete mode 100644 system/files/shell_zshrc.jinja

diff --git a/system/files/shell_zshenv.jinja b/system/files/shell_zshenv.jinja
deleted file mode 100644
index f8fd17a..0000000
--- a/system/files/shell_zshenv.jinja
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env zsh
-
-# XDG
-export XDG_CONFIG_HOME=$HOME/.config
-export XDG_DATA_HOME=$XDG_CONFIG_HOME/local/share
-export XDG_CACHE_HOME=$XDG_CONFIG_HOME/cache
-
-# editor
-export EDITOR="vim"
-
-# zsh
-export HISTFILE="$HOME/.zhistory"       # History filepath
-export HISTSIZE=10000                   # Maximum events for internal history
-export SAVEHIST=10000                   # Maximum events in history file
diff --git a/system/files/shell_zshrc.jinja b/system/files/shell_zshrc.jinja
deleted file mode 100644
index 077fdb9..0000000
--- a/system/files/shell_zshrc.jinja
+++ /dev/null
@@ -1,6 +0,0 @@
-# load commonrc which is shared by all shell types
-[ -f /etc/commonrc ] && . /etc/commonrc
-[ -f /etc/.zshenv ] && . /etc/.zshenv
-[ -f {{ ZSH_DIR }}/00-keybinds ] && . {{ ZSH_DIR }}/00-keybinds
-
-export LANG=en_US.UTF-8
diff --git a/system/shell.sls b/system/shell.sls
index 5bdc874..793356e 100644
--- a/system/shell.sls
+++ b/system/shell.sls
@@ -24,17 +24,3 @@ system_shell_profile:
     - mode: '0644'
     - require:
       - system_shell_pkgs
-
-system_shell_zsh_include_profile:
-  file.managed:
-    - name: /etc/.zshrc
-    - source: salt://{{ tpldir }}/files/shell_zshrc.jinja
-    - template: jinja
-    - context:
-        ZSH_DIR: {{ noveria.zsh_dir }}
-    - user: root
-    - group: root
-    - mode: '0644'
-    - makedirs: false
-    - require:
-      - system_shell_profile