From a2e256f823cda0eff0d60e16132b45394ecf79e3 Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Wed, 27 Dec 2023 00:57:27 -0600 Subject: [PATCH] refactor(nix-hm): ensure zsh has session vars sourced --- config/default.nix | 10 ++-------- dots/.zshrc | 3 --- 2 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 dots/.zshrc diff --git a/config/default.nix b/config/default.nix index 0268daeb..ae65608a 100644 --- a/config/default.nix +++ b/config/default.nix @@ -82,10 +82,6 @@ in source = ../dots/.omnisharp; force = true; }; - ".zshrc" = { - source = ../dots/.zshrc; - force = true; - }; ".latexmkrc" = { source = ../dots/.latexmkrc; force = true; @@ -102,10 +98,8 @@ in zsh = { enable = true; initExtra = '' - . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" - ''; - profileExtra = '' - export GTK_PATH="$HOME/.nix-profile/lib/gtk-2.0" + source "$HOME/.config/zsh/zsh" + __HM_SESS_VARS_SOURCED= source "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" ''; }; neovim = { diff --git a/dots/.zshrc b/dots/.zshrc deleted file mode 100644 index 07787b24..00000000 --- a/dots/.zshrc +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/zsh - -source ~/.config/zsh/zsh