mirror of
https://github.com/materusPL/nixos-config
synced 2026-07-02 04:36:41 +00:00
common: update config
This commit is contained in:
@@ -1,12 +1,6 @@
|
|||||||
__HOME_ZPROFILE_SOURCED=1
|
__HOME_ZPROFILE_SOURCED=1
|
||||||
|
[[ -f "$ZSH_DATA_DIR/nix_profile.sh" ]] && source "$ZSH_DATA_DIR/nix_profile.sh"
|
||||||
[[ -f "/etc/profile" ]] && emulate sh -c "source /etc/profile"
|
[[ -f "/etc/profile" ]] && emulate sh -c "source /etc/profile"
|
||||||
|
|
||||||
if [[ -d ~/.nix-profile/etc/profile.d ]]; then
|
|
||||||
for file in ~/.nix-profile/etc/profile.d/*; do
|
|
||||||
[ -f "$file" ] && [ -r "$file" ] && emulate sh -c "source \"$file\""
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
[[ -f "~/.profile" ]] && emulate sh -c "source ~/.profile"
|
[[ -f "~/.profile" ]] && emulate sh -c "source ~/.profile"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -9,9 +9,6 @@ if [ -n "$EAT_SHELL_INTEGRATION_DIR" ]; then
|
|||||||
source "$EAT_SHELL_INTEGRATION_DIR/zsh";
|
source "$EAT_SHELL_INTEGRATION_DIR/zsh";
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ZSH_DATA_DIR="${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/data"
|
|
||||||
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
|
||||||
__MATERUS_ZSH_256COLORS="${__MATERUS_ZSH_256COLORS:-1}"; else
|
__MATERUS_ZSH_256COLORS="${__MATERUS_ZSH_256COLORS:-1}"; else
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#TODO: Set ZDOTDIR based on MKK_CONFIG_PATH
|
#TODO: Set ZDOTDIR based on MKK_CONFIG_PATH
|
||||||
|
|
||||||
__HOME_ZSHENV_SOURCED=1
|
__HOME_ZSHENV_SOURCED=1
|
||||||
ZDOTDIR=${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/cfg
|
ZDOTDIR=${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/cfg
|
||||||
|
ZSH_DATA_DIR="${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/data"
|
||||||
|
ZSH_CONFIG_DIR="${XDG_CONFIG_HOME:-"$HOME/.config"}/zsh/cfg"
|
||||||
setopt no_global_rcs
|
setopt no_global_rcs
|
||||||
@@ -25,7 +25,7 @@ isHm:
|
|||||||
|
|
||||||
config.mkk.var = import ./private/variables.nix {};
|
config.mkk.var = import ./private/variables.nix {};
|
||||||
config._module.args.mkk = rec {
|
config._module.args.mkk = rec {
|
||||||
nixerus.pkgs = materusArgs.inputs.nixerus.packages."${config.nixpkgs.hostPlatform.system}";
|
nixerus.pkgs = materusArgs.inputs.nixerus.packages."${materusArgs.arch}";
|
||||||
lib = nixerus.pkgs.lib;
|
lib = nixerus.pkgs.lib;
|
||||||
files = materusArgs.files;
|
files = materusArgs.files;
|
||||||
args = materusArgs;
|
args = materusArgs;
|
||||||
|
|||||||
Reference in New Issue
Block a user