From e48095625c4e9bb62d750752f6cec853867cee44 Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Sat, 20 Apr 2019 01:26:33 +0200 Subject: [PATCH 1/6] fix initial setup --- basic_setup/basic_install.sh | 2 -- basic_setup/symlinks.sh | 5 +++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/basic_setup/basic_install.sh b/basic_setup/basic_install.sh index dae5c75..1431663 100755 --- a/basic_setup/basic_install.sh +++ b/basic_setup/basic_install.sh @@ -1,5 +1,3 @@ -su -mv ~/.config/basic_setup/sources.list /etc/apt/sources.list apt update apt upgrade --asume-yes cat ../other/package_list_desktop_essential.txt | while read line diff --git a/basic_setup/symlinks.sh b/basic_setup/symlinks.sh index 724b143..eef9843 100755 --- a/basic_setup/symlinks.sh +++ b/basic_setup/symlinks.sh @@ -1,6 +1,7 @@ +mkdir -p ~/.ssh/ ln -s ~/.config/vim/rc ~/.vimrc ln -s ~/.config/zshrc ~/.zshrc -ln -s ~/.config/xconf/Xressources ~/.Xressources -ln -s ~/.config/xconf/.xsessionsrc ~/.xinitrc +ln -s ~/.config/xconf/Xresources ~/.Xresources +ln -s ~/.config/xconf/.xinitrc ~/.xinitrc ln -s ~/.config/ssh/config ~/.ssh/config mkdir -p ~/.zsh From 7323237e44e06cb28647bff459427ba829beed7d Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Sat, 1 Jun 2019 17:28:52 +0200 Subject: [PATCH 2/6] change chromium init since LD preload bug is fixed --- herbstluftwm/autostart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart index 7981c4d..0f69d19 100755 --- a/herbstluftwm/autostart +++ b/herbstluftwm/autostart @@ -65,7 +65,8 @@ hc keybind $Mod-q close hc keybind $Mod-Return spawn urxvt hc keybind $Mod-y spawn urxvt #easier to press with one hand hc keybind $Mod-Shift-Return spawn ~/.config/herbstluftwm/hl_start_urxvt_cwd.py -hc keybind $Mod-i spawn urxvt -e nohup zsh -c "chromium &" #need to reliably use the zshconf chromium +hc keybind $Mod-i spawn "/usr/bin/chromium" + if [[ $HOST =~ atlantis* ]]; then hc keybind $Mod-l spawn i3lock -i ~/.config/i3lock/bg.png -t else From 3a51928427b142e93c64e5f7e676537a756ce783 Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Sat, 1 Jun 2019 17:30:04 +0200 Subject: [PATCH 3/6] Fix spelling of xresources --- xconf/.xinitrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xconf/.xinitrc b/xconf/.xinitrc index f2a6ba0..2e22e2c 100755 --- a/xconf/.xinitrc +++ b/xconf/.xinitrc @@ -1,4 +1,4 @@ -xrdb ~/.Xressources +xrdb ~/.Xresources xset r rate 300 25 eval `ssh-agent` exec herbstluftwm From a9e5c699108a4eebda4c0dfc1a16ed7b6fc14cd4 Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Sat, 1 Jun 2019 17:30:25 +0200 Subject: [PATCH 4/6] disable university specific script --- other/notify_logout.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/other/notify_logout.sh b/other/notify_logout.sh index 2602e06..92e92ed 100755 --- a/other/notify_logout.sh +++ b/other/notify_logout.sh @@ -1,2 +1,2 @@ #!/bin/bash -wget "https://atlantishq.de/ciplog/${HOST}&inactive¬hing" +# wget "https://atlantishq.de/ciplog/${HOST}&inactive¬hing" From 96c30350103f92abf3faab13d4049086ec71990c Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Sat, 1 Jun 2019 17:51:13 +0200 Subject: [PATCH 5/6] add git promt to zsh --- zshrc | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/zshrc b/zshrc index 33eb29f..d064567 100644 --- a/zshrc +++ b/zshrc @@ -30,6 +30,23 @@ fi ############################################## PROMT ################################################### ######################################################################################################## +## git ## +setopt prompt_subst +autoload -Uz vcs_info +zstyle ':vcs_info:*' actionformats '%F{5}[%F{2}%b%F{3}|%F{1}%a%F{5}]%f ' +zstyle ':vcs_info:*' formats '%F{5}[%F{2}%b%F{5}]%f ' +zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b%F{1}:%F{3}%r' +zstyle ':vcs_info:*' enable git cvs svn + +# or use pre_cmd, see man zshcontrib +vcs_info_wrapper() { + vcs_info + if [ -n "$vcs_info_msg_0_" ]; then + echo "%{$fg[grey]%}${vcs_info_msg_0_}%{$reset_color%}$del" + fi +} +VERSION_CONTROL_PROMT=$'$(vcs_info_wrapper)' + ## colors ## SEPERATOR_LINE_COLOR="green" USER_COLOR="yellow" @@ -77,7 +94,7 @@ if [[ $USER == 'sheppy' || $USER == 'ik15ydit' || $USER == 'root' ]]; then fi ## build the complete promt ## -PS1="${SEPERATOR_LINE}${USER_NAME}${USER_HOST_SEPERATOR}${HOSTNAME}${HOST_PATH_SEPERATOR}${PATH_STR}${PATH_INPUT_SEPERATOR}" +PS1="${SEPERATOR_LINE}${USER_NAME}${USER_HOST_SEPERATOR}${HOSTNAME}${HOST_PATH_SEPERATOR}${PATH_STR}${VERSION_CONTROL_PROMT}${PATH_INPUT_SEPERATOR}" ## replace the magic values, i.e. %m with hostname ## setopt promptsubst #enable the promt From 6badcc0ea557b41510a70b92bfa14a73a6185ce0 Mon Sep 17 00:00:00 2001 From: Yannik Schmidt Date: Sun, 2 Jun 2019 19:27:14 +0200 Subject: [PATCH 6/6] specify license and link code for libcolorstderr --- libcoloredstderr.so.license | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 libcoloredstderr.so.license diff --git a/libcoloredstderr.so.license b/libcoloredstderr.so.license new file mode 100644 index 0000000..4a4327f --- /dev/null +++ b/libcoloredstderr.so.license @@ -0,0 +1,2 @@ +libcoloredstderr is licensed GPL-v3. The Code can be found here: +https://ruderich.org/simon/coloredstderr/