Merge branch 'master' into light-emacs

[dotfiles.git] / xorg / X11R7.1_xorg.conf

diff --git a/xorg/X11R7.1_xorg.conf b/xorg/X11R7.1_xorg.conf
deleted file mode 100644 (file)
index 1a75350..0000000
--- a/xorg/X11R7.1_xorg.conf
+++ /dev/null
@@ -1,141 +0,0 @@
-# /etc/X11/xorg.conf (xorg X Window System server configuration file)
-#
-# This file was generated by dexconf, the Debian X Configuration tool, using
-# values from the debconf database.
-#
-# Edit this file with caution, and see the /etc/X11/xorg.conf manual page.
-# (Type "man /etc/X11/xorg.conf" at the shell prompt.)
-#
-# This file is automatically updated on xserver-xorg package upgrades *only*
-# if it has not been modified since the last upgrade of the xserver-xorg
-# package.
-#
-# If you have edited this file but would like it to be automatically updated
-# again, run the following command:
-#   sudo dpkg-reconfigure -phigh xserver-xorg
-
-Section "Files"
-       FontPath        "unix/:7100"                    # local font server
-       # if the local font server has problems, we can fall back on these
-       FontPath        "/usr/share/fonts/X11/misc"
-       FontPath        "/usr/X11R6/lib/X11/fonts/misc"
-       FontPath        "/usr/share/fonts/X11/cyrillic"
-       FontPath        "/usr/X11R6/lib/X11/fonts/cyrillic"
-       FontPath        "/usr/share/fonts/X11/100dpi/:unscaled"
-       FontPath        "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled"
-       FontPath        "/usr/share/fonts/X11/75dpi/:unscaled"
-       FontPath        "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled"
-       FontPath        "/usr/share/fonts/X11/Type1"
-       FontPath        "/usr/X11R6/lib/X11/fonts/Type1"
-       FontPath        "/usr/share/fonts/X11/100dpi"
-       FontPath        "/usr/X11R6/lib/X11/fonts/100dpi"
-       FontPath        "/usr/share/fonts/X11/75dpi"
-       FontPath        "/usr/X11R6/lib/X11/fonts/75dpi"
-       # path to defoma fonts
-       FontPath        "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType"
-EndSection
-
-Section "Extensions"
-        Option "Composite" "Enable"
-EndSection
-
-Section "Module"
-       Load    "i2c"
-       Load    "bitmap"
-       Load    "ddc"
-       Load    "dri"
-       Load    "extmod"
-       Load    "freetype"
-       Load    "glx"
-       Load    "int10"
-       Load    "type1"
-       Load    "vbe"
-EndSection
-
-Section "InputDevice"
-       Identifier      "Generic Keyboard"
-       Driver          "kbd"
-       Option          "CoreKeyboard"
-       Option          "XkbRules"      "xorg"
-       Option          "XkbModel"      "pc105"
-       Option          "XkbLayout"     "fr"
-       Option          "XkbVariant"    "latin9"
-EndSection
-
-Section "InputDevice"
-       Identifier      "Configured Mouse"
-       Driver          "mouse"
-       Option          "CorePointer"
-       Option          "Device"                "/dev/input/mice"
-       Option          "Protocol"              "ExplorerPS/2"
-       Option          "Emulate3Buttons"       "true"
-EndSection
-
-Section "InputDevice"
-       Identifier      "Synaptics Touchpad"
-       Driver          "synaptics"
-       Option          "SendCoreEvents"        "true"
-       Option          "Device"                "/dev/psaux"
-       Option          "Protocol"              "auto-dev"
-       Option          "HorizScrollDelta"      "0"
-EndSection
-
-Section "Device"
-       Identifier      "ATI Technologies, Inc. RV350 [Mobility Radeon 9600 M10]"
-       Driver          "ati"
-       BusID           "PCI:1:0:0"
-        Option "XAANoOffscreenPixmaps"
-
-#        Option "AccelMethod" "EXA"
-#         Option "AGPMode" "8"
-#         Option "AGPFastWrite" "on"
-#         Option "EnablePageFlip" "true"
-EndSection
-
-Section "Monitor"
-       Identifier      "Écran générique"
-       Option          "DPMS"
-EndSection
-
-Section "Screen"
-       Identifier      "Default Screen"
-       Device          "ATI Technologies, Inc. RV350 [Mobility Radeon 9600 M10]"
-       Monitor         "Écran générique"
-       DefaultDepth    24
-       SubSection "Display"
-               Depth           1
-               Modes           "1280x800"
-       EndSubSection
-       SubSection "Display"
-               Depth           4
-               Modes           "1280x800"
-       EndSubSection
-       SubSection "Display"
-               Depth           8
-               Modes           "1280x800"
-       EndSubSection
-       SubSection "Display"
-               Depth           15
-               Modes           "1280x800"
-       EndSubSection
-       SubSection "Display"
-               Depth           16
-               Modes           "1280x800"
-       EndSubSection
-       SubSection "Display"
-               Depth           24
-               Modes           "1280x800"
-       EndSubSection
-EndSection
-
-Section "ServerLayout"
-       Identifier      "Default Layout"
-       Screen          "Default Screen"
-       InputDevice     "Generic Keyboard"
-       InputDevice     "Configured Mouse"
-       InputDevice     "Synaptics Touchpad"
-EndSection
-
-Section "DRI"
-       Mode    0666
-EndSection