diff --git a/home.nix b/home.nix index ff2848d..1a96adf 100644 --- a/home.nix +++ b/home.nix @@ -6,9 +6,11 @@ ... }: { home.stateVersion = "23.05"; + imports = [ ctpModule discord-applemusic-rich-presence + ./programs/variables.nix ./programs/zsh.nix ./programs/fish.nix ./programs/starship.nix diff --git a/programs/fish/conf.d/01_basic_env.fish b/programs/fish/conf.d/01_basic_env.fish index 5bbcf82..e225042 100644 --- a/programs/fish/conf.d/01_basic_env.fish +++ b/programs/fish/conf.d/01_basic_env.fish @@ -1,8 +1,4 @@ -# basic environment variables -set -x LANG en_US.UTF-8 -set -x EDITOR hx -set -x PAGER less -set -x LESS -R +# ls set -x LS_COLORS "$(vivid generate catppuccin-frappe)" # nix path patches diff --git a/programs/fish/conf.d/02_tooling.fish b/programs/fish/conf.d/02_tooling.fish index eee8d3a..befc583 100644 --- a/programs/fish/conf.d/02_tooling.fish +++ b/programs/fish/conf.d/02_tooling.fish @@ -2,15 +2,9 @@ set -x SSH_AUTH_SOCK "$HOME/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock" # Homebrew shell -set -x HOMEBREW_NO_ANALYTICS 1 -set -x HOMEBREW_CASK_OPTS --require-sha -set -x HOMEBREW_NO_INSECURE_REDIRECT 1 -set -x HOMEBREW_NO_EMOJI 1 /opt/homebrew/bin/brew shellenv | source # fnm shell env -set -gx FNM_RESOLVE_ENGINES true -set -gx FNM_COREPACK_ENABLED true fnm env --use-on-cd | source # cargo @@ -21,11 +15,6 @@ fish_add_path "$HOME/.deno/bin" # pnpm set -x PNPM_HOME "$HOME/Library/pnpm" -# disable telemetry -set -x NEXT_TELEMETRY_DISABLED 1 # Next.js -set -x CHECKPOINT_DISABLE 1 # Prisma -set -x DISABLE_TELEMETRY YES # diffusers - # direnv set -x DIRENV_LOG_FORMAT "" diff --git a/programs/variables.nix b/programs/variables.nix new file mode 100644 index 0000000..076afe8 --- /dev/null +++ b/programs/variables.nix @@ -0,0 +1,11 @@ +_: { + home.sessionVariables = { + NEXT_TELEMETRY_DISABLED = "1"; + CHECKPOINT_DISABLE = "1"; + DISABLE_TELEMETRY = "YES"; + ASTRO_TELEMETRY_DISABLED = "1"; + + FNM_RESOLVE_ENGINES = "true"; + FNM_COREPACK_ENABLED = "true"; + }; +} diff --git a/programs/zsh/envExtra.zsh b/programs/zsh/envExtra.zsh index 022527e..c61a525 100644 --- a/programs/zsh/envExtra.zsh +++ b/programs/zsh/envExtra.zsh @@ -2,10 +2,6 @@ export SSH_AUTH_SOCK="$HOME/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock" # Homebrew shell -export HOMEBREW_NO_ANALYTICS=1 -export HOMEBREW_CASK_OPTS=--require-sha -export HOMEBREW_NO_INSECURE_REDIRECT=1 -export HOMEBREW_NO_EMOJI=1 eval "$(/opt/homebrew/bin/brew shellenv)" # fnm shell env @@ -17,11 +13,6 @@ export PATH="$HOME/.deno/bin:$PATH" # pnpm export PNPM_HOME="${HOME}/Library/pnpm" -# disable telemetry -export NEXT_TELEMETRY_DISABLED=1 # Next.js -export CHECKPOINT_DISABLE=1 # Prisma -export DISABLE_TELEMETRY=YES # diffusers - # direnv export DIRENV_LOG_FORMAT="" diff --git a/programs/zsh/initExtra.zsh b/programs/zsh/initExtra.zsh index e0e1942..64ae113 100644 --- a/programs/zsh/initExtra.zsh +++ b/programs/zsh/initExtra.zsh @@ -1,10 +1,4 @@ # environment variables -export LANG=en_US.UTF-8 - -export EDITOR="hx" -export PAGER="less" -export LESS="-R" - export FZF_DEFAULT_OPTS=" \ --color=bg+:#414559,bg:#303446,spinner:#f2d5cf,hl:#e78284 \ --color=fg:#c6d0f5,header:#e78284,info:#ca9ee6,pointer:#f2d5cf \