diff --git a/.aliases b/.aliases index 62921bb..7556909 100644 --- a/.aliases +++ b/.aliases @@ -13,3 +13,5 @@ alias grep="rg -n" # cd shortcut to get to my Projects folder alias pj="cd ~/Projects" + +alias gw2="optirun wine64 ~/.wine/drive_c/Program\ Files/Guild\ Wars\ 2/Gw2-64.exe -dx9single -autologin -mapLoadinfo" diff --git a/.bash_profile b/.bash_profile index 1ea816c..c9fd7de 100644 --- a/.bash_profile +++ b/.bash_profile @@ -1,12 +1,20 @@ +#!/bin/bash +# +# Author: Severin Kaderli # We just source .bashrc so we don't need to manage two files. if [[ -f $HOME/.bashrc ]]; then . $HOME/.bashrc fi +# Setting keyboard colors +if [[ -f $HOME/.keyleds ]]; then + . $HOME/.keyleds +fi + # Activate correct crontab file crontab $HOME/.crontab # If we are on tty1 we start the x-server if [ "$(tty)" = "/dev/tty1" ]; then startx && exit -fi +fi \ No newline at end of file diff --git a/.bashrc b/.bashrc index 78d7310..13179f6 100644 --- a/.bashrc +++ b/.bashrc @@ -1,3 +1,4 @@ +#!/bin/bash # don't put duplicate lines or lines starting with space in the history. # See bash(1) for more options HISTCONTROL=ignoreboth @@ -15,10 +16,8 @@ shopt -s checkwinsize # If set, the pattern "**" used in a pathname expansion context will # match all files and zero or more directories and subdirectories. -#shopt -s globstar +shopt -s globstar -# make less more friendly for non-text input files, see lesspipe(1) -[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" # set variable identifying the chroot you work in (used in the prompt below) if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then @@ -33,8 +32,8 @@ esac unset color_prompt force_color_prompt # Enable color support of ls -if [ -x /usr/bin/dircolors ]; then - test -r $HOME/.dircolors && eval "$(dircolors -b $HOME/.dircolors)" || eval "$(dircolors -b)" +if [ -f $HOME/.dircolors ]; then + dircolors -b $HOME/.dircolors > /dev/null 2>&1 fi # Sourcing alias definitions @@ -42,18 +41,9 @@ if [ -f $HOME/.aliases ]; then . $HOME/.aliases fi -# Enable ibus -export GTK_IM_MODULE=ibus -export QT_IM_MODULE=ibus -export XMODIFIERS=@im=ibus - -# Setting default editor and terminal -export VISUAL=vim -export EDITOR="$VISUAL" -export TERMINAL=termite -export QT_QPA_PLATFORMTHEME=qt5ct - -source /usr/share/git/completion/git-prompt.sh +if [ -f /usr/share/git/completion/git-prompt.sh ]; then + . /usr/share/git/completion/git-prompt.sh +fi # Enable autocompletion features if [ -f /etc/bash_completion ]; then @@ -61,15 +51,38 @@ if [ -f /etc/bash_completion ]; then fi complete -cf sudo -# Add users bin directory to the PATH -if [ -d "$HOME/bin" ] ; then - PATH="$HOME/bin:/opt/Hyper:$PATH" +# Setting default editor and terminal +export VISUAL=vim +export EDITOR="$VISUAL" +export TERMINAL=termite +export QT_QPA_PLATFORMTHEME=qt5ct + +# ibus +export GTK_IM_MODULE=xim +export XMODIFIERS=@im=ibus +export QT_IM_MODULE=xim + +# wine +export WINEDEBUG=-all +export __GL_FSAA_MODE=0 +export __GL_DEFAULT_LOG_ANISO=0 +export __GL_LOG_MAX_ANISO=0 +export STAGING_SHARED_MEMORY=1 +export STAGING_RT_PRIORITY_SERVER=90 +export WINEESYNC=1 +export PBA_ENABLE=1 +#export LD_PRELOAD="libpthread.so.0 libGL.so.1" +export __GL_THREADED_OPTIMIZATIONS=1 +export __GL_SYNC_TO_VBLANK=0 +export __GL_YIELD=NOTHING + +# Path +if [ -d "$HOME/bin" ]; then + export PATH="$PATH:$HOME/bin" fi +export PATH="$PATH:$GEM_HOME/bin" -GEM_HOME="$(ls -t -U | ruby -e 'puts Gem.user_dir')" -GEM_PATH="$GEM_HOME" -PATH="$PATH:$GEM_HOME/bin" - +# Color codes for bash prompt Reset='\033[0m' Green='\033[32m' Red='\033[31m' @@ -82,9 +95,9 @@ set_bash_prompt() { PS1="${PS1}${Red}[\t]" PS1="${PS1}${Blue}[\h]" PS1="${PS1}${Yellow}[\w]" - PS1="${PS1}${Blue}$(__git_ps1 "[%s]")" + PS1="${PS1}${Blue}$(__git_ps1 "[%s]")" PS1="${PS1}${Reset}\nā””ā”€ā•¼ " - MSYS2_PS1="$PS1" + export MSYS2_PS1="$PS1" } -PROMPT_COMMAND=set_bash_prompt +export PROMPT_COMMAND=set_bash_prompt \ No newline at end of file diff --git a/.config/i3/config b/.config/i3/config index 5bdee81..6ef31c2 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -64,7 +64,7 @@ bindsym $mod+a focus parent #bindsym $mod+d focus child # Set monitor names -set $output1 VGA-1 +set $output1 HDMI-1 set $output2 eDP-1 # Set workspace titles @@ -222,7 +222,7 @@ exec --no-startup-id compton exec_always --no-startup-id feh --bg-fill $HOME/GoogleDrive/02_Media/Images/01_Wallpaper/Desktop/Fearsome_Awakening.png # Monitor settings -exec_always --no-startup-id xrandr --output $output2 --mode 1920x1080 --pos 1920x0 --rotate normal --output $output1 --mode 1280x1024 --pos 0x0 --rotate normal +exec_always --no-startup-id xrandr --output $output2 --primary --mode 1920x1080 --pos 1280x0 --rotate normal --output $output1 --mode 1280x1024 --pos 0x56 --rotate normal # Other applications exec google-chrome-beta diff --git a/.config/polybar/config b/.config/polybar/config index 3b00b30..67e4e52 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -3,7 +3,7 @@ background = #222D32 foreground = #A1B0B8 [bar/top] -monitor = VGA-1 +monitor = HDMI-1 width = 100% height = 35 offset-x = 0 @@ -163,4 +163,4 @@ format = ļ†