diff --git a/install b/install index 97c89af..d4131f1 100755 --- a/install +++ b/install @@ -135,6 +135,24 @@ COMPOSER_PACKAGES=( "laravel/installer" ) +# Root files which should be copied +declare -A COPY_ROOT_FILES +COPY_ROOT_FILES=( + ["/etc/docker/daemon.json"]="644" + ["/etc/mkinitcpio.conf"]="644" + ["/etc/NetworkManager/conf.d/dns.conf"]="644" + ["/etc/pacman.conf"]="644" + ["/etc/resolv.conf"]="644" + ["/etc/sudoers.d/severin"]="0440" + ["/etc/vconsole.conf"]="644" + ["/etc/X11/nvidia-xorg.conf.d/00-keyboard.conf"]="644" + ["/etc/X11/nvidia-xorg.conf.d/20-displaylink.conf"]="644" + ["/etc/X11/xorg.conf.d/00-keyboard.conf"]="644" + ["/etc/X11/xorg.conf.d/20-displaylink.conf"]="644" + ["/etc/zsh/zshenv"]="644" +) + + ############################################################################### # Installtion information # ############################################################################### @@ -323,41 +341,13 @@ sudo udevadm control --reload-rules ############################################################################### -# Copying other files # +# Copying root files # ############################################################################### -print_section "Copying other files" - -print_log "Copying custom sudoers file to ${YELLOW}/etc/sudoers.d${RESET}" -sudo install -Dm 0440 "${SYSTEM_DIR}/etc/sudoers.d/severin" "/etc/sudoers.d" - -print_log "Copying docker configuration to ${YELLOW}/etc/docker${RESET}" -sudo install -Dm 644 "${SYSTEM_DIR}/etc/docker/daemon.json" "/etc/docker" - -print_log "Copying zshenv to ${YELLOW}/etc/zsh${RESET}" -sudo install -Dm 644 "${SYSTEM_DIR}/etc/zsh/zshenv" "/etc/zsh" - -print_log "Copying pacman.conf to ${YELLOW}/etc/pacman.conf${RESET}" -sudo install -Dm 644 "${SYSTEM_DIR}/etc/pacman.conf" "/etc/pacman.conf" - -print_log "Copying 00-keyboard.conf to ${YELLOW}/etc/X11/xorg.conf.d${RESET}" -sudo install -Dm 644 "${SYSTEM_DIR}/etc/X11/xorg.conf.d/00-keyboard.conf" "/etc/X11/xorg.conf.d" -sudo install -Dm 644 "${SYSTEM_DIR}/etc/X11/xorg.conf.d/00-keyboard.conf" "/etc/X11/nvidia-xorg.conf.d" - -print_log "Copying 20-displaylink.conf to ${YELLOW}/etc/X11/xorg.conf.d${RESET}" -sudo install -Dm 644 "${SYSTEM_DIR}/etc/X11/xorg.conf.d/20-displaylink.conf" "/etc/X11/xorg.conf.d" -sudo install -Dm 644 "${SYSTEM_DIR}/etc/X11/xorg.conf.d/20-displaylink.conf" "/etc/X11/nvidia-xorg.conf.d" - -print_log "Copying vconsole.conf to ${YELLOW}/etc/vconsole.conf${RESET}" -sudo install -Dm 644 "${SYSTEM_DIR}/etc/vconsole.conf" "/etc/vconsole.conf" - -print_log "Copying mkinitcpio.conf to ${YELLOW}/etc/mkinitcpio.conf${RESET}" -sudo install -Dm 644 "${SYSTEM_DIR}/etc/mkinitcpio.conf" "/etc/mkinitcpio.conf" - -print_log "Copying resolv.conf to ${YELLOW}/etc/resolv.conf${RESET}" -sudo install -Dm 644 "${SYSTEM_DIR}/etc/resolv.conf" "/etc/resolv.conf" - -print_log "Copying dns.conf to ${YELLOW}/etc/NetworkManager/conf.d${RESET}" -sudo install -Dm 644 "${SYSTEM_DIR}/etc/NetworkManager/conf.d/dns.conf" "/etc/NetworkManager/conf.d" +print_section "Copying root files" +for file in "${!COPY_ROOT_FILES[@]}"; do + print_log "Copying ${YELLOW}${file}${RESET}" + sudo install -Dm "${COPY_ROOT_FILES[${file}]}" "${SYSTEM_DIR}${file}" "${file}" +done ############################################################################### diff --git a/system/etc/X11/nvidia-xorg.conf.d/00-keyboard.conf b/system/etc/X11/nvidia-xorg.conf.d/00-keyboard.conf new file mode 100644 index 0000000..cb54bd0 --- /dev/null +++ b/system/etc/X11/nvidia-xorg.conf.d/00-keyboard.conf @@ -0,0 +1,6 @@ +Section "InputClass" + Identifier "system-keyboard" + MatchIsKeyboard "on" + Option "XkbLayout" "ch" + Option "XkbModel" "pc105" +EndSection \ No newline at end of file diff --git a/system/etc/X11/nvidia-xorg.conf.d/20-displaylink.conf b/system/etc/X11/nvidia-xorg.conf.d/20-displaylink.conf new file mode 100644 index 0000000..61c2de5 --- /dev/null +++ b/system/etc/X11/nvidia-xorg.conf.d/20-displaylink.conf @@ -0,0 +1,12 @@ +Section "OutputClass" + Identifier "DisplayLink" + MatchDriver "evdi" + Driver "modesetting" + Option "AccelMethod" "none" +EndSection + +Section "Device" + Identifier "DisplayLink" + Driver "modesetting" + Option "PageFlip" "false" +EndSection \ No newline at end of file