diff --git a/.gitignore b/.gitignore index 5fa5e52..b85a1ea 100644 --- a/.gitignore +++ b/.gitignore @@ -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/ diff --git a/install b/install index e1a1f16..3cbbaa4 100755 --- a/install +++ b/install @@ -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" diff --git a/system/.config/git/config b/system/.config/git/config index f5ec5c7..c8cd64e 100644 --- a/system/.config/git/config +++ b/system/.config/git/config @@ -49,6 +49,7 @@ [core] editor = vim + autocrlf = input [push] default = current diff --git a/system/.config/phpstorm/config/disabled_update.txt b/system/.config/phpstorm/config/disabled_update.txt new file mode 100644 index 0000000..e69de29 diff --git a/system/.config/phpstorm/config/options/ide.general.xml b/system/.config/phpstorm/config/options/ide.general.xml index ba14c49..a22c0e9 100644 --- a/system/.config/phpstorm/config/options/ide.general.xml +++ b/system/.config/phpstorm/config/options/ide.general.xml @@ -4,4 +4,7 @@