Compare commits

..

23 Commits

Author SHA1 Message Date
Peter J. Holzer 78e3786ed8 Merge branch 'master' into wsr_shared 2024-04-18 12:35:42 +02:00
Peter J. Holzer ac372f5183 Enable expandtab again 2023-08-18 11:39:47 +02:00
Peter J. Holzer 9a8fef1c91 Merge branch 'master' into wsr_shared 2023-08-18 11:37:15 +02:00
Peter J. Holzer ccd713b6ec Merge branch 'master' into wsr_shared 2023-03-05 15:11:08 +01:00
Peter J. Holzer eea9e7b27d Merge branch 'master' into wsr_shared 2023-03-05 15:07:38 +01:00
Peter J. Holzer 76af3fcca0 Merge branch 'master' into wsr_shared 2022-09-10 23:06:38 +02:00
FIW newsletter subscription requests 23a1de4636 Set background after colorscheme 2022-05-12 16:18:05 +02:00
Peter J. Holzer 053449e0d7 Merge branch 'master' into wsr_shared 2020-11-17 11:26:02 +01:00
Peter J. Holzer ba609f7683 Merge branch 'master' into wsr_shared 2020-11-12 15:19:22 +01:00
Peter J. Holzer 1099089f27 Merge branch 'master' into wsr_shared 2020-10-28 12:29:37 +01:00
Peter J. Holzer e21bb78722 Merge branch 'master' into wsr_shared 2020-04-16 12:14:36 +02:00
Peter J. Holzer 5350f0046b Merge branch 'master' into wsr_shared 2020-03-15 13:13:34 +01:00
PostgreSQL administrator 13c7528dae Merge branch 'master' into wsr_shared 2020-03-03 19:16:15 +01:00
Peter J. Holzer 102889bd7b Don't set GIT_AUTHOR_NAME on shared accounts 2019-09-28 10:28:44 +02:00
Peter J. Holzer b3405ddfb7 Merge branch 'master' into wsr_shared 2019-09-28 10:27:26 +02:00
Peter J. Holzer 97e047b05f Merge branch 'master' into wsr_shared 2019-09-08 12:22:11 +02:00
Peter J. Holzer 90e126ab82 Remove my name and email from shared config 2019-09-04 17:48:01 +02:00
Peter J. Holzer 8d73f718b6 Merge branch 'master' into wsr_shared 2019-05-18 10:52:11 +02:00
Peter J. Holzer 1e1335fff0 Merge branch 'master' into wsr_shared 2019-05-18 10:33:09 +02:00
Peter J. Holzer 323d51c22e Remove expandtab, tw, incsearch
Gina doesn't like them
2019-01-09 10:43:28 +01:00
Peter J. Holzer a1401aa2cc Merge branch 'wsr' into wsr_shared 2018-10-26 18:27:06 +02:00
Peter J. Holzer 6da5525973 Merge branch 'master' into wsr_shared 2018-02-07 09:28:28 +01:00
Peter J. Holzer 4a995d1ae2 Set colorscheme to default 2018-02-06 23:35:56 +01:00
5 changed files with 4 additions and 20 deletions

View File

@ -1,6 +1,3 @@
[user]
name = Peter J. Holzer
email = hjp@wsr.ac.at
[alias]
co = checkout
ci = commit

View File

@ -12,8 +12,7 @@ if exists("syntax_on")
endif
let g:colors_name = "hjp-dark"
hi ColorColumn ctermbg=238
hi Comment term=bold ctermfg=246 ctermbg=Black guifg=Red
hi Comment term=bold ctermfg=88 ctermbg=White guifg=Red
hi Constant term=underline ctermfg=201 guifg=Magenta
hi Error term=reverse ctermfg=15 ctermbg=9 guifg=White guibg=Red
hi ErrorMsg term=standout cterm=NONE ctermfg=226 ctermbg=DarkRed gui=NONE guifg=Yellow guibg=DarkRed
@ -24,7 +23,7 @@ hi Normal
hi PreProc term=underline ctermfg=Magenta ctermbg=0 guifg=Purple
hi Search term=reverse cterm=NONE ctermfg=White ctermbg=19 gui=NONE guifg=Black guibg=Cyan
hi Special term=bold ctermfg=Yellow ctermbg=NONE guifg=Magenta
hi Statement term=bold ctermfg=117 gui=NONE guifg=Brown
hi Statement term=bold ctermfg=105 gui=NONE guifg=Brown
hi Underlined term=underline cterm=underline ctermfg=163 gui=underline guifg=SlateBlue
" Use color 226 (pale yellow) instead of the default yellow, because I refined

5
.vimrc
View File

@ -1,7 +1,6 @@
set ai
" Disable (ab)use of X11 selection
set clipboard=
set colorcolumn=72,80,100,132
set comments=s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-,n:\|
set expandtab
set exrc
@ -19,7 +18,6 @@ set scrolloff=5
set secure
set sm
set sw=4
set tw=72
set viminfo='100,<50,s10,h,%
if has('reltime')
@ -27,10 +25,11 @@ if has('reltime')
endif
if $BG == "light"
set bg=light
colorscheme hjp
set bg=light
syntax on
elseif $BG == "dark"
colorscheme default
set bg=dark
colorscheme hjp-dark
syntax on

View File

@ -243,10 +243,6 @@ case "$FQDN" in
then
export GIT_AUTHOR_EMAIL="$LOGNAME@wsr.ac.at"
fi
if [ -z "$GIT_AUTHOR_NAME" ]
then
export GIT_AUTHOR_NAME="Peter J. Holzer"
fi
;;
*.hjp.at)
if [ -z "$GIT_AUTHOR_EMAIL" ]

7
.zshrc
View File

@ -152,10 +152,3 @@ fi
# for new style completion:
autoload -U compinit
compinit
# NVM
if [ -d "$HOME/.nvm" ]
then
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
fi