From 262f2aaee60dccac99e2548f4481b8f0a70e6f70 Mon Sep 17 00:00:00 2001 From: David Luevano Alvarado <55825613+luevano@users.noreply.github.com> Date: Tue, 8 Dec 2020 01:23:12 -0700 Subject: Standarization and preparation for cleaning ~ --- .Xresources | 3 --- .bash_profile | 14 ++++++-------- .bashrc | 6 ++---- .config/zsh/.zshenv | 2 +- .config/zsh/.zshrc | 2 -- .profile | 5 ++--- .xinitrc | 4 +--- .xprofile | 2 -- 8 files changed, 12 insertions(+), 26 deletions(-) diff --git a/.Xresources b/.Xresources index 40f1ebd..38bef75 100644 --- a/.Xresources +++ b/.Xresources @@ -1,7 +1,4 @@ -!! -!! ~/.Xresources !! Dracula Xresources palette - *.foreground: #F8F8F2 *.background: #282A36 *.selforeground: #000000 diff --git a/.bash_profile b/.bash_profile index 2c51184..de1c697 100644 --- a/.bash_profile +++ b/.bash_profile @@ -1,11 +1,9 @@ #!/bin/sh -# ~/.bash_profile -# -## This only is read by bash when it is a login shell, -# not an interactive one (lightdm, for example). So -# .profile has to be sourced (as well as .bashrc). See: -# https://unix.stackexchange.com/questions/88106/why-doesnt-my-bash-profile-work. +# This only is read by bash when it is a login shell, not an interactive +# one (lightdm, for example). +# So '.profile' has to be sourced (as well as .bashrc). +# See: https://unix.stackexchange.com/questions/88106/why-doesnt-my-bash-profile-work -[[ -f ~/.profile ]] && . ~/.profile -[[ -f ~/.bashrc ]] && . ~/.bashrc +[ -f $HOME/.profile ] && . $HOME/.profile +[ -f $HOME/.bashrc ] && . $HOME/.bashrc diff --git a/.bashrc b/.bashrc index 3954f57..9a71f00 100644 --- a/.bashrc +++ b/.bashrc @@ -1,8 +1,6 @@ #!/bin/sh -# ~/.bashrc -# # If not running interactively, don't do anything -[[ $- != *i* ]] && return +[ $- != *i* ] && return -PS1='[\u@\h \w]\$ ' +PS1="[\u@\h \w]\$ " diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv index bd8c365..1c3d80c 100644 --- a/.config/zsh/.zshenv +++ b/.config/zsh/.zshenv @@ -1,5 +1,5 @@ #!/bin/zsh -# ~/.config/zsh/.zshenv + # As suggested by https://vi.stackexchange.com/questions/7644/use-vim-with-virtualenv/7654#7654 if [[ -n $VIRTUAL_ENV && -e "${VIRTUAL_ENV}/bin/activate" ]]; then diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 83b69c8..bf67916 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -1,6 +1,4 @@ #!/bin/zsh -# $ZDOTDIR/.zshrc -# # PS1 colors and style. autoload -U colors && colors diff --git a/.profile b/.profile index 344d172..1196694 100644 --- a/.profile +++ b/.profile @@ -1,6 +1,5 @@ #!/bin/sh -# ~/.profile -# + ##--Environment variables--## ## Modified env vars. export PATH="$PATH:$(du -L "$HOME/.local/bin/" | cut -f2 | tr '\n' ':' | sed 's/:*$//')" @@ -8,7 +7,7 @@ export PATH="$PATH:$(du -L "$HOME/.local/bin/" | cut -f2 | tr '\n' ':' | sed 's/ ## Default programs. export EDITOR="nvim" export TERMINAL="alacritty" -export BROWSER="google-chrome-stable" +export BROWSER="firefox" export READER="zathura" export FILE="ranger" export STATUSBAR="i3blocks" diff --git a/.xinitrc b/.xinitrc index 04c809a..0c6736f 100644 --- a/.xinitrc +++ b/.xinitrc @@ -1,9 +1,7 @@ #!/bin/sh -# ~/.xinitrc -# # This is run when 'startx' or 'xinit' is executed, # but since display managers use ~/.xprofile instead, # .xprofile is sourced to be compatible with both. -[[ -f ~/.xprofile ]] && . ~/.xprofile +[ -f $HOME/.xprofile ] && . $HOME/.xprofile diff --git a/.xprofile b/.xprofile index ff0c306..728e4cc 100644 --- a/.xprofile +++ b/.xprofile @@ -1,6 +1,4 @@ #!/bin/sh -# ~/.xprofile -# # This is run when a display manager logs in. # Used as source for ~/.xinitrc. -- cgit v1.2.3-70-g09d2