From 6d05ea08cca7bd1f042c8129e7b93ba7266e80bc Mon Sep 17 00:00:00 2001 From: dx Date: Tue, 12 May 2020 17:26:38 +0100 Subject: [PATCH] ~Broke zshrc into .zprofile and .config/zsh/.zshrc --- zsh/{ => .config/zsh}/.zshrc | 21 +------------------ zsh/.zprofile | 40 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 20 deletions(-) rename zsh/{ => .config/zsh}/.zshrc (83%) create mode 100644 zsh/.zprofile diff --git a/zsh/.zshrc b/zsh/.config/zsh/.zshrc similarity index 83% rename from zsh/.zshrc rename to zsh/.config/zsh/.zshrc index a8f6e63..63fa757 100644 --- a/zsh/.zshrc +++ b/zsh/.config/zsh/.zshrc @@ -1,26 +1,7 @@ # zshrc -*- mode: sh; lexical-binding: t; -*- -## Important variables and stuff -export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:~/.local/bin:~/.emacs.d/bin:~/.cargo/bin:~/.local/scripts -export guile=guile2.2 -export PF_INFO="ascii title os memory uptime editor wm shell" -export EDITOR="emacs" -export SHELL="zsh" -alias yapf='python2 -m yapf' -alias clip="xclip -sel clip" -alias paste="xclip -o" -alias ls="ls --color=auto" -alias l="ls -la" -alias md="mkdir" -alias fzf="fzf --layout=reverse --height=20" -alias suctl="systemctl --user" -export force_color_prompt=yes -export ZSH_THEME="af-magic" -export XDG_RUNTIME_DIR=/run/user/`id -u` -export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true -export DOTNET_CLI_TELEMTRY_OPTOUT=1 - ## ZSH +export ZSH_THEME="af-magic" PS1="%F{8}[δx@%m%k] %B%F{14}[%(4~|...|)%3~]%F{white} λ %b%f%k" setopt histignorealldups sharehistory diff --git a/zsh/.zprofile b/zsh/.zprofile new file mode 100644 index 0000000..783dcb5 --- /dev/null +++ b/zsh/.zprofile @@ -0,0 +1,40 @@ +# .zprofile -*- mode: sh; lexical-binding: t; -*- + +# Standard Variables +export EDITOR="nvim" +export TERMINAL="st" +export BROWSER="qutebrowser" +export PF_INFO="ascii title os memory uptime editor wm shell" +export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:~/.local/bin:~/.emacs.d/bin:~/.cargo/bin:~/.local/scripts +export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true +export DOTNET_CLI_TELEMTRY_OPTOUT=1 +export force_color_prompt=yes +export guile=guile2.2 + +# Aliases +alias yapf='python2 -m yapf' +alias clip="xclip -sel clip" +alias paste="xclip -o" +alias ls="ls --color=auto" +alias l="ls -la" +alias md="mkdir" +alias fzf="fzf --layout=reverse --height=20" +alias suctl="systemctl --user" + +# XDG variables +export XDG_CONFIG_HOME="$HOME/.config" +export XDG_DATA_HOME="$HOME/.local/share" +export XDG_CACHE_HOME="$HOME/.cache" +export XDG_RUNTIME_DIR=/run/user/`id -u` + +# Dotfolders +export ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}/zsh" +export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo" + +# Run some programs +setxkbmap gb +figlet dx +/usr/bin/pfetch +if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then + exec startx +fi