Merge branch 'master' of gitlab.com:severinkaderli/dotfiles

This commit is contained in:
Severin Kaderli 2019-08-19 16:31:25 +02:00
commit ca6e28b8e5
7 changed files with 18 additions and 3 deletions

3
.gitignore vendored
View file

@ -44,11 +44,10 @@ system/.config/phpstorm/config/extensions/com.intellij.database/
system/.config/phpstorm/config/jdbc-drivers
system/.config/phpstorm/config/phpstorm64.vmoptions
system/.config/phpstorm/config/options/window.state.xml
system/.config/phpstorm/config/terminal/history/history-
system/.config/phpstorm/config/terminal/history/
system/.config/phpstorm/config/options/runner.layout.xml
system/.config/phpstorm/config/options/extensionsRootType.xml
system/.config/phpstorm/config/options/databaseDrivers.xml
system/.config/phpstorm/config/terminal/history/history-1
system/.config/phpstorm/config/user.web.token
system/.config/mpd/database
system/.config/phpstorm/config/workspace/

View file

@ -166,6 +166,7 @@ declare -A COPY_ROOT_FILES
COPY_ROOT_FILES=(
["/etc/docker/daemon.json"]="644"
["/etc/gemrc"]="644"
["/etc/logrotate.d/custom.conf"]="644"
["/etc/mkinitcpio.conf"]="644"
["/etc/NetworkManager/conf.d/dns.conf"]="644"
["/etc/pacman.conf"]="644"

View file

@ -49,6 +49,7 @@
[core]
editor = vim
autocrlf = input
[push]
default = current

View file

@ -4,4 +4,7 @@
<option name="searchInBackground" value="true" />
<option name="showTipsOnStartup" value="false" />
</component>
<component name="Registry">
<entry key="actionSystem.fix.alt.gr" value="false" />
</component>
</application>

View file

@ -1,5 +1,5 @@
<templateSet group="Custom">
<template name="lema-roles" value="UPDATE user SET roles = '[&quot;ROLE_ADMIN&quot;,&quot;ROLE_SUPERUSER&quot;]' WHERE id = 101107;" toReformat="true" toShortenFQNames="true">
<template name="lema-roles" value="UPDATE user SET roles = '[&quot;ROLE_ADMIN&quot;,&quot;ROLE_SUPERUSER&quot;]' WHERE id = 101107;" description="" toReformat="true" toShortenFQNames="true">
<context>
<option name="SQL_STATEMENT" value="true" />
<option name="SQL_STATEMENT_MEMSQL" value="true" />

View file

@ -0,0 +1,11 @@
compresscmd zstd
uncompresscmd unzstd
compressoptions -9 --long -T0
compressext .zst
/home/severin/.local/log/*.log {
compress
daily
rotate 5
size 512K
}