From 18ab6ab5eefbe1cc489aa5f343e6bb764137d086 Mon Sep 17 00:00:00 2001 From: Alison Watson Date: Thu, 7 Nov 2019 07:20:22 -0500 Subject: [PATCH] copy full xorg and font configurations and reorganize --- copy-files | 13 +++++++++---- files | 5 ++--- fonts/explanation | 6 ------ system/61-xwiimote-custom.conf | 19 ------------------- {fonts => system/fonts}/67-defaults.conf | 0 {fonts => system/fonts}/conflist | 9 --------- {fonts => system/fonts}/fontconfig.sh | 0 system/{ => services}/sans.service | 0 system/xorg/10-monitor.conf | 7 +++++++ system/xorg/20-amdgpu.conf | 5 +++++ system/xorg/50-fix-xwiimote.conf | 20 ++++++++++++++++++++ system/xorg/60-xwiimote.conf | 23 +++++++++++++++++++++++ system/xorg/61-xwiimote-custom.conf | 19 +++++++++++++++++++ system/xorg/conflist | 5 +++++ 14 files changed, 90 insertions(+), 41 deletions(-) delete mode 100644 fonts/explanation delete mode 100644 system/61-xwiimote-custom.conf rename {fonts => system/fonts}/67-defaults.conf (100%) rename {fonts => system/fonts}/conflist (67%) rename {fonts => system/fonts}/fontconfig.sh (100%) rename system/{ => services}/sans.service (100%) create mode 100644 system/xorg/10-monitor.conf create mode 100644 system/xorg/20-amdgpu.conf create mode 100644 system/xorg/50-fix-xwiimote.conf create mode 100644 system/xorg/60-xwiimote.conf create mode 100644 system/xorg/61-xwiimote-custom.conf create mode 100644 system/xorg/conflist diff --git a/copy-files b/copy-files index 5484ff3..12f4c76 100755 --- a/copy-files +++ b/copy-files @@ -19,14 +19,19 @@ while read f t end < files # copy font configs -find /etc/fonts/conf.d/*.conf > fonts/conflist +function copy-confd -a path out + find $path/*.conf > $out/conflist -for f in /etc/fonts/conf.d/*.conf - if not test -L "$f" - cp $f fonts + for f in $path/*.conf + if not test -L "$f" + cp $f $out + end end end +copy-confd /etc/fonts/conf.d system/fonts/ +copy-confd /etc/X11/xorg.conf.d system/xorg/ + # copy vim package names tree -dL 3 ~/.vim/pack > vim/packages diff --git a/files b/files index 378406d..1f03409 100644 --- a/files +++ b/files @@ -1,12 +1,11 @@ -fonts/fontconfig.sh /etc/profile.d/freetype2.sh +system/fonts/fontconfig.sh /etc/profile.d/fontconfig.sh network /etc/systemd/network/* network/icecast.xml /etc/icecast.xml network/motsognir.conf /etc/motsognir.conf network/mpd.conf ~/.config/mpd/mpd.conf network/nginx.conf /etc/nginx/nginx.conf -system/61-xwiimote-custom.conf /etc/X11/xorg.conf.d/61-xwiimote-custom.conf system/grub /etc/default/grub system/progm.xkb /usr/share/X11/xkb/symbols/progm -system/sans.service /etc/systemd/system/sans.service +system/services/sans.service /etc/systemd/system/sans.service themes ~/.slade3/text_styles/* themes/userChrome.css ~/.mozilla/firefox/*/chrome/userChrome.css diff --git a/fonts/explanation b/fonts/explanation deleted file mode 100644 index 3f30332..0000000 --- a/fonts/explanation +++ /dev/null @@ -1,6 +0,0 @@ -Arch Linux uses presets for global font configs, so only font configs I've -written are stored here. The rest can be assumed to have been from Arch's -default packaged configurations. - -I do not use per-user font configuration because it does not allow SDDM to use -the correct fonts. All of these configs come from . diff --git a/system/61-xwiimote-custom.conf b/system/61-xwiimote-custom.conf deleted file mode 100644 index 2a79db0..0000000 --- a/system/61-xwiimote-custom.conf +++ /dev/null @@ -1,19 +0,0 @@ -Section "InputClass" - Identifier "Nintendo Wii Remote" - MatchProduct "Nintendo Wii Remote" - MatchDevicePath "/dev/input/event*" - Option "Ignore" "off" - Driver "xwiimote" - Option "MotionSource" "ir" - Option "MPNormalization" "On" - Option "MPCalibrationFactor" "5000" - Option "MPZScale" "-1" - Option "MapA" "left-button" - Option "MapIRA" "left-button" - Option "MapB" "right-button" - Option "MapIRB" "right-button" - Option "MapOne" "KEY_SPACE" - Option "MapIROne" "KEY_SPACE" - Option "MapTwo" "KEY_S" - Option "MapIRTwo" "KEY_S" -EndSection diff --git a/fonts/67-defaults.conf b/system/fonts/67-defaults.conf similarity index 100% rename from fonts/67-defaults.conf rename to system/fonts/67-defaults.conf diff --git a/fonts/conflist b/system/fonts/conflist similarity index 67% rename from fonts/conflist rename to system/fonts/conflist index 591123f..5677fe7 100644 --- a/fonts/conflist +++ b/system/fonts/conflist @@ -2,9 +2,6 @@ /etc/fonts/conf.d/10-scale-bitmap-fonts.conf /etc/fonts/conf.d/10-sub-pixel-rgb.conf /etc/fonts/conf.d/11-lcdfilter-default.conf -/etc/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf -/etc/fonts/conf.d/20-unhint-small-dejavu-sans.conf -/etc/fonts/conf.d/20-unhint-small-dejavu-serif.conf /etc/fonts/conf.d/20-unhint-small-vera.conf /etc/fonts/conf.d/30-metric-aliases.conf /etc/fonts/conf.d/30-win32-aliases.conf @@ -14,17 +11,11 @@ /etc/fonts/conf.d/49-sansserif.conf /etc/fonts/conf.d/50-user.conf /etc/fonts/conf.d/51-local.conf -/etc/fonts/conf.d/56-ttf-twemoji-color.conf /etc/fonts/conf.d/60-generic.conf /etc/fonts/conf.d/60-latin.conf /etc/fonts/conf.d/65-fonts-persian.conf -/etc/fonts/conf.d/65-khmer.conf /etc/fonts/conf.d/65-nonlatin.conf -/etc/fonts/conf.d/66-noto-mono.conf -/etc/fonts/conf.d/66-noto-sans.conf -/etc/fonts/conf.d/66-noto-serif.conf /etc/fonts/conf.d/67-defaults.conf /etc/fonts/conf.d/69-unifont.conf -/etc/fonts/conf.d/70-no-bitmaps.conf /etc/fonts/conf.d/80-delicious.conf /etc/fonts/conf.d/90-synthetic.conf diff --git a/fonts/fontconfig.sh b/system/fonts/fontconfig.sh similarity index 100% rename from fonts/fontconfig.sh rename to system/fonts/fontconfig.sh diff --git a/system/sans.service b/system/services/sans.service similarity index 100% rename from system/sans.service rename to system/services/sans.service diff --git a/system/xorg/10-monitor.conf b/system/xorg/10-monitor.conf new file mode 100644 index 0000000..daba21d --- /dev/null +++ b/system/xorg/10-monitor.conf @@ -0,0 +1,7 @@ +Section "ServerLayout" + Identifier "ServerLayout0" + Option "StandbyTime" "0" + Option "SuspendTime" "0" + Option "OffTime" "0" + Option "BlankTime" "0" +EndSection diff --git a/system/xorg/20-amdgpu.conf b/system/xorg/20-amdgpu.conf new file mode 100644 index 0000000..ffee454 --- /dev/null +++ b/system/xorg/20-amdgpu.conf @@ -0,0 +1,5 @@ +Section "Device" + Identifier "AMD" + Driver "amdgpu" + Option "TearFree" "true" +EndSection diff --git a/system/xorg/50-fix-xwiimote.conf b/system/xorg/50-fix-xwiimote.conf new file mode 100644 index 0000000..d68c2ad --- /dev/null +++ b/system/xorg/50-fix-xwiimote.conf @@ -0,0 +1,20 @@ +Section "InputClass" + Identifier "Nintendo Wii Remote Raw Input Blacklist" + MatchProduct "Nintendo Wii Remote" + MatchDevicePath "/dev/input/event*" + Option "Ignore" "on" +EndSection + +Section "InputClass" + Identifier "Nintendo Wii Remote Classic Controller Whitelist" + MatchProduct "Nintendo Wii Remote Classic Controller" + MatchDevicePath "/dev/input/event*" + Option "Ignore" "off" +EndSection + +Section "InputClass" + Identifier "Nintendo Wii Remote Pro Controller Whitelist" + MatchProduct "Nintendo Wii Remote Pro Controller" + MatchDevicePath "/dev/input/event*" + Option "Ignore" "off" +EndSection diff --git a/system/xorg/60-xwiimote.conf b/system/xorg/60-xwiimote.conf new file mode 100644 index 0000000..3532294 --- /dev/null +++ b/system/xorg/60-xwiimote.conf @@ -0,0 +1,23 @@ +Section "InputClass" + Identifier "Nintendo Wii Remote" + MatchProduct "Nintendo Wii Remote" + MatchDevicePath "/dev/input/event*" + Option "Ignore" "off" + Driver "xwiimote" +EndSection + +Section "InputClass" + Identifier "Nintendo Wii Remote Classic Controller Whitelist" + MatchProduct "Nintendo Wii Remote Classic Controller" + MatchDevicePath "/dev/input/event*" + Option "Ignore" "off" + Driver "evdev" +EndSection + +Section "InputClass" + Identifier "Nintendo Wii Remote Pro Controller Whitelist" + MatchProduct "Nintendo Wii Remote Pro Controller" + MatchDevicePath "/dev/input/event*" + Option "Ignore" "off" + Driver "evdev" +EndSection diff --git a/system/xorg/61-xwiimote-custom.conf b/system/xorg/61-xwiimote-custom.conf new file mode 100644 index 0000000..a8094d0 --- /dev/null +++ b/system/xorg/61-xwiimote-custom.conf @@ -0,0 +1,19 @@ +Section "InputClass" + Identifier "Nintendo Wii Remote" + MatchProduct "Nintendo Wii Remote" + MatchDevicePath "/dev/input/event*" + Option "Ignore" "off" + Driver "xwiimote" + Option "MotionSource" "ir" + Option "MPNormalization" "On" + Option "MPCalibrationFactor" "5000" + Option "MPZScale" "-1" + Option "MapA" "left-button" + Option "MapIRA" "left-button" + Option "MapB" "right-button" + Option "MapIRB" "right-button" + Option "MapOne" "KEY_SPACE" + Option "MapIROne" "KEY_SPACE" + Option "MapTwo" "KEY_S" + Option "MapIRTwo" "KEY_S" +EndSection diff --git a/system/xorg/conflist b/system/xorg/conflist new file mode 100644 index 0000000..e4bf3c1 --- /dev/null +++ b/system/xorg/conflist @@ -0,0 +1,5 @@ +/etc/X11/xorg.conf.d/10-monitor.conf +/etc/X11/xorg.conf.d/20-amdgpu.conf +/etc/X11/xorg.conf.d/50-fix-xwiimote.conf +/etc/X11/xorg.conf.d/60-xwiimote.conf +/etc/X11/xorg.conf.d/61-xwiimote-custom.conf