diff --git a/pkg/de-p1st-keyboard/00-keyboard.conf b/pkg/de-p1st-keyboard/00-keyboard.conf
new file mode 100644
index 0000000..e9ad6ba
--- /dev/null
+++ b/pkg/de-p1st-keyboard/00-keyboard.conf
@@ -0,0 +1,9 @@
+Section "InputClass"
+        Identifier "system-keyboard"
+        MatchIsKeyboard "on"
+        # German and Norwegian
+        Option "XkbLayout" "de,no"
+        Option "XkbVariant" "nodeadkeys"
+        # toggle between layouts with: ALT + CAPS-LOCK
+        Option "XkbOptions" "grp:alt_caps_toggle"
+EndSection
diff --git a/pkg/de-p1st-keyboard/PKGBUILD b/pkg/de-p1st-keyboard/PKGBUILD
new file mode 100644
index 0000000..7cf0696
--- /dev/null
+++ b/pkg/de-p1st-keyboard/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Daniel Langbein <daniel@systemli.org>
+_pkgname=keyboard
+_reponame=arch-pkg
+pkgname="de-p1st-$_pkgname"
+pkgver=0.0.1
+pkgrel=1
+pkgdesc="vconsole (virtual console) and xorg (X11) keyboard configuration"
+arch=('any')
+url="https://git.privacy1st.de/langfingaz/${_reponame}"
+license=('MIT')
+groups=()
+depends=()
+makedepends=()
+optdepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=("git+${url}.git")
+noextract=()
+sha256sums=('SKIP')
+
+package() {
+  cd "${_reponame}/pkg/${pkgname}"
+
+  install -Dm0644 vconsole.conf    "$pkgdir"/etc/vconsole.conf
+  install -Dm0644 00-keyboard.conf "$pkgdir"/etc/X11/xorg.conf.d/00-keyboard.conf
+}
diff --git a/pkg/de-p1st-keyboard/vconsole.conf b/pkg/de-p1st-keyboard/vconsole.conf
new file mode 100644
index 0000000..9e9e418
--- /dev/null
+++ b/pkg/de-p1st-keyboard/vconsole.conf
@@ -0,0 +1,2 @@
+# man 5 vconsole.conf
+KEYMAP=de-latin1-nodeadkeys
\ No newline at end of file
diff --git a/pkg/de-p1st-systemd/00-journal-size.conf b/pkg/de-p1st-systemd/00-journal-size.conf
new file mode 100644
index 0000000..3743abd
--- /dev/null
+++ b/pkg/de-p1st-systemd/00-journal-size.conf
@@ -0,0 +1,3 @@
+# https://wiki.archlinux.org/index.php/Systemd/Journal#Journal_size_limit
+[Journal]
+SystemMaxUse=128M
\ No newline at end of file
diff --git a/pkg/de-p1st-systemd/00_journal_size.conf b/pkg/de-p1st-systemd/00_journal_size.conf
deleted file mode 100644
index 7061a99..0000000
--- a/pkg/de-p1st-systemd/00_journal_size.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[Journal]
-SystemMaxUse=128M
\ No newline at end of file
diff --git a/pkg/de-p1st-systemd/PKGBUILD b/pkg/de-p1st-systemd/PKGBUILD
index 31c85c3..d694c8e 100644
--- a/pkg/de-p1st-systemd/PKGBUILD
+++ b/pkg/de-p1st-systemd/PKGBUILD
@@ -26,5 +26,5 @@ sha256sums=('SKIP')
 package() {
   cd "${_reponame}/pkg/${pkgname}"
 
-  install -Dm0644 00_journal_size.conf "$pkgdir"/etc/systemd.conf.d/00_journal_size.conf
+  install -Dm0644 00-journal-size.conf "$pkgdir"/etc/systemd.conf.d/00-journal-size.conf
 }