saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 6a696c1b0b631075db8458cd3546274e496c9704..4df0c49a96b08ff446b29d49e9bc3faa5d0ead79 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -291,6 +291,7 @@ maybe chmod 0644 'X11/xorg.conf.06062017'
 maybe chmod 0644 'X11/xorg.conf.06072017'
 maybe chmod 0644 'X11/xorg.conf.06082017'
 maybe chmod 0644 'X11/xorg.conf.06162017'
+maybe chmod 0600 'X11/xorg.conf.backup'
 maybe chmod 0644 'X11/xorg.conf.failsafe'
 maybe chmod 0600 'X11/xorg.conf.nvidia-xconfig-original'
 maybe chmod 0600 'X11/xorg.conf_nvidia'
@@ -2348,7 +2349,6 @@ maybe chmod 0644 'modprobe.d/blacklist-framebuffer.conf'
 maybe chmod 0644 'modprobe.d/blacklist-libnfc.conf'
 maybe chmod 0644 'modprobe.d/blacklist-modem.conf'
 maybe chmod 0644 'modprobe.d/blacklist-nouveau.conf'
-maybe chmod 0644 'modprobe.d/blacklist-nvidia.conf'
 maybe chmod 0644 'modprobe.d/blacklist-rare-network.conf'
 maybe chmod 0644 'modprobe.d/blacklist-watchdog.conf'
 maybe chmod 0644 'modprobe.d/blacklist.conf'

diff --git a/X11/xorg.conf b/X11/xorg.conf
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d8bc05eda9a69e39dfc1591a18d40ff5dc6fd27a 100644 (file)
--- a/X11/xorg.conf
+++ b/X11/xorg.conf
@@ -0,0 +1,52 @@
+# nvidia-xconfig: X configuration file generated by nvidia-xconfig
+# nvidia-xconfig:  version 430.50
+
+Section "ServerLayout"
+    Identifier     "Layout0"
+    Screen      0  "Screen0"
+    InputDevice    "Keyboard0" "CoreKeyboard"
+    InputDevice    "Mouse0" "CorePointer"
+EndSection
+
+Section "Files"
+EndSection
+
+Section "InputDevice"
+    # generated from default
+    Identifier     "Mouse0"
+    Driver         "mouse"
+    Option         "Protocol" "auto"
+    Option         "Device" "/dev/psaux"
+    Option         "Emulate3Buttons" "no"
+    Option         "ZAxisMapping" "4 5"
+EndSection
+
+Section "InputDevice"
+    # generated from default
+    Identifier     "Keyboard0"
+    Driver         "kbd"
+EndSection
+
+Section "Monitor"
+    Identifier     "Monitor0"
+    VendorName     "Unknown"
+    ModelName      "Unknown"
+    Option         "DPMS"
+EndSection
+
+Section "Device"
+    Identifier     "Device0"
+    Driver         "nvidia"
+    VendorName     "NVIDIA Corporation"
+EndSection
+
+Section "Screen"
+    Identifier     "Screen0"
+    Device         "Device0"
+    Monitor        "Monitor0"
+    DefaultDepth    24
+    SubSection     "Display"
+        Depth       24
+    EndSubSection
+EndSection
+

diff --git a/X11/xorg.conf.backup b/X11/xorg.conf.backup
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/modprobe.d/blacklist-nvidia.conf b/modprobe.d/blacklist-nvidia.conf
deleted file mode 100644 (file)
index db9824f..0000000
--- a/modprobe.d/blacklist-nvidia.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Do not modify
-# This file was generated by nvidia-prime
-blacklist nvidia
-blacklist nvidia-drm
-blacklist nvidia-modeset
-alias nvidia off
-alias nvidia-drm off
-alias nvidia-modeset off
\ No newline at end of file