[lxqt-kwin] rework using mhwd

community/lxqt-kwin/Packages-Desktop

@@ -123,13 +123,8 @@ xorg-xprop
 xsettingsd
 xsettings-client
 xscreensaver
+xterm
 
 ## Xorg drivers
 xf86-input-evdev
 xf86-input-libinput
-xf86-input-vmmouse
-xf86-video-amdgpu
-xf86-video-dummy
-xf86-video-fbdev
-xf86-video-nouveau
-xf86-video-vesa

community/lxqt-kwin/Packages-Mhwd

@@ -0,0 +1 @@
+../../shared/Packages-Mhwd

community/lxqt-kwin/Packages-Root

@@ -1,92 +0,0 @@
-# Base
-bash
-bzip2
-coreutils
-file
-filesystem
-findutils
-gawk
-gcc-libs
-gettext
-glibc
-grep
-gzip
-iproute2
-iputils
-licenses
-pacman
-pciutils
-procps-ng
-psmisc
-sed
-shadow
-systemd
-systemd-sysvcompat
-tar
-util-linux
-xz
-
-# Manjaro
-acpi
-acpid
-amd-ucode
-b43-fwcutter
-btrfs-progs
-bzip2
-coreutils
-cpupower
-crda
-cronie
-cryptsetup
-device-mapper
-dhclient
-dhcpcd
-diffutils
-dmraid
-dnsmasq
-dosfstools
-e2fsprogs
-ecryptfs-utils
-efibootmgr
-exfat-utils
-f2fs-tools
-glibc-locales
-grub
-haveged
-inetutils
-intel-ucode
-jfsutils
-KERNEL
-less
-logrotate
-lvm2
-man-db
-manjaro-firmware
-manjaro-release
-manjaro-system
-man-pages
-mdadm
-memtest86+
-mhwd
-mhwd-db
-mkinitcpio-openswap
-nano
-nfs-utils
-ntfs-3g
-os-prober
-perl
-reiserfsprogs
-rsync
-s-nail
-sudo
-sysfsutils
-systemd
-systemd-fsck-silent
-texinfo
-tlp
-usbutils
-vi
-wget
-which
-wpa_supplicant
-xfsprogs

community/lxqt-kwin/Packages-Root

@@ -0,0 +1 @@
+../../shared/Packages-Root

community/lxqt-kwin/desktop-overlay/etc/skel/.Xresources

@@ -0,0 +1,91 @@
+! ------------------------------------------------------------------------------
+! theme colors
+! ------------------------------------------------------------------------------
+Xcursor.size: 24
+
+! ------------------------------------------------------------------------------
+! theme colors
+! ------------------------------------------------------------------------------
+! special
+*.foreground: #c0c5ce
+*.background: #2b303b
+*.cursorColor: #c0c5ce
+
+*.color0: #2b303b
+*.color1: #bf616a
+*.color2: #a3be8c
+*.color3: #ebcb8b
+*.color4: #8fa1b3
+*.color5: #b48ead
+*.color6: #96b5b4
+*.color7: #65737e
+
+*.color8: #65737e
+*.color9: #bf616a
+*.color10: #a3be8c
+*.color11: #ebcb8b
+*.color12: #8fa1b3
+*.color13: #b48ead
+*.color14: #96b5b4
+*.color15: #F6F6F6
+
+! ------------------------------------------------------------------------------
+! xterm
+! ------------------------------------------------------------------------------
+xterm*font: DejaVu Sans Mono Book
+xterm*faceName: DejaVu Sans Mono Book:size=12:antialias=false
+xterm*loginShell: true
+xterm*vt100*geometry: 90x34
+xterm*saveLines: 2000
+xterm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48
+xterm*termName: xterm-256color
+xterm*eightBitInput: false
+
+! ------------------------------------------------------------------------------
+! URxvt
+! -----------------------------------------------------------------------------
+URxvt*saveline: 15000
+URxvt*termName: rxvt-256color
+URxvt*iso14755: false
+URxvt*depth: 32
+URxvt*background: [90]#2b303b
+URxvt*scrollBar: false
+URxvt*scrollBar_right: false
+URxvt*internalBorder: 0
+URxvt*externalBorder: 0
+URxvt*letterSpace: -1
+URxvt.font: xft:DejaVu Sans Mono Book:size=11
+URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select
+URxvt.copyCommand: xclip -i -selection clipboard
+URxvt.pasteCommand: xclip -o -selection clipboard
+URxvt.keysym.m-c: perl:clipboard:copy
+URxvt.keysym.m-v: perl:clipboard:paste
+URxvt.urlLauncher: exo-open
+URxvt.underlineURLs: true
+URxvt.urlButton: 1
+URxvt.geometry: 90x30
+URxvt.tabbed.tabbar-fg: 4
+URxvt.tabbed.tabbar-bg: 16
+URxvt.tabbed.tab-fg: 15
+URxvt.tabbed.tab-bg: 4
+URxvt*buffered: false
+
+! ------------------------------------------------------------------------------
+! UXTerm
+! ------------------------------------------------------------------------------
+UXTerm*termName: xterm-256color
+UXTerm*cursorColor: white
+UXTerm*VT100.geometry: 90x30
+UXTerm*font: DejaVu Sans Mono Book
+UXTerm*faceSize: 12
+UXTerm*dynamicColors: true
+UXTerm*utf8: 2
+UXTerm*eightBitInput: true
+UXTerm*saveLines: 10000
+UXTerm*scrollKey: true
+UXTerm*scrollTtyOutput: false
+UXTerm*scrollBar: false
+UXTerm*rightScrollBar: false
+UXTerm*jumpScroll: true
+UXTerm*multiScroll: true
+UXTerm*toolBar: false

