From 08fa07618b1d1d40773d1969f31d6d63713f534b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20N=C3=A1jera?= <hi@oscarnajera.com>
Date: Sat, 7 May 2022 23:05:05 +0200
Subject: move variables from bashrc to profile

---
 home-dots/dot-bash_profile | 4 ++--
 home-dots/dot-bashrc       | 7 -------
 home-dots/dot-profile      | 9 ++++++++-
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'home-dots')

diff --git a/home-dots/dot-bash_profile b/home-dots/dot-bash_profile
index aeac56a..ea2a147 100644
--- a/home-dots/dot-bash_profile
+++ b/home-dots/dot-bash_profile
@@ -1,6 +1,6 @@
 #
 # ~/.bash_profile
 #
-
 [[ -f ~/.bashrc ]] && . ~/.bashrc
-. "$HOME/.cargo/env"
+# [ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env" # ghcup-env
+# source "$HOME/.cargo/env"
diff --git a/home-dots/dot-bashrc b/home-dots/dot-bashrc
index 55d28a4..95b2c24 100644
--- a/home-dots/dot-bashrc
+++ b/home-dots/dot-bashrc
@@ -59,7 +59,6 @@ if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
     export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
 fi
 
-export PATH="$HOME/.local/bin:$HOME/dev/dotfiles/bin:$PATH"
 alias isrun='ps -ae | grep'
 alias gdimg='git difftool -t image_diff'
 alias G='grep -i'
@@ -67,11 +66,5 @@ alias lar='ls -lahrt'
 alias emacs='TERM=xterm-direct emacs'
 alias mykeys='setxkbmap -I$HOME/.config/xkb/ oscar -option caps:escape -print | xkbcomp -I$HOME/.config/xkb/ - $DISPLAY'
 
-[ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env" # ghcup-env
-source "$HOME/.cargo/env"
-GUIX_PROFILE="$HOME/.guix-profile" && [ -e "$GUIX_PROFILE" ] && . "$GUIX_PROFILE/etc/profile" && export GUIX_LOCPATH=$GUIX_PROFILE/lib/locale
-GUIX_PROFILE="$HOME/.config/guix/current" && [ -e "$GUIX_PROFILE" ] && . "$GUIX_PROFILE/etc/profile"
-# export SSL_CERT_DIR="$HOME/.guix-profile/etc/ssl/certs"
-# export SSL_CERT_FILE="$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt"
 HISTSIZE=-1
 HISTFILESIZE=-1
diff --git a/home-dots/dot-profile b/home-dots/dot-profile
index c2f3182..f156b80 100644
--- a/home-dots/dot-profile
+++ b/home-dots/dot-profile
@@ -1 +1,8 @@
-. "$HOME/.cargo/env"
+#!/bin/sh
+export PATH="$HOME/.local/bin:$HOME/dev/dotfiles/bin:$PATH"
+[ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env" # ghcup-env
+source "$HOME/.cargo/env"
+# GUIX_PROFILE="$HOME/.guix-profile" && [ -e "$GUIX_PROFILE" ] && . "$GUIX_PROFILE/etc/profile" && export GUIX_LOCPATH=$GUIX_PROFILE/lib/locale
+# GUIX_PROFILE="$HOME/.config/guix/current" && [ -e "$GUIX_PROFILE" ] && . "$GUIX_PROFILE/etc/profile"
+# export SSL_CERT_DIR="$HOME/.guix-profile/etc/ssl/certs"
+# export SSL_CERT_FILE="$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt"
-- 
cgit v1.2.3