--- wikisrc/pkgsrc/how_to_install_modular_xorg.mdwn	2012/02/05 07:14:36	1.2
+++ wikisrc/pkgsrc/how_to_install_modular_xorg.mdwn	2019/05/12 18:27:09	1.5
@@ -2,10 +2,6 @@
 
 [[!toc levels=2]]
 
-#  Introduction
-
-The purpose of this document is to guide the reader on how to install the modular Xorg. 
-
 #  No X installed
 
 Assuming you have just made a clean install of NetBSD and you have not installed the X11 sets, you should do the following: 
@@ -17,58 +13,48 @@ Edit your /etc/mk.conf and add the follo
     X11_TYPE=modular
     
 
-##  Install xorg server
+##  Install xorg
 
 Provided that your pkgsrc tree lies in `/usr/pkgsrc`, type: 
     
-    # cd /usr/pkgsrc/x11/modular-xorg-server
+    # cd /usr/pkgsrc/meta-pkgs/modular-xorg
     # make install
     
 
-##  Install xorg apps
-    
-    # cd /usr/pkgsrc/meta-pkgs/modular-xorg-apps
-    # make install
-    
+##  Configure Xorg
 
-##  Install xorg fonts
-    
-    # cd /usr/pkgsrc/meta-pkgs/modular-xorg-fonts
-    # make install
-    
+Usually no configuration is necessary. To start X you use:
 
-##  Install xorg input device
-    
-    # cd /usr/pkgsrc/x11/xf86-input-keyboard
-    # make install
-    
+    $ startx
 
-And: 
-    
-    # cd /usr/pkgsrc/x11/xf86-input-mouse
-    # make install
-    
+## Additional configuration
 
-##  Install xorg video driver
+Additional adjustments can be made in ~/.xinitrc and ~/.Xresources.
+For example, you may want to use a different terminal emulator font, such as pkgsrc/fonts/overpass.
 
-In order to determine the appropriate driver for you, list the `/usr/pkgsrc/x11/xf86-video-*` files. For example, if you would need the nvidia driver, search for it: 
-    
-    # ls -ld xf86-video-* | grep nv
-    # drwxr-r-x  4 root wheel  512 Aug 26 16:17 xf86-video-nv
-    
+## ~/.Xresources
 
-and then install it: 
-    
-    # cd /usr/pkgsrc/x11/xf86-video-nv
-    # make install
-    
+To do so, we can add this line to ~/.Xresources:
 
-##  Configure Xorg
+    *font: xft:overpass mono:size=12
 
-Run as root the xorgconfig(1) utility to create an xorg.conf file. Or use command: 
-    
-    # X -configure
+For this to take effect, we must do merge it into the database.
+
+    $ xrdb -merge ~/.Xresources
+
+To do this at every X startup, we can add it to ~/.xinitrc.
+
+<!-- XXX refer to further documentation on .xinitrc -->
+
+## ~/.xinitrc
+
+An example ~/.xinitrc to run a window manager and configure keyboard layout:
+
+    xrdb merge ~/.Xresources						# respect ~/.Xresources configuration
+
+    setxkbmap -option grp:alt_shift_toggle us,il	# two keyboard options, US keyboard and IL,
+    										# with alt+shift as a toggle option
     
+    openbox									# run your favourite window manager.
 
-This will create /root/xorg.conf.new, which should be copied to /etc/X11/xorg.conf and possibly edited.