materus/nixos-config
1
0
Fork 0
mirror of https://github.com/materusPL/nixos-config synced 2026-06-18 16:37:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

common: zsh changes

Browse Source
This commit is contained in:
Mateusz Słodkowicz 2026-06-14 10:39:13 +02:00
parent 5440b8aaf2
commit 640907f9e1
Signed by: materus
SSH Key Fingerprint: SHA256:rzVduzTiiszuYfLPYD0SDZV+g8lxhpcRgpbOZA1X0Uo
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/shell/zsh/.zprofile Normal file
View File

@ -0,0 +1,3 @@
__HOME_ZPROFILE_SOURCED=1
[[ -f "/etc/profile" ]] && emulate sh -c "source /etc/profile"
[[ -f "~/.profile" ]] && emulate sh -c "source ~/.profile"

8
config/shell/zsh/zshrc → config/shell/zsh/.zshrc
View File

@ -1,3 +1,5 @@
__HOME_ZSHRC_SOURCED=1
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
fi fi
@ -7,8 +9,8 @@ if [ -n "$EAT_SHELL_INTEGRATION_DIR" ]; then
source "$EAT_SHELL_INTEGRATION_DIR/zsh"; source "$EAT_SHELL_INTEGRATION_DIR/zsh";
fi fi
export ZSH_DATA_DIR="${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/data" ZSH_DATA_DIR="${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/data"
export ZSH_CONFIG_DIR="${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/cfg" ZSH_CONFIG_DIR="${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/cfg"
#Check if terminal is fullcolor #Check if terminal is fullcolor
if zmodload zsh/terminfo && (( "$terminfo[colors]" >= "256" )); then if zmodload zsh/terminfo && (( "$terminfo[colors]" >= "256" )); then
@ -19,7 +21,7 @@ fi
#MSYS #MSYS
if [[ "$(uname -s)" =~ ^MSYS_NT.* ]]; then if [[ "$(uname -s)" =~ ^MSYS_NT.* ]]; then
#Use windows symlink instead copy #Use windows symlink instead copy
export MSYS=winsymlinks:nativestrict MSYS=winsymlinks:nativestrict
fi fi

6
config/shell/zsh/zshenv
View File

@ -1 +1,5 @@
__MATERUS_HM_ZSH=1 #TODO: Set ZDOTDIR based on MKK_CONFIG_PATH
__HOME_ZSHENV_SOURCED=1
ZDOTDIR=${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/cfg
setopt no_global_rcs

1
nix-config/home/materus/default.nix
View File

@ -14,7 +14,6 @@
home.file = { home.file = {
".zshrc".source = "${config.xdg.configFile."zsh/cfg".source}/zshrc";
".zshenv".source = "${config.xdg.configFile."zsh/cfg".source}/zshenv"; ".zshenv".source = "${config.xdg.configFile."zsh/cfg".source}/zshenv";
".tmux.conf".source = "${config.mkk.dir}/config/tmux/tmux.conf"; ".tmux.conf".source = "${config.mkk.dir}/config/tmux/tmux.conf";
}; };

2
nix-config/host/materusPC/configuration.nix
View File

@ -279,7 +279,7 @@ in
enable = true; enable = true;
enableGlobalCompInit = false; enableGlobalCompInit = false;
interactiveShellInit = '' interactiveShellInit = ''
if [[ ''${__MATERUS_HM_ZSH:-0} == 0 ]]; then if [[ ''${__HOME_ZSHRC_SOURCED:-0} == 0 ]]; then
source ${pkgs.grml-zsh-config}/etc/zsh/zshrc source ${pkgs.grml-zsh-config}/etc/zsh/zshrc
fi fi
''; '';