diff --git a/blackbox/blackbox/Packages-Desktop b/blackbox/blackbox/Packages-Desktop index 088d7e7..f466e95 100644 --- a/blackbox/blackbox/Packages-Desktop +++ b/blackbox/blackbox/Packages-Desktop @@ -16,8 +16,7 @@ #---------=> graphic applications >extra gcolor2 >extra gimp ->extra gpicview ->extra viewnior +>extra xviewer #---------=> connect packages >extra blueman @@ -36,17 +35,36 @@ #---------=> office ## metapackage manjaro-printer -#>extra cups -#>extra cups-pdf -#>extra cups-pk-helper -#>extra ghostscript -#>extra gsfonts -#>extra gutenprint -#>extra hplip -#>extra python-gobject -#>extra python-pyqt5 -#>extra splix -#>extra system-config-printer +>extra cups +>extra cups-pdf +>extra cups-pk-helper +>extra ghostscript +>extra gsfonts +>extra gutenprint +>extra hplip +>extra python-gobject +>extra python-pyqt5 +>extra splix +>extra system-config-printer + +#---------=> build support +>extra autoconf +>extra automake +>extra binutils +>extra bison +>extra flex +>extra gc +>extra gcc +>extra git +>extra guile +>extra libatomic_ops +>extra libmpc +>extra m4 +>extra make +>extra package-query +>extra patch +>extra pkg-config +>extra yajl #---------=> file utilities >extra catfish @@ -56,9 +74,9 @@ >extra poppler-data >extra poppler-glib >extra p7zip ->extra thunar-archive-plugin +>extra thunar-archive-plugin-gtk3 >extra thunar-media-tags-plugin ->extra thunar-volman +>extra thunar-volman-gtk3 >extra tumbler >extra unace >extra unarchiver @@ -75,40 +93,19 @@ >extra thunderbird #---------=> basic utilities ->extra galculator >extra speedcrunch #---------=> package manager ->extra pamac-gtk +pamac-gtk #------------------------------------------------- ##### EDITION BASE PACKAGES -#---------=> build support -autoconf -automake -binutils -bison -flex -gc -gcc -git -guile -libatomic_ops -libmpc -m4 -make -package-query -patch -pkg-config -yajl - #---------=> package manager pamac-cli -pacui #---------=> office -qpdfview +xreader #---------=> manjaro user infomartion manjaro-application-utility @@ -145,7 +142,7 @@ mc ranger #---------=> GUI file manager -thunar +thunar-gtk3 #---------=> disk utilities clonezilla @@ -185,11 +182,11 @@ lightdm-settings lightdm-slick-greeter #---------=> settings manager -lxappearance -lxappearance-obconf +lxappearance-gtk3 +#lxappearance-obconf-gtk3 manjaro-settings-manager -xfce4-settings -xfce4-power-manager +xfce4-settings-gtk3 +xfce4-power-manager-gtk3 #---------=> desktop settings and config manjaro-openbox-config @@ -199,8 +196,12 @@ manjaro-openbox-desktop-settings manjaro-grub-theme-glassfield manjaro-openbox-scripts manjaro-openbox-maia +manjaro-openbox-wallpapers manjaro-slick-greeter-theme-glassfield manjaro-wallpapers-18.0 +#manjaro-wallpapers-by-lunix-cool-logo +#manjaro-wallpapers-by-lunix-manjaro +#manjaro-wallpapers-by-lunix-openbox manjaro-zsh-config matcha-gtk-theme papirus-maia-icon-theme @@ -228,7 +229,7 @@ arandr compton conky dunst -exo +exo-gtk3 fakeroot i3lock imagemagick @@ -252,6 +253,7 @@ synapse termite termite-terminfo tint2 +wireless_tools wmctrl xcape xcb-util-cursor diff --git a/blackbox/blackbox/Packages-Live b/blackbox/blackbox/Packages-Live index aae61d0..1453492 100644 --- a/blackbox/blackbox/Packages-Live +++ b/blackbox/blackbox/Packages-Live @@ -1,5 +1,5 @@ calamares ->manjaro grub-theme-live-manjaro +grub-theme-live-manjaro gsmartcontrol manjaro-architect manjaro-live-skel diff --git a/blackbox/blackbox/Packages-Live-Xorg b/blackbox/blackbox/Packages-Live-Xorg new file mode 100644 index 0000000..90557bf --- /dev/null +++ b/blackbox/blackbox/Packages-Live-Xorg @@ -0,0 +1,29 @@ +calamares +KERNEL-bbswitch +KERNEL-broadcom-wl +KERNEL-r8168 +#KERNEL-rt3562sta +manjaro-live-skel +mkinitcpio-nfs-utils +>multilib lib32-libxvmc +>multilib lib32-primus +nbd +open-vm-tools +primus +>manjaro grub-theme-live-manjaro +squashfs-tools +bumblebee +manjaro-live-systemd +manjaro-architect +xf86-input-vmmouse +xf86-video-amdgpu +xf86-video-ati +xf86-video-dummy +xf86-video-fbdev +xf86-video-intel +xf86-video-nouveau +xf86-video-openchrome +xf86-video-sisusb +xf86-video-vesa +xf86-video-vmware +xf86-video-voodoo diff --git a/blackbox/blackbox/Packages-Mhwd b/blackbox/blackbox/Packages-Mhwd new file mode 100644 index 0000000..1a02aba --- /dev/null +++ b/blackbox/blackbox/Packages-Mhwd @@ -0,0 +1,31 @@ +KERNEL-zfs +zfs-utils +KERNEL-virtualbox-guest-modules +libva-intel-driver +libva-mesa-driver +libva-vdpau-driver +libxaw +libxpm +libxvmc +mesa-vdpau +>nonfree_default KERNEL-nvidia +>nonfree_default KERNEL-nvidia-340xx +>nonfree_default KERNEL-nvidia-390xx +>nonfree_default nvidia-340xx-utils +>nonfree_default nvidia-390xx-utils +>nonfree_default nvidia-utils +opencl-mesa +open-vm-tools +pangox-compat +primus +bumblebee +virtualbox-guest-utils +vulkan-radeon +vulkan-intel +xf86-input-vmmouse +xf86-video-dummy +xf86-video-fbdev +xf86-video-intel +xf86-video-nouveau +xf86-video-vesa +xf86-video-vmware \ No newline at end of file diff --git a/blackbox/blackbox/Packages-Root b/blackbox/blackbox/Packages-Root index b7cc3f2..3fb4596 100644 --- a/blackbox/blackbox/Packages-Root +++ b/blackbox/blackbox/Packages-Root @@ -1,11 +1,9 @@ ->i686 archlinux32-keyring ->manjaro manjaro-release ->multilib gcc-libs-multilib +manjaro-release acpi acpid amd-ucode b43-fwcutter -bash +bash-completion btrfs-progs bzip2 coreutils diff --git a/blackbox/blackbox/Packages-Root-dbus-x11 b/blackbox/blackbox/Packages-Root-dbus-x11 new file mode 100644 index 0000000..09f9c70 --- /dev/null +++ b/blackbox/blackbox/Packages-Root-dbus-x11 @@ -0,0 +1,94 @@ +acpi +amd-ucode +>i686 archlinux32-keyring +b43-fwcutter +bash +btrfs-progs +bzip2 +coreutils +crda +dbus-x11 +dhclient +diffutils +dmraid +dnsmasq +dosfstools +e2fsprogs +ecryptfs-utils +efibootmgr +exfat-utils +f2fs-tools +file +filesystem +findutils +gawk +gcc-libs +>multilib gcc-libs-multilib +gettext +glibc +grep +grub +#grub-quiet # seems we are not ready yet +gzip +inetutils +intel-ucode +iproute2 +iptables +iputils +ipw2100-fw +ipw2200-fw +jfsutils +KERNEL +less +licenses +linux-firmware +logrotate +lsb-release +man-db +manjaro-firmware +>manjaro manjaro-release +manjaro-system +man-pages +memtest86+ +mhwd +mhwd-db +mkinitcpio-openswap +nano +ntfs-3g +os-prober +pacman +pciutils +perl +procps-ng +psmisc +reiserfsprogs +sed +shadow +spectre-meltdown-checker +s-nail +sudo +sysfsutils +acpid +cpupower +cronie +cryptsetup +device-mapper +dhcpcd +haveged +lvm2 +mdadm +nfs-utils +rsync +#systemd-fsck-silent # only needed with grub-quiet +systemd-sysvcompat +tlp +wpa_supplicant +tar +texinfo +usbutils +util-linux +vi +wget +which +xfsprogs +zsh diff --git a/blackbox/blackbox/desktop-overlay/etc/default/useradd b/blackbox/blackbox/desktop-overlay/etc/default/useradd index 5d28cc6..4acba50 100644 --- a/blackbox/blackbox/desktop-overlay/etc/default/useradd +++ b/blackbox/blackbox/desktop-overlay/etc/default/useradd @@ -1,4 +1,4 @@ -# useradd defaults file for Manjaro Openbox Linux +# useradd defaults file for Blackbox Linux # shell changed by fhdk # useradd defaults file for ArchLinux # original changes by TomK diff --git a/blackbox/blackbox/desktop-overlay/etc/lightdm/lightdm.conf b/blackbox/blackbox/desktop-overlay/etc/lightdm/lightdm.conf new file mode 100644 index 0000000..a88302d --- /dev/null +++ b/blackbox/blackbox/desktop-overlay/etc/lightdm/lightdm.conf @@ -0,0 +1,169 @@ +# +# General configuration +# +# start-default-seat = True to always start one seat if none are defined in the configuration +# greeter-user = User to run greeter as +# minimum-display-number = Minimum display number to use for X servers +# minimum-vt = First VT to run displays on +# lock-memory = True to prevent memory from being paged to disk +# user-authority-in-system-dir = True if session authority should be in the system location +# guest-account-script = Script to be run to setup guest account +# logind-check-graphical = True to on start seats that are marked as graphical by logind +# log-directory = Directory to log information to +# run-directory = Directory to put running state in +# cache-directory = Directory to cache to +# sessions-directory = Directory to find sessions +# remote-sessions-directory = Directory to find remote sessions +# greeters-directory = Directory to find greeters +# backup-logs = True to move add a .old suffix to old log files when opening new ones +# dbus-service = True if LightDM provides a D-Bus service to control it +# +[LightDM] +#start-default-seat=true +#greeter-user=lightdm +#minimum-display-number=0 +#minimum-vt=7 # Setting this to a value < 7 implies security issues, see FS#46799 +#lock-memory=true +#user-authority-in-system-dir=false +#guest-account-script=guest-account +#logind-check-graphical=false +#log-directory=/var/log/lightdm +run-directory=/run/lightdm +#cache-directory=/var/cache/lightdm +#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions +#remote-sessions-directory=/usr/share/lightdm/remote-sessions +#greeters-directory=$XDG_DATA_DIRS/lightdm/greeters:$XDG_DATA_DIRS/xgreeters +#backup-logs=true +#dbus-service=true + +# +# Seat configuration +# +# Seat configuration is matched against the seat name glob in the section, for example: +# [Seat:*] matches all seats and is applied first. +# [Seat:seat0] matches the seat named "seat0". +# [Seat:seat-thin-client*] matches all seats that have names that start with "seat-thin-client". +# +# type = Seat type (local, xremote, unity) +# pam-service = PAM service to use for login +# pam-autologin-service = PAM service to use for autologin +# pam-greeter-service = PAM service to use for greeters +# xserver-backend = X backend to use (mir) +# xserver-command = X server command to run (can also contain arguments e.g. X -special-option) +# xmir-command = Xmir server command to run (can also contain arguments e.g. Xmir -special-option) +# xserver-config = Config file to pass to X server +# xserver-layout = Layout to pass to X server +# xserver-allow-tcp = True if TCP/IP connections are allowed to this X server +# xserver-share = True if the X server is shared for both greeter and session +# xserver-hostname = Hostname of X server (only for type=xremote) +# xserver-display-number = Display number of X server (only for type=xremote) +# xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true) +# xdmcp-port = XDMCP UDP/IP port to communicate on +# xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf) +# unity-compositor-command = Unity compositor command to run (can also contain arguments e.g. unity-system-compositor -special-option) +# unity-compositor-timeout = Number of seconds to wait for compositor to start +# greeter-session = Session to load for greeter +# greeter-hide-users = True to hide the user list +# greeter-allow-guest = True if the greeter should show a guest login option +# greeter-show-manual-login = True if the greeter should offer a manual login option +# greeter-show-remote-login = True if the greeter should offer a remote login option +# user-session = Session to load for users +# allow-user-switching = True if allowed to switch users +# allow-guest = True if guest login is allowed +# guest-session = Session to load for guests (overrides user-session) +# session-wrapper = Wrapper script to run session with +# greeter-wrapper = Wrapper script to run greeter with +# guest-wrapper = Wrapper script to run guest sessions with +# display-setup-script = Script to run when starting a greeter session (runs as root) +# display-stopped-script = Script to run after stopping the display server (runs as root) +# greeter-setup-script = Script to run when starting a greeter (runs as root) +# session-setup-script = Script to run when starting a user session (runs as root) +# session-cleanup-script = Script to run when quitting a user session (runs as root) +# autologin-guest = True to log in as guest by default +# autologin-user = User to log in with by default (overrides autologin-guest) +# autologin-user-timeout = Number of seconds to wait before loading default user +# autologin-session = Session to load for automatic login (overrides user-session) +# autologin-in-background = True if autologin session should not be immediately activated +# exit-on-failure = True if the daemon should exit if this seat fails +# +[Seat:*] +#type=local +#pam-service=lightdm +#pam-autologin-service=lightdm-autologin +#pam-greeter-service=lightdm-greeter +#xserver-backend= +#xserver-command=X +#xmir-command=Xmir +#xserver-config= +#xserver-layout= +#xserver-allow-tcp=false +#xserver-share=true +#xserver-hostname= +#xserver-display-number= +#xdmcp-manager= +#xdmcp-port=177 +#xdmcp-key= +#unity-compositor-command=unity-system-compositor +#unity-compositor-timeout=60 +greeter-session=slick-greeter +#greeter-hide-users=false +#greeter-allow-guest=true +#greeter-show-manual-login=false +#greeter-show-remote-login=true +user-session=openbox +#allow-user-switching=true +#allow-guest=true +#guest-session= +session-wrapper=/etc/lightdm/Xsession +#greeter-wrapper= +#guest-wrapper= +#display-setup-script= +#display-stopped-script= +#greeter-setup-script= +#session-setup-script= +#session-cleanup-script= +#autologin-guest=false +autologin-user=fh +#autologin-user-timeout=0 +#autologin-in-background=false +#autologin-session= +#exit-on-failure=false + +# +# XDMCP Server configuration +# +# enabled = True if XDMCP connections should be allowed +# port = UDP/IP port to listen for connections on +# listen-address = Host/address to listen for XDMCP connections (use all addresses if not present) +# key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf) +# hostname = Hostname to report to XDMCP clients (defaults to system hostname if unset) +# +# The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn. Alternatively +# it can be a word and the first 7 characters are used as the key. +# +[XDMCPServer] +#enabled=false +#port=177 +#listen-address= +#key= +#hostname= + +# +# VNC Server configuration +# +# enabled = True if VNC connections should be allowed +# command = Command to run Xvnc server with +# port = TCP/IP port to listen for connections on +# listen-address = Host/address to listen for VNC connections (use all addresses if not present) +# width = Width of display to use +# height = Height of display to use +# depth = Color depth of display to use +# +[VNCServer] +#enabled=false +#command=Xvnc +#port=5900 +#listen-address= +#width=1024 +#height=768 +#depth=8 diff --git a/blackbox/blackbox/desktop-overlay/etc/lightdm/slick-greeter.conf b/blackbox/blackbox/desktop-overlay/etc/lightdm/slick-greeter.conf new file mode 100644 index 0000000..6b1dea8 --- /dev/null +++ b/blackbox/blackbox/desktop-overlay/etc/lightdm/slick-greeter.conf @@ -0,0 +1,9 @@ +[Greeter] +background=/usr/share/backgrounds/manjaro-wallpapers-18.0/glassfieldManjaro_perspective_center_dark.jpg +theme-name=Matcha-sea +icon-theme-name=Papirus-Maia +draw-grid=false +background-color=#525252 +enable-hidpi=auto +font-name=Roboto +only-on-monitor=-1 diff --git a/blackbox/blackbox/live-overlay/etc/default b/blackbox/blackbox/live-overlay/etc/default deleted file mode 120000 index 812b9ff..0000000 --- a/blackbox/blackbox/live-overlay/etc/default +++ /dev/null @@ -1 +0,0 @@ -../../../../shared/manjaro/live-overlay/etc/default \ No newline at end of file diff --git a/blackbox/blackbox/live-overlay/etc/default/grub b/blackbox/blackbox/live-overlay/etc/default/grub new file mode 100644 index 0000000..933c5c6 --- /dev/null +++ b/blackbox/blackbox/live-overlay/etc/default/grub @@ -0,0 +1,49 @@ +GRUB_DEFAULT=saved +GRUB_TIMEOUT=5 +GRUB_DISTRIBUTOR="Manjaro" +GRUB_CMDLINE_LINUX_DEFAULT="" +GRUB_CMDLINE_LINUX="" + +# If you want to enable the save default function, uncomment the following +# line, and set GRUB_DEFAULT to saved. +GRUB_SAVEDEFAULT=true + +# Preload both GPT and MBR modules so that they are not missed +GRUB_PRELOAD_MODULES="part_gpt part_msdos" + +# Uncomment to enable Hidden Menu, and optionally hide the timeout count +#GRUB_HIDDEN_TIMEOUT=5 +#GRUB_HIDDEN_TIMEOUT_QUIET=true + +# Uncomment to use basic console +GRUB_TERMINAL_INPUT=console + +# Uncomment to disable graphical terminal +#GRUB_TERMINAL_OUTPUT=console + +# The resolution used on graphical terminal +# note that you can use only modes which your graphic card supports via VBE +# you can see them in real GRUB with the command `vbeinfo' +GRUB_GFXMODE=auto + +# Uncomment to allow the kernel use the same resolution used by grub +GRUB_GFXPAYLOAD_LINUX=keep + +# Uncomment if you want GRUB to pass to the Linux kernel the old parameter +# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" +#GRUB_DISABLE_LINUX_UUID=true + +# Uncomment to disable generation of recovery mode menu entries +GRUB_DISABLE_RECOVERY=true + +# Uncomment and set to the desired menu colors. Used by normal and wallpaper +# modes only. Entries specified as foreground/background. +GRUB_COLOR_NORMAL="light-gray/black" +GRUB_COLOR_HIGHLIGHT="green/black" + +# Uncomment one of them for the gfx desired, a image background or a gfxtheme +#GRUB_BACKGROUND="/usr/share/grub/background.png" +#GRUB_THEME="/path/to/gfxtheme" + +# Uncomment to get a beep at GRUB start +#GRUB_INIT_TUNE="480 440 1" diff --git a/blackbox/blackbox/live-overlay/etc/default/tlp b/blackbox/blackbox/live-overlay/etc/default/tlp new file mode 100644 index 0000000..c33ece3 --- /dev/null +++ b/blackbox/blackbox/live-overlay/etc/default/tlp @@ -0,0 +1,221 @@ +# ------------------------------------------------------------------------------ +# tlp - Parameters for power save + +# Hint: some features are disabled by default, remove the leading # to enable them + +# Set to 0 to disable/1 to enable TLP +TLP_ENABLE=1 + +# Seconds laptop mode has to to wait after the disk goes idle before doing a sync. +# Non-zero value enables, zero disables laptop mode. +DISK_IDLE_SECS_ON_AC=0 +DISK_IDLE_SECS_ON_BAT=2 + +# Dirty page values (timeouts in secs). +MAX_LOST_WORK_SECS_ON_AC=15 +MAX_LOST_WORK_SECS_ON_BAT=60 + +# Select a cpu frequency scaling governor: ondemand/powersave/performance/conservative +# Important: +# - You *must* disable your distribution's governor settings or conflicts will occur +# - ondemand is sufficient for *almost all* workloads, you should know what you're doing! +#CPU_SCALING_GOVERNOR_ON_AC=ondemand +#CPU_SCALING_GOVERNOR_ON_BAT=ondemand + +# Set the min/max frequency available for the scaling governor. +# Possible values strongly depend on your cpu. For available frequencies see +# tlp-stat output, Section "+++ Processor". +# Hint: Parameters are disabled by default, remove the leading # to enable them, +# otherwise kernel default values are used. +#CPU_SCALING_MIN_FREQ_ON_AC=0 +#CPU_SCALING_MAX_FREQ_ON_AC=0 +#CPU_SCALING_MIN_FREQ_ON_BAT=0 +#CPU_SCALING_MAX_FREQ_ON_BAT=0 + +# Set the cpu "turbo boost" feature: 0=disable / 1=allow +# Requires an Intel Core i processor and kernel 3.7 or later. +# Important: +# - This may conflict with your distribution's governor settings +# - A value of 1 does *not* activate boosting, it just allows it +#CPU_BOOST_ON_AC=1 +#CPU_BOOST_ON_BAT=0 + +# Minimize number of used cpu cores/hyper-threads under light load conditions +SCHED_POWERSAVE_ON_AC=0 +SCHED_POWERSAVE_ON_BAT=1 + +# Kernel NMI Watchdog +# 0=disable (default, saves power) / 1=enable (for kernel debugging only) +NMI_WATCHDOG=0 + +# Change CPU voltages aka "undervolting" - Kernel with PHC patch required +# Freq:voltage pairs are written to /sys/devices/system/cpu/cpu0/cpufreq/phc_controls +# CAUTION: only use this, if you thoroughly understand what you are doing! +#PHC_CONTROLS="F:V F:V F:V F:V" + +# Hard disk devices, separate multiple devices with spaces (default: sda). +# Devices can be specified by disk id too (lookup with: tlp diskid). +DISK_DEVICES="sda sdb" + +# Hard disk advanced power management level: 1(max saving)..254(off) +# Levels 1..127 may spin down the disk. +# Separate values for multiple devices with spaces. +DISK_APM_LEVEL_ON_AC="254 254" +DISK_APM_LEVEL_ON_BAT="254 254" + +# Hard disk spin down timeout: +# 0: spin down disabled +# 1..240: timeouts from 5s to 20min (in units of 5s) +# 241..251: timeouts from 30min to 5.5 hours (in units of 30min) +# (see 'man hdparm' for details) +#DISK_SPINDOWN_TIMEOUT_ON_AC="0 0" +#DISK_SPINDOWN_TIMEOUT_ON_BAT="0 0" + +# Select io scheduler for the disk devices: noop/deadline/cfq (Default: cfq) +# Separate values for multiple devices with spaces. +#DISK_IOSCHED="cfq cfq" + +# SATA aggressive link power management (ALPM): +# min_power/medium_power/max_performance +SATA_LINKPWR_ON_AC=max_performance +SATA_LINKPWR_ON_BAT=min_power + +# PCI Express Active State Power Management (PCIe ASPM): +# default/performance/powersave +# Hint: needs kernel boot option pcie_aspm=force on some machines +PCIE_ASPM_ON_AC=performance +PCIE_ASPM_ON_BAT=powersave + +# Radeon graphics clock speed (profile method): low/mid/high/auto/default +# auto = mid on BAT, high on AC; default = use hardware defaults +# (Kernel >= 2.6.35 only, not with fglrx driver!) +RADEON_POWER_PROFILE_ON_AC=high +RADEON_POWER_PROFILE_ON_BAT=low + +# New radeon dynamic power management method (dpm): battery/performance +# (Kernel >= 3.11 only, requires boot option radeon.dpm=1) +RADEON_DPM_STATE_ON_AC=performance +RADEON_DPM_STATE_ON_BAT=battery + +# New radeon dpm performance level: auto/low/high (auto is recommended) +RADEON_DPM_PERF_LEVEL_ON_AC=auto +RADEON_DPM_PERF_LEVEL_ON_BAT=auto + +# WiFi power saving mode: 1=disable/5=enable +# (Linux 2.6.32 and later, some adapters only!) +WIFI_PWR_ON_AC=1 +WIFI_PWR_ON_BAT=5 + +# Disable wake on lan: Y/N +WOL_DISABLE=Y + +# Enable audio power saving for Intel HDA, AC97 devices (timeout in secs). +# A value of 0 disables / >=1 enables power save. +SOUND_POWER_SAVE_ON_AC=0 +SOUND_POWER_SAVE_ON_BAT=1 + +# Disable controller too (HDA only): Y/N +SOUND_POWER_SAVE_CONTROLLER=Y + +# Set to 1 to power off optical drive in UltraBay (ThinkPads only) +# when running on battery. A value of 0 disables this Feature (Default). +# Drive can be powered on again by releasing (and reinserting) the +# eject lever or by pressing the disc eject button on newer models. +# Note: an UltraBay hard disk is never powered off. +BAY_POWEROFF_ON_BAT=0 +# Optical drive device to power off (default sr0) +BAY_DEVICE="sr0" + +# Runtime Power Management for pci(e) bus devices +# (Kernel >= 2.6.35 only): on=disable/auto=enable +RUNTIME_PM_ON_AC=on +RUNTIME_PM_ON_BAT=auto + +# Runtime PM for *all* pci(e) bus devices, expect backlisted ones: +# 0=disable / 1=enable +# Warning: experimental option, could cause system instabilities +RUNTIME_PM_ALL=0 + +# Exclude pci(e) device adresses the following list from Runtime PM +# (separate with spaces). Use lspci to get the adresses (1st column). +#RUNTIME_PM_BLACKLIST="bb:dd.f 11:22.3 44:55.6" + +# Set to 0 to disable/1 to enable usb autosuspend feature +USB_AUTOSUSPEND=1 + +# Devices from the following list are excluded from usb autosuspend +# (separate with spaces). Use lsusb to get the ids. +# Note: input devices (usbhid) are excluded automatically +#USB_BLACKLIST="1111:2222 3333:4444" + +# WWAN devices are excluded from usb autosuspend: +# 0=do not exclude / 1=exclude +# Note: works for ids 05c6:* 0bdb:* 1199:* only +USB_BLACKLIST_WWAN=1 + +# Set to 1 to disable autosuspend before shutdown/0 to do nothing +# (workaround for usb devices that cause shutdown problems) +#USB_AUTOSUSPEND_DISABLE_ON_SHUTDOWN=1 + +# Restore radio device state (bluetooth, wifi, wwan) from previous shutdown +# on system startup: 0=disable/1=enable +# Hint: the parameters DEVICES_TO_DISABLE/ENABLE_ON_STARTUP/SHUTDOWN below +# are ignored when this is enabled! +RESTORE_DEVICE_STATE_ON_STARTUP=0 + +# Radio devices to disable on startup: bluetooth wifi wwan +#DEVICES_TO_DISABLE_ON_STARTUP="bluetooth wifi wwan" + +# Radio devices to enable on startup: bluetooth wifi wwan +#DEVICES_TO_ENABLE_ON_STARTUP="wifi" + +# Radio devices to disable on shutdown: bluetooth wifi wwan +# (workaround for devices that are blocking shutdown) +#DEVICES_TO_DISABLE_ON_SHUTDOWN="bluetooth wifi wwan" + +# Radio devices to enable on shutdown: bluetooth wifi wwan +# (to prevent other operating systems from missing radios) +#DEVICES_TO_ENABLE_ON_SHUTDOWN="wwan" + +# Radio devices to enable when wireless radio switch is turned on: +# bluetooth wifi wwan (Ubuntu + ThinkPad only) +#DEVICES_TO_ENABLE_ON_RADIOSW="wifi wwan" + +# Battery charge thresholds (ThinkPad only, tp-smapi or acpi-call kernel module required) +# Charging starts when the remaining capacity falls below the START_CHARGE_TRESH +# value and stops when exceeding the STOP_CHARGE_TRESH value. +# Main battery (values in %) +#START_CHARGE_THRESH_BAT0=75 +#STOP_CHARGE_THRESH_BAT0=80 +# Ultrabay or slice battery (values in %) +#START_CHARGE_THRESH_BAT1=75 +#STOP_CHARGE_THRESH_BAT1=80 + +# Set to 1 to disable use of tpacpi-bat on Sandy Bridge or newer Thinkpads +# and force usage of tp-smapi instead +#DISABLE_TPACPIBAT=1 + +# ------------------------------------------------------------------------------ +# tlp-rdw - Parameters for the radio device wizard +# Possible devices: bluetooth/wifi/wwan + +# Hint: parameters are disabled by default, remove the leading # to enable them + +# Radio devices to disable on connect +#DEVICES_TO_DISABLE_ON_LAN_CONNECT="wifi wwan" +#DEVICES_TO_DISABLE_ON_WIFI_CONNECT="wwan" +#DEVICES_TO_DISABLE_ON_WWAN_CONNECT="wifi" + +# Radio devices to enable on disconnect +#DEVICES_TO_ENABLE_ON_LAN_DISCONNECT="wifi wwan" +#DEVICES_TO_ENABLE_ON_WIFI_DISCONNECT="" +#DEVICES_TO_ENABLE_ON_WWAN_DISCONNECT="" + +# Radio devices to enable/disable when docked +#DEVICES_TO_ENABLE_ON_DOCK="" +#DEVICES_TO_DISABLE_ON_DOCK="" + +# Radio devices to enable/disable when undocked +#DEVICES_TO_ENABLE_ON_UNDOCK="wifi" +#DEVICES_TO_DISABLE_ON_UNDOCK="" + diff --git a/blackbox/blackbox/live-overlay/etc/fstab b/blackbox/blackbox/live-overlay/etc/fstab deleted file mode 120000 index 8750aca..0000000 --- a/blackbox/blackbox/live-overlay/etc/fstab +++ /dev/null @@ -1 +0,0 @@ -../../../../shared/manjaro/live-overlay/etc/fstab \ No newline at end of file diff --git a/blackbox/blackbox/live-overlay/etc/fstab b/blackbox/blackbox/live-overlay/etc/fstab new file mode 100644 index 0000000..0df0cba --- /dev/null +++ b/blackbox/blackbox/live-overlay/etc/fstab @@ -0,0 +1,5 @@ +# +# /etc/fstab: static file system information +# +# +/dev/mapper/root-image / auto defaults 0 0 diff --git a/blackbox/blackbox/live-overlay/etc/issue b/blackbox/blackbox/live-overlay/etc/issue deleted file mode 120000 index c519805..0000000 --- a/blackbox/blackbox/live-overlay/etc/issue +++ /dev/null @@ -1 +0,0 @@ -../../../../shared/manjaro/live-overlay/etc/issue \ No newline at end of file diff --git a/blackbox/blackbox/live-overlay/etc/issue b/blackbox/blackbox/live-overlay/etc/issue new file mode 100644 index 0000000..1916906 --- /dev/null +++ b/blackbox/blackbox/live-overlay/etc/issue @@ -0,0 +1,13 @@ + +Blackbox Live ISO (\l) - \s-\r \m + + + + # Welcome to Blackbox # + + + login for the live environment: + user 'blackbox' + password 'blackbox' + + diff --git a/blackbox/blackbox/live-overlay/etc/pam.d b/blackbox/blackbox/live-overlay/etc/pam.d deleted file mode 120000 index 68de596..0000000 --- a/blackbox/blackbox/live-overlay/etc/pam.d +++ /dev/null @@ -1 +0,0 @@ -../../../../shared/manjaro/live-overlay/etc/pam.d \ No newline at end of file diff --git a/blackbox/blackbox/live-overlay/etc/pam.d/su b/blackbox/blackbox/live-overlay/etc/pam.d/su new file mode 100644 index 0000000..a291042 --- /dev/null +++ b/blackbox/blackbox/live-overlay/etc/pam.d/su @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +auth sufficient pam_wheel.so trust use_uid +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/blackbox/blackbox/live-overlay/etc/sudoers.d b/blackbox/blackbox/live-overlay/etc/sudoers.d deleted file mode 120000 index c784c2a..0000000 --- a/blackbox/blackbox/live-overlay/etc/sudoers.d +++ /dev/null @@ -1 +0,0 @@ -../../../../shared/manjaro/live-overlay/etc/sudoers.d \ No newline at end of file diff --git a/blackbox/blackbox/live-overlay/etc/sudoers.d/g_wheel b/blackbox/blackbox/live-overlay/etc/sudoers.d/g_wheel new file mode 100644 index 0000000..8c45359 --- /dev/null +++ b/blackbox/blackbox/live-overlay/etc/sudoers.d/g_wheel @@ -0,0 +1 @@ +%wheel ALL=(ALL) NOPASSWD: ALL diff --git a/blackbox/blackbox/live-overlay/usr b/blackbox/blackbox/live-overlay/usr deleted file mode 120000 index b56c83d..0000000 --- a/blackbox/blackbox/live-overlay/usr +++ /dev/null @@ -1 +0,0 @@ -../../../shared/manjaro/live-overlay/usr \ No newline at end of file diff --git a/blackbox/blackbox/live-overlay/usr/share/calamares/branding/manjaro/branding.desc b/blackbox/blackbox/live-overlay/usr/share/calamares/branding/manjaro/branding.desc new file mode 100644 index 0000000..e7e4dd8 --- /dev/null +++ b/blackbox/blackbox/live-overlay/usr/share/calamares/branding/manjaro/branding.desc @@ -0,0 +1,23 @@ +--- +componentName: manjaro + +strings: + productName: Blackbox Linux + shortProductName: Blackbox + version: 19.07.23 + shortVersion: 19.07.23 + versionedName: Blackbox Linux 19.07.23 + shortVersionedName: Blackbox 19.07.23 + bootloaderEntryName: Manjaro + +images: + productLogo: "logo.png" + productIcon: "logo.png" + productWelcome: "languages.png" + +slideshow: "show.qml" + +style: + sidebarBackground: "#454948" + sidebarText: "#efefef" + sidebarTextSelect: "#9E4F5D" diff --git a/blackbox/blackbox/profile.conf b/blackbox/blackbox/profile.conf index 6b3f287..2aa1d1a 100644 --- a/blackbox/blackbox/profile.conf +++ b/blackbox/blackbox/profile.conf @@ -22,6 +22,12 @@ nonfree_mhwd="false" # unset defaults to given value efi_boot_loader="grub" +# configure calamares for mhwd +mhwd_used="true" + +# configure calamares for oem +oem_used="false" + # configure calamares for netinstall #netinstall="false" @@ -36,10 +42,10 @@ geoip="true" # unset defaults to given values # names must match systemd service names -enable_systemd=('avahi-daemon' 'NetworkManager' 'systemd-timesyncd') +enable_systemd=('avahi-daemon' 'bluetooth' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'systemd-timesyncd' 'tlp' 'tlp-sleep' 'ufw') disable_systemd=('pacman-init') -# the same workgroup name if samba is used +# the workgroup name if samba is used # smb_workgroup="" # default system shell is bash @@ -54,10 +60,10 @@ user_shell="/bin/zsh" hostname="blackbox" # unset defaults to given value -# username="manjaro" +username="blackbox" # unset defaults to given value -# password="manjaro" +password="blackbox" # the login shell # defaults to bash