From 8f68b86ef33a42c26a7f23adcf36b54d60d4fd98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 16 Nov 2022 10:00:19 +0100 Subject: system: remove as I am not using NixOS that provides this more easily --- system/etc/X11/xorg.conf.d/30-composite.conf | 3 - system/etc/X11/xorg.conf.d/50-joystick.conf | 8 -- system/etc/X11/xorg.conf.d/50-synaptics.conf | 40 ---------- system/etc/X11/xorg.conf.d/90-custom-kbd.conf | 6 -- system/etc/profile.d/path.sh | 1 - system/etc/pulse/daemon.conf | 89 ---------------------- system/etc/pulse/system.pa | 103 -------------------------- system_install | 38 ---------- 8 files changed, 288 deletions(-) delete mode 100644 system/etc/X11/xorg.conf.d/30-composite.conf delete mode 100644 system/etc/X11/xorg.conf.d/50-joystick.conf delete mode 100644 system/etc/X11/xorg.conf.d/50-synaptics.conf delete mode 100644 system/etc/X11/xorg.conf.d/90-custom-kbd.conf delete mode 100644 system/etc/profile.d/path.sh delete mode 100644 system/etc/pulse/daemon.conf delete mode 100644 system/etc/pulse/system.pa delete mode 100755 system_install diff --git a/system/etc/X11/xorg.conf.d/30-composite.conf b/system/etc/X11/xorg.conf.d/30-composite.conf deleted file mode 100644 index d5912cd..0000000 --- a/system/etc/X11/xorg.conf.d/30-composite.conf +++ /dev/null @@ -1,3 +0,0 @@ -Section "Extensions" - Option "Composite" "Enable" -EndSection diff --git a/system/etc/X11/xorg.conf.d/50-joystick.conf b/system/etc/X11/xorg.conf.d/50-joystick.conf deleted file mode 100644 index 1765eb8..0000000 --- a/system/etc/X11/xorg.conf.d/50-joystick.conf +++ /dev/null @@ -1,8 +0,0 @@ -Section "InputClass" - Identifier "joystick catchall" - MatchIsJoystick "on" - MatchDevicePath "/dev/input/event*" - Driver "joystick" - Option "StartKeysEnabled" "False" #Disable mouse - Option "StartMouseEnabled" "False" #support -EndSection diff --git a/system/etc/X11/xorg.conf.d/50-synaptics.conf b/system/etc/X11/xorg.conf.d/50-synaptics.conf deleted file mode 100644 index 13f4571..0000000 --- a/system/etc/X11/xorg.conf.d/50-synaptics.conf +++ /dev/null @@ -1,40 +0,0 @@ -# Example xorg.conf.d snippet that assigns the touchpad driver -# to all touchpads. See xorg.conf.d(5) for more information on -# InputClass. -# Additional options may be added in the form of -# Option "OptionName" "value" -# -Section "InputClass" - Identifier "touchpad catchall" - Driver "synaptics" - MatchIsTouchpad "on" - Option "TapButton1" "1" - Option "TapButton2" "3" - Option "TapButton3" "2" - Option "VertTwoFingerScroll" "on" - Option "HorizTwoFingerScroll" "on" - Option "synclient AccelFactor" "0.1" -# This option is recommend on all Linux systems using evdev, but cannot be -# enabled by default. See the following link for details: -# http://who-t.blogspot.com/2010/11/how-to-ignore-configuration-errors.html - MatchDevicePath "/dev/input/event*" -EndSection - -Section "InputClass" - Identifier "touchpad ignore duplicates" - MatchIsTouchpad "on" - MatchOS "Linux" - MatchDevicePath "/dev/input/mouse*" - Option "Ignore" "on" -EndSection - -# This option enables the bottom right corner to be a right button on clickpads -# and the right and middle top areas to be right / middle buttons on clickpads -# with a top button area. -# This option is only interpreted by clickpads. -Section "InputClass" - Identifier "Default clickpad buttons" - MatchDriver "synaptics" - Option "SoftButtonAreas" "50% 0 82% 0 0 0 0 0" - Option "SecondarySoftButtonAreas" "58% 0 0 15% 42% 58% 0 15%" -EndSection diff --git a/system/etc/X11/xorg.conf.d/90-custom-kbd.conf b/system/etc/X11/xorg.conf.d/90-custom-kbd.conf deleted file mode 100644 index 72f1dba..0000000 --- a/system/etc/X11/xorg.conf.d/90-custom-kbd.conf +++ /dev/null @@ -1,6 +0,0 @@ -Section "InputClass" - Identifier "keyboard defaults" - MatchIsKeyboard "on" - - Option "XKbOptions" "caps:escape" -EndSection diff --git a/system/etc/profile.d/path.sh b/system/etc/profile.d/path.sh deleted file mode 100644 index ae00916..0000000 --- a/system/etc/profile.d/path.sh +++ /dev/null @@ -1 +0,0 @@ -PATH="$PATH:/usr/sbin:/sbin" diff --git a/system/etc/pulse/daemon.conf b/system/etc/pulse/daemon.conf deleted file mode 100644 index 2741f4b..0000000 --- a/system/etc/pulse/daemon.conf +++ /dev/null @@ -1,89 +0,0 @@ -# This file is part of PulseAudio. -# -# PulseAudio is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# PulseAudio is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, see . - -## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for -## more information. Default values are commented out. Use either ; or # for -## commenting. - -; daemonize = no -; fail = yes -; allow-module-loading = yes -; allow-exit = yes -; use-pid-file = yes -; system-instance = no -; local-server-type = user -; enable-shm = yes -; enable-memfd = yes -; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB -; lock-memory = no -; cpu-limit = no - -; high-priority = yes -; nice-level = -11 - -; realtime-scheduling = yes -; realtime-priority = 5 - -; exit-idle-time = 20 -; scache-idle-time = 20 - -; dl-search-path = (depends on architecture) - -; load-default-script-file = yes -; default-script-file = /etc/pulse/default.pa - -; log-target = auto -; log-level = notice -; log-meta = no -; log-time = no -; log-backtrace = 0 - -; resample-method = speex-float-1 -; avoid-resampling = false -; enable-remixing = yes -; remixing-use-all-sink-channels = yes -; enable-lfe-remixing = no -; lfe-crossover-freq = 0 - -flat-volumes = no - -; rlimit-fsize = -1 -; rlimit-data = -1 -; rlimit-stack = -1 -; rlimit-core = -1 -; rlimit-as = -1 -; rlimit-rss = -1 -; rlimit-nproc = -1 -; rlimit-nofile = 256 -; rlimit-memlock = -1 -; rlimit-locks = -1 -; rlimit-sigpending = -1 -; rlimit-msgqueue = -1 -; rlimit-nice = 31 -; rlimit-rtprio = 9 -; rlimit-rttime = 200000 - -; default-sample-format = s16le -; default-sample-rate = 44100 -; alternate-sample-rate = 48000 -; default-sample-channels = 2 -; default-channel-map = front-left,front-right - -; default-fragments = 4 -; default-fragment-size-msec = 25 - -; enable-deferred-volume = yes -; deferred-volume-safety-margin-usec = 8000 -; deferred-volume-extra-delay-usec = 0 diff --git a/system/etc/pulse/system.pa b/system/etc/pulse/system.pa deleted file mode 100644 index 38d1245..0000000 --- a/system/etc/pulse/system.pa +++ /dev/null @@ -1,103 +0,0 @@ -#!/usr/bin/pulseaudio -nF -# -# This file is part of PulseAudio. -# -# PulseAudio is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# PulseAudio is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with PulseAudio; if not, see . - -# This startup script is used only if PulseAudio is started in system -# mode. - -.fail - -### Automatically restore the volume of streams and devices -load-module module-device-restore -load-module module-stream-restore -load-module module-card-restore - -### Automatically augment property information from .desktop files -### stored in /usr/share/application -load-module module-augment-properties - -### Should be after module-*-restore but before module-*-detect -load-module module-switch-on-port-available - -### Load audio drivers statically -### (it's probably better to not load these drivers manually, but instead -### use module-udev-detect -- see below -- for doing this automatically) -#load-module module-alsa-sink -#load-module module-alsa-source device=hw:1,0 -#load-module module-null-sink -#load-module module-pipe-sink - -### Automatically load driver modules depending on the hardware available -.ifexists module-udev-detect.so -load-module module-udev-detect -.else -### Use the static hardware detection module (for systems that lack udev/hal support) -load-module module-detect -.endif - -### Automatically connect sink and source if JACK server is present -.ifexists module-jackdbus-detect.so -.nofail -load-module module-jackdbus-detect channels=2 -.fail -.endif - -### Automatically load driver modules for Bluetooth hardware -load-module module-bluetooth-policy -load-module module-bluetooth-discover - -### Load several protocols -.ifexists module-esound-protocol-unix.so -load-module module-esound-protocol-unix -.endif -load-module module-native-protocol-unix - - -### Automatically restore the default sink/source when changed by the user -### during runtime -### NOTE: This should be loaded as early as possible so that subsequent modules -### that look up the default sink/source get the right value -load-module module-default-device-restore - -### Automatically move streams to the default sink if the sink they are -### connected to dies, similar for sources -load-module module-rescue-streams - -### Make sure we always have a sink around, even if it is a null sink. -load-module module-always-sink - -### Honour intended role device property -load-module module-intended-roles - -### Automatically suspend sinks/sources that become idle for too long -load-module module-suspend-on-idle - -### Enable positioned event sounds -load-module module-position-event-sounds - -### Cork music/video streams when a phone stream is active -load-module module-role-cork - -### Modules to allow autoloading of filters (such as echo cancellation) -### on demand. module-filter-heuristics tries to determine what filters -### make sense, and module-filter-apply does the heavy-lifting of -### loading modules and rerouting streams. -load-module module-filter-heuristics -load-module module-filter-apply - -### Make some devices default -#set-default-sink output -#set-default-source input diff --git a/system_install b/system_install deleted file mode 100755 index c493de8..0000000 --- a/system_install +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -if [ "$UID" -ne 0 ]; then - echo "Please run this as root!" >&2 - exit 6 -fi - -cd `dirname $0` - -git submodule update --init || (echo "Submodule update failed!"; exit 5) - -# Source inst and diff function -. ./utils/inst - -# Load if we force changes (implies no interaction) -[ "$1" = "-f" ] && FORCE=true || FORCE=false - -################################################################################# - -if ask "sys-path" "System PATH profile"; then - inst system/etc/profile.d/path.sh /etc/profile.d/path.sh -fi - -if ask "sys-x11" "X11 configuration"; then - inst system/etc/X11/ /etc/X11/ -fi - -if ask "sys-pulse" "System-wide PulseAudio configuration"; then - inst system/etc/pulse/ /etc/pulse/ -fi - -if ask "sys-wpa" "Wpa supplicant"; then - # TODO - true -fi - -# As final step just ensure that correct user is owning system files -chown -R $(stat -c "%U:%G" "$0") system -- cgit v1.2.3