community/lxqt-kwin/desktop-overlay/etc/skel/.bash_logout

@@ -0,0 +1,3 @@
+#
+# ~/.bash_logout
+#

community/lxqt-kwin/desktop-overlay/etc/skel/.bash_profile

@@ -0,0 +1,5 @@
+#
+# ~/.bash_profile
+#
+
+[[ -f ~/.bashrc ]] && . ~/.bashrc

community/lxqt-kwin/desktop-overlay/etc/skel/.bashrc

@@ -0,0 +1,137 @@
+#
+# ~/.bashrc
+#
+
+[[ $- != *i* ]] && return
+
+colors() {
+	local fgc bgc vals seq0
+
+	printf "Color escapes are %s\n" '\e[${value};...;${value}m'
+	printf "Values 30..37 are \e[33mforeground colors\e[m\n"
+	printf "Values 40..47 are \e[43mbackground colors\e[m\n"
+	printf "Value  1 gives a  \e[1mbold-faced look\e[m\n\n"
+
+	# foreground colors
+	for fgc in {30..37}; do
+		# background colors
+		for bgc in {40..47}; do
+			fgc=${fgc#37} # white
+			bgc=${bgc#40} # black
+
+			vals="${fgc:+$fgc;}${bgc}"
+			vals=${vals%%;}
+
+			seq0="${vals:+\e[${vals}m}"
+			printf "  %-9s" "${seq0:-(default)}"
+			printf " ${seq0}TEXT\e[m"
+			printf " \e[${vals:+${vals+$vals;}}1mBOLD\e[m"
+		done
+		echo; echo
+	done
+}
+
+[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
+
+# Change the window title of X terminals
+case ${TERM} in
+	xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*)
+		PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\007"'
+		;;
+	screen*)
+		PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\033\\"'
+		;;
+esac
+
+use_color=true
+
+# Set colorful PS1 only on colorful terminals.
+# dircolors --print-database uses its own built-in database
+# instead of using /etc/DIR_COLORS.  Try to use the external file
+# first to take advantage of user additions.  Use internal bash
+# globbing instead of external grep binary.
+safe_term=${TERM//[^[:alnum:]]/?}   # sanitize TERM
+match_lhs=""
+[[ -f ~/.dir_colors   ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
+[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
+[[ -z ${match_lhs}    ]] \
+	&& type -P dircolors >/dev/null \
+	&& match_lhs=$(dircolors --print-database)
+[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
+
+if ${use_color} ; then
+	# Enable colors for ls, etc.  Prefer ~/.dir_colors #64489
+	if type -P dircolors >/dev/null ; then
+		if [[ -f ~/.dir_colors ]] ; then
+			eval $(dircolors -b ~/.dir_colors)
+		elif [[ -f /etc/DIR_COLORS ]] ; then
+			eval $(dircolors -b /etc/DIR_COLORS)
+		fi
+	fi
+
+	if [[ ${EUID} == 0 ]] ; then
+		PS1='\[\033[01;31m\][\h\[\033[01;36m\] \W\[\033[01;31m\]]\$\[\033[00m\] '
+	else
+		PS1='\[\033[01;32m\][\u@\h\[\033[01;37m\] \W\[\033[01;32m\]]\$\[\033[00m\] '
+	fi
+
+	alias ls='ls --color=auto'
+	alias grep='grep --colour=auto'
+	alias egrep='egrep --colour=auto'
+	alias fgrep='fgrep --colour=auto'
+else
+	if [[ ${EUID} == 0 ]] ; then
+		# show root@ when we don't have colors
+		PS1='\u@\h \W \$ '
+	else
+		PS1='\u@\h \w \$ '
+	fi
+fi
+
+unset use_color safe_term match_lhs sh
+
+#alias cp="cp -i"                          # confirm before overwriting something
+#alias df='df -h'                          # human-readable sizes
+#alias free='free -m'                      # show sizes in MB
+#alias np='nano -w PKGBUILD'
+#alias more=less
+
+xhost +local:root > /dev/null 2>&1
+
+# Bash won't get SIGWINCH if another process is in the foreground.
+# Enable checkwinsize so that bash will check the terminal size when
+# it regains control.  #65623
+# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11)
+shopt -s checkwinsize
+
+shopt -s expand_aliases
+
+# export QT_SELECT=4
+
+# Enable history appending instead of overwriting.  #139609
+shopt -s histappend
+
+#
+# # ex - archive extractor
+# # usage: ex <file>
+ex ()
+{
+  if [ -f $1 ] ; then
+    case $1 in
+      *.tar.bz2)   tar xjf $1   ;;
+      *.tar.gz)    tar xzf $1   ;;
+      *.bz2)       bunzip2 $1   ;;
+      *.rar)       unrar x $1     ;;
+      *.gz)        gunzip $1    ;;
+      *.tar)       tar xf $1    ;;
+      *.tbz2)      tar xjf $1   ;;
+      *.tgz)       tar xzf $1   ;;
+      *.zip)       unzip $1     ;;
+      *.Z)         uncompress $1;;
+      *.7z)        7z x $1      ;;
+      *)           echo "'$1' cannot be extracted via ex()" ;;
+    esac
+  else
+    echo "'$1' is not a valid file"
+  fi
+}

