diff options
| -rw-r--r-- | .bash_profile | 16 | ||||
| -rw-r--r-- | .bashrc | 8 | ||||
| -rw-r--r-- | .config/X11/xinitrc (renamed from .xinitrc) | 18 | ||||
| -rw-r--r-- | .config/alacritty/alacritty.yml | 2 | ||||
| -rw-r--r-- | .config/i3/config | 4 | ||||
| -rwxr-xr-x | .config/i3/extra/screenshot (renamed from .config/i3/custom/screenshot) | 0 | ||||
| -rwxr-xr-x | .config/polybar/launch (renamed from .config/polybar/launch.sh) | 0 | ||||
| -rw-r--r-- | .config/readline/inputrc (renamed from .inputrc) | 0 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .vim/vimrc (renamed from .vimrc) | 17 |
10 files changed, 42 insertions, 24 deletions
diff --git a/.bash_profile b/.bash_profile index b82ed01..40853ae 100644 --- a/.bash_profile +++ b/.bash_profile @@ -4,4 +4,18 @@ [[ -f ~/.bashrc ]] && . ~/.bashrc -[[ $(fgconsole 2>/dev/null) == 1 ]] && exec startx -- vt1 +export XDG_CONFIG_HOME=$HOME/.config +export XDG_CACHE_HOME=$HOME/.cache +export XDG_DATA_HOME=$HOME/.local/share +export XDG_STATE_HOME=$HOME/.local/state +export XDG_DATA_DIRS="/usr/local/share:/usr/share" +export XDG_CONFIG_DIRS="/etc/xdg" + +export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority +export HISTFILE="$XDG_STATE_HOME"/bash/history +export INPUTRC="$XDG_CONFIG_HOME"/readline/inputrc +export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass +export GTK_RC_FILES="$XDG_CONFIG_HOME"/gtk-1.0/gtkrc +export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc + +[[ $(fgconsole 2>/dev/null) == 1 ]] && exec startx "$XDG_CONFIG_HOME/X11/xinitrc" -- vt1 @@ -75,7 +75,6 @@ esac # enable color support of ls and also add handy aliases if [ -x /usr/bin/dircolors ]; then test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' #alias dir='dir --color=auto' #alias vdir='vdir --color=auto' @@ -88,9 +87,9 @@ fi #export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' # some more ls aliases -alias ll='ls -AlF' -alias la='ls -A' -alias l='ls -CF' +alias ls='exa -F' +alias ll='exa -laF' +alias lh='exa -ldF .*' # Add an "alert" alias for long running commands. Use like so: # sleep 10; alert @@ -121,6 +120,7 @@ export VISUAL=vim export PS1='\[\033[35m\]\u@\h\[\033[37m\]:\[\033[0;34m\]\w\[\033[37m\]$ ' # Shell prompt export PAGER=most +alias cvim='GIT_DIR=$HOME/.cfg GIT_WORK_TREE=$HOME vim' alias mv='mv -i' alias rm='rm -i' alias gs='git status' diff --git a/.xinitrc b/.config/X11/xinitrc index 43f2cff..852b3f5 100644 --- a/.xinitrc +++ b/.config/X11/xinitrc @@ -1,7 +1,7 @@ #!/bin/sh -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap +userresources=$XDG_CONFIG_HOME/X11/.Xresources +usermodmap=$XDG_CONFIG_HOME/X11/.Xmodmap sysresources=/etc/X11/xinit/.Xresources sysmodmap=/etc/X11/xinit/.Xmodmap @@ -32,16 +32,4 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then unset f fi - -greenclip daemon & -playerctld daemon & -nitrogen --restore & -redshift -l 56:10 & -pcmanfm -d & -nm-applet & -exec i3 & wmpid=$! - -sleep 5 -$HOME/.autostart & - -wait $wmpid +source $HOME/.config/i3/init diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index e2f57bf..76e389e 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -132,7 +132,7 @@ font: style: Bold Italic # Point size - size: 7 + size: 7.5 # Offset is the extra space around each character. `offset.y` can be thought # of as modifying the line spacing, and `offset.x` as modifying the letter # spacing. diff --git a/.config/i3/config b/.config/i3/config index 898da29..9d538ec 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -14,7 +14,7 @@ bindsym $mod+b exec --no-startup-id firefox bindsym $mod+e exec --no-startup-id pcmanfm bindsym $mod+f fullscreen toggle bindsym $mod+c exec gnome-control-center --class=floating_window -bindsym $mod+Shift+s exec --no-startup-id ~/.config/i3/custom/screenshot +bindsym $mod+Shift+s exec --no-startup-id ~/.config/i3/extra/screenshot # Rofi bindsym $mod+d exec --no-startup-id rofi -show drun -show-icons -drun-display-format {name} @@ -165,6 +165,6 @@ for_window [title="^Steam Keyboard$"] floating enable ##### Exec exec_always --no-startup-id /usr/bin/unclutter -b -exec_always --no-startup-id $HOME/.config/polybar/launch.sh +exec_always --no-startup-id $HOME/.config/polybar/launch exec_always --no-startup-id picom --experimental-backends --config ~/.config/picom/picom.conf -b exec_always --no-startup-id setxkbmap -option grp:win_space_toggle us,dk diff --git a/.config/i3/custom/screenshot b/.config/i3/extra/screenshot index 9a443b1..9a443b1 100755 --- a/.config/i3/custom/screenshot +++ b/.config/i3/extra/screenshot diff --git a/.config/polybar/launch.sh b/.config/polybar/launch index 68d5cf2..68d5cf2 100755 --- a/.config/polybar/launch.sh +++ b/.config/polybar/launch diff --git a/.inputrc b/.config/readline/inputrc index 236bfdd..236bfdd 100644 --- a/.inputrc +++ b/.config/readline/inputrc diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e71a4f0..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.cfg @@ -62,3 +62,20 @@ let &t_8f = "\<Esc>[38:2:%lu:%lu:%lum" let &t_8b = "\<Esc>[48:2:%lu:%lu:%lum" colorscheme doom-one highlight CursorLineNr cterm=bold ctermbg=Black ctermfg=Blue + +set runtimepath^=$XDG_CONFIG_HOME/vim +set runtimepath+=$XDG_DATA_HOME/vim +set runtimepath+=$XDG_CONFIG_HOME/vim/after + +set packpath^=$XDG_DATA_HOME/vim,$XDG_CONFIG_HOME/vim +set packpath+=$XDG_CONFIG_HOME/vim/after,$XDG_DATA_HOME/vim/after + +let g:netrw_home = $XDG_DATA_HOME."/vim" +call mkdir($XDG_DATA_HOME."/vim/spell", 'p') +set viewdir=$XDG_DATA_HOME/vim/view | call mkdir(&viewdir, 'p') + +set backupdir=$XDG_CACHE_HOME/vim/backup | call mkdir(&backupdir, 'p') +set directory=$XDG_CACHE_HOME/vim/swap | call mkdir(&directory, 'p') +set undodir=$XDG_CACHE_HOME/vim/undo | call mkdir(&undodir, 'p') + +if !has('nvim') | set viminfofile=$XDG_CACHE_HOME/vim/viminfo | endif |