diff --git a/home/.config/x11/xprofile b/home/.config/x11/xprofile
index 6063d44..00527e8 100644
--- a/home/.config/x11/xprofile
+++ b/home/.config/x11/xprofile
@@ -23,11 +23,14 @@ nm-applet &
 
 # Run trayer-srg for systemtray bar
 # if installed normally, use `trayer`, not `trayer-srg` command
-trayer-srg --monitor 0 --edge top --align right --widthtype request --padding 0 --transparent true --tint 0x282c34 --alpha 0 --height 23 &
+trayer --monitor 0 --edge top --align right --widthtype request --padding 0 --transparent true --tint 0x282c34 --alpha 0 --height 23 &
 
 # AppArmor notifications
 aa-notify -p &
 
+# Enable numlock with numlockx
+numlockx &
+
 # Run emacs daemon
 #emacs --daemon &
 
diff --git a/packages.yaml b/packages.yaml
index d185323..81667a6 100644
--- a/packages.yaml
+++ b/packages.yaml
@@ -69,6 +69,7 @@ pacman:
     - xmonad
     - xmonad-contrib
     - xmobar
+    - numlockx
     #- lightdm
 
     # GUI
@@ -109,6 +110,7 @@ git:
     - https://aur.archlinux.org/yay-git.git # Yay tool, for AUR installation
 
 aur:
+    - mkinitcpio-numlock # Enable numlock in initramfs (before asking for encryption key)
     # CLI/TUI
     - lf # Terminal ranger-like file manager
     - ngrok # Forward your localhost without ip recovery
diff --git a/root/etc/mkinitcpio.conf b/root/etc/mkinitcpio.conf
new file mode 100644
index 0000000..6f0e262
--- /dev/null
+++ b/root/etc/mkinitcpio.conf
@@ -0,0 +1,69 @@
+# vim:set ft=sh
+# MODULES
+# The following modules are loaded before any boot hooks are
+# run.  Advanced users may wish to specify all system modules
+# in this array.  For instance:
+#     MODULES=(piix ide_disk reiserfs)
+MODULES=()
+
+# BINARIES
+# This setting includes any additional binaries a given user may
+# wish into the CPIO image.  This is run last, so it may be used to
+# override the actual binaries included by a given hook
+# BINARIES are dependency parsed, so you may safely ignore libraries
+BINARIES=()
+
+# FILES
+# This setting is similar to BINARIES above, however, files are added
+# as-is and are not parsed in any way.  This is useful for config files.
+FILES=()
+
+# HOOKS
+# This is the most important setting in this file.  The HOOKS control the
+# modules and scripts added to the image, and what happens at boot time.
+# Order is important, and it is recommended that you do not change the
+# order in which HOOKS are added.  Run 'mkinitcpio -H <hook name>' for
+# help on a given hook.
+# 'base' is _required_ unless you know precisely what you are doing.
+# 'udev' is _required_ in order to automatically load modules
+# 'filesystems' is _required_ unless you specify your fs modules in MODULES
+# Examples:
+##   This setup specifies all modules in the MODULES setting above.
+##   No raid, lvm2, or encrypted root is needed.
+#    HOOKS=(base)
+#
+##   This setup will autodetect all modules for your system and should
+##   work as a sane default
+#    HOOKS=(base udev autodetect block filesystems)
+#
+##   This setup will generate a 'full' image which supports most systems.
+##   No autodetection is done.
+#    HOOKS=(base udev block filesystems)
+#
+##   This setup assembles a pata mdadm array with an encrypted root FS.
+##   Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
+#    HOOKS=(base udev block mdadm encrypt filesystems)
+#
+##   This setup loads an lvm2 volume group on a usb device.
+#    HOOKS=(base udev block lvm2 filesystems)
+#
+##   NOTE: If you have /usr on a separate partition, you MUST include the
+#    usr, fsck and shutdown hooks.
+#
+##  Edits applied: numlock (requires mkinitcpio-numlock (AUR)), encrypt
+HOOKS=(base udev autodetect keyboard numlock modconf block encrypt filesystems fsck)
+
+# COMPRESSION
+# Use this to compress the initramfs image. By default, zstd compression
+# is used. Use 'cat' to create an uncompressed image.
+#COMPRESSION="zstd"
+#COMPRESSION="gzip"
+#COMPRESSION="bzip2"
+#COMPRESSION="lzma"
+#COMPRESSION="xz"
+#COMPRESSION="lzop"
+#COMPRESSION="lz4"
+
+# COMPRESSION_OPTIONS
+# Additional options for the compressor
+#COMPRESSION_OPTIONS=()