community/lxqt-kwin/desktop-overlay/etc/skel/.config/konsolerc

@@ -2,13 +2,6 @@
 DefaultProfile=qt-bash.profile
 
 [MainWindow]
-DP-1 Height 5120x1440=581
-DP-1 Width 5120x1440=981
-DP-1 XPosition 5120x1440=2083
-DP-1 YPosition 5120x1440=324
-RestorePositionForNextInstance=false
-State=AAAA/wAAAAD9AAAAAQAAAAAAAAAAAAAAAPwCAAAAAfsAAAAcAFMAUwBIAE0AYQBuAGEAZwBlAHIARABvAGMAawAAAAAA/////wAAAMoA////AAAD1QAAAhcAAAAEAAAABAAAAAgAAAAI/AAAAAEAAAACAAAAAgAAABYAbQBhAGkAbgBUAG8AbwBsAEIAYQByAQAAAAD/////AAAAAAAAAAAAAAAcAHMAZQBzAHMAaQBvAG4AVABvAG8AbABiAGEAcgEAAAAG/////wAAAAAAAAAA
-ToolBarsMovable=Disabled
 
 [UiSettings]
 ColorScheme=Default

community/lxqt-kwin/desktop-overlay/etc/skel/.nanorc

@@ -0,0 +1,2 @@
+include /usr/share/nano/*.nanorc
+include ~/.config/nano/*.nanorc

community/lxqt-kwin/desktop-overlay/etc/skel/.xinitrc

@@ -0,0 +1,76 @@
+#!/bin/sh
+#
+# ~/.xinitrc
+#
+# Executed by startx (run your window manager from here)
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+if [ -f "$usermodmap" ]; then
+    xmodmap "$usermodmap"
+fi
+
+# start some nice programs
+
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+    for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+        [ -x "$f" ] && . "$f"
+    done
+    unset f
+fi
+
+if [ -f ~/.xprofile ]; then
+    . ~/.xprofile
+fi
+
+# Keyring daemon
+/usr/bin/gnome-keyring-daemon --start --components=pkcs11 &
+
+kbdrate -d 400 -r 50
+xset r rate 400 50
+xset s 3600 3600
+
+get_session(){
+    local dbus_args=(--sh-syntax --exit-with-session)
+    case $1 in
+        awesome) dbus_args+=(awesome) ;;
+        bspwm) dbus_args+=(bspwm-session) ;;
+        budgie) dbus_args+=(budgie-desktop) ;;
+        cinnamon) dbus_args+=(cinnamon-session) ;;
+        deepin) dbus_args+=(startdde) ;;
+        enlightenment) dbus_args+=(enlightenment_start) ;;
+        fluxbox) dbus_args+=(startfluxbox) ;;
+        gnome) dbus_args+=(gnome-session) ;;
+        i3|i3wm) dbus_args+=(i3 --shmlog-size 0) ;;
+        jwm) dbus_args+=(jwm) ;;
+        kde) dbus_args+=(startkde) ;;
+        lxde) dbus_args+=(startlxde) ;;
+        lxqt) dbus_args+=(lxqt-session) ;;
+        mate) dbus_args+=(mate-session) ;;
+        xfce) dbus_args+=(xfce4-session) ;;
+        openbox) dbus_args+=(openbox-session) ;;
+        compiz) dbus_args+=(compix-session) ;;
+        *) dbus_args+=($DEFAULT_SESSION) ;;
+    esac
+
+    echo "dbus-launch ${dbus_args[*]}"
+}
+
+exec $(get_session)

community/lxqt-kwin/profile.conf

@@ -14,7 +14,7 @@ autologin="true"
 # nonfree mhwd drivers
 nonfree_mhwd="false"
 
-mhwd_used="false"
+mhwd_used="true"
 
 # use extra packages as defined in pkglist to activate a full profile
 extra="true"