Remove Xinitrc & Xresources Configs for Arch

- Remove dwm & polybar related parameters in Xresources
- Delete xinitrc as it is not needed for Pop!_OS
- Move relevant xinitrc environment variables to bashrc
- Update git config with bunch of new settings
This commit is contained in:
Sravan Balaji 2021-03-31 15:29:25 -04:00
parent 8688db153f
commit 93489c6c6b
4 changed files with 73 additions and 88 deletions

View File

@ -19,28 +19,6 @@
#define CYAN2 #9AEDFE
#define ORANGE #FFB86C
! Regular DPI Parameters
#define DPI 96
#define BAR_HEIGHT 25
#define MODULE_MARGIN 2
#define TRAY_MAXSIZE 15
#define TRAY_SCALE 1
#define BORDER_SIZE 2
#define INNER_GAPS 20
#define OUTER_GAPS 10
#define MAXLEN 75
! ! HiDPI Parameters
! #define DPI 192
! #define BAR_HEIGHT 50
! #define MODULE_MARGIN 1
! #define TRAY_MAXSIZE 30
! #define TRAY_SCALE 1
! #define BORDER_SIZE 4
! #define INNER_GAPS 40
! #define OUTER_GAPS 20
! #define MAXLEN 45
! Dracula Xresources Palette
*.foreground: FOREGROUND
*.background: BACKGROUND
@ -61,44 +39,3 @@
*.color7: WHITE2
*.color15: WHITE1
*.color16: ORANGE
! DWM
dwm.normbgcolor: BACKGROUND
dwm.normbordercolor: BLACK2
dwm.normfgcolor: FOREGROUND
dwm.selfgcolor: BACKGROUND
dwm.selbordercolor: PURPLE1
dwm.selbgcolor: PURPLE1
dwm.borderpx: BORDER_SIZE
dwm.gappih: INNER_GAPS
dwm.gappiv: INNER_GAPS
dwm.gappoh: OUTER_GAPS
dwm.gappov: OUTER_GAPS
! Polybar
polybar.bar-height: BAR_HEIGHT
polybar.module-margin: MODULE_MARGIN
polybar.tray-maxsize: TRAY_MAXSIZE
polybar.tray-scale: TRAY_SCALE
polybar.maxlen: MAXLEN
! Dunst
dunst.geometry-x: OUTER_GAPS
dunst.geometry-y: BAR_HEIGHT
dunst.sep-height: BORDER_SIZE
dunst.padding: OUTER_GAPS
dunst.horiz-padding: OUTER_GAPS
dunst.max-icon-size: DPI
dunst.frame-width: BORDER_SIZE
dunst.low-background: BACKGROUND
dunst.low-foreground: FOREGROUND
dunst.low-frame: PURPLE1
dunst.normal-background: BACKGROUND
dunst.normal-foreground: FOREGROUND
dunst.normal-frame: PURPLE1
dunst.critical-background: RED1
dunst.critical-foreground: FOREGROUND
dunst.critical-frame: PURPLE1
! Display Scaling
*.dpi: DPI

View File

@ -116,16 +116,14 @@ if ! shopt -oq posix; then
fi
fi
# # Run neofetch when opening terminal
# neofetch
# ALIASES
alias config='/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME'
# EXPORTS
# ENVIRONMENT VARIABLES
export EDITOR="code -w"
export TERM=xterm-256color
export QT_STYLE_OVERRIDE=kvantum
export XDG_CONFIG_HOME=$HOME/.config
# Set fish as interactive shell only
exec fish

View File

@ -1,7 +1,76 @@
# Sravan Balaji's Git Configuration
# Based on: https://gist.github.com/tdd/470582
[user]
email = balajsra@umich.edu
name = Sravan Balaji
[color]
# Enable colors in color-supporting terminals
ui = auto
[pull]
rebase = false
rebase = true
[alias]
tree = log --all --decorate --oneline --graph
# List available aliases
aliases = !git config --get-regexp alias | sed -re 's/alias\\.(\\S*)\\s(.*)$/\\1 = \\2/g'
# Command shortcuts
ci = commit
co = checkout
st = status
# Display tree-like log, because default log is a pain…
lg = log --graph --date=relative --pretty=tformat:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%an %ad)%Creset'
# Useful when you have to update your last commit
# with staged files without editing the commit message.
oops = commit --amend --no-edit
# Ensure that force-pushing won't lose someone else's work (only mine).
push-with-lease = push --force-with-lease
# Rebase wont trigger hooks on each "replayed" commit.
# This is an ugly hack that will replay each commit during rebase with the
# standard `commit` command which will trigger hooks.
rebase-with-hooks = rebase -x 'git reset --soft HEAD~1 && git commit -C HEAD@{1}'
# List local commits that were not pushed to remote repository
review-local = "!git lg @{push}.."
# Edit last commit message
reword = commit --amend
# Undo last commit but keep changed files in stage
uncommit = reset --soft HEAD~1
# Remove file(s) from Git but not from disk
untrack = rm --cache --
[core]
# VSCode
editor = code --wait
# Don't consider trailing space change as a cause for merge conflicts
whitespace = -trailing-space
[diff]
# Use better, descriptive initials (c, i, w) instead of a/b.
mnemonicPrefix = true
# Show renames/moves as such
renames = true
# When using --word-diff, assume --word-diff-regex=.
wordRegex = .
# Display submodule-related information (commit listings)
submodule = log
# Use VSCode as default diff tool when running `git diff-tool`
tool = vscode
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[fetch]
# Auto-fetch submodule changes (sadly, won't auto-update)
recurseSubmodules = on-demand
[grep]
break = true
heading = true
lineNumber = true
# Consider most regexes to be ERE
extendedRegexp = true
[log]
# Use abbrev SHAs whenever possible/relevant instead of full 40 chars
abbrevCommit = true
# Automatically --follow when given a single path
follow = true
# Disable decorate for reflog
# (because there is no dedicated `reflog` section available)
decorate = false
[status]
# Display submodule rev change summaries in status
submoduleSummary = true
# Recursively traverse untracked directories to display all contents
showUntrackedFiles = all

View File

@ -1,19 +0,0 @@
#########################
# ENVIRONMENT VARIABLES #
#########################
export TERM=xterm-256color # Sets the terminal type
export SHELL=/usr/bin/fish # Preferred shell
export EDITOR="code -w" # Default editor
export BROWSER=brave # Web Browser
export XDG_CONFIG_HOME=$HOME/.config # Set Config directory
export QT_QPA_PLATFORMTHEME=qt5ct # QGtkStyle
###########
# STARTUP #
###########
xrdb ~/.Xresources
##################
# WINDOW MANAGER #
##################
exec dwm