From 295129825f56815c5f05df5cc588dfe712dbf3b3 Mon Sep 17 00:00:00 2001 From: Vitor Lopes Date: Wed, 24 Mar 2021 20:15:10 +0000 Subject: [PATCH] update --- community/webdad/Packages-Desktop | 2 +- .../etc/lightdm/lightdm-gtk-greeter.conf | 2 +- .../desktop-overlay/etc/lightdm/lightdm.conf | 2 +- .../desktop-overlay/etc/pulse/default.pa | 148 ------------------ .../share/plank/themes/webdad-default/COPYING | 21 +++ .../plank/themes/webdad-default/README.MD | 28 ++++ .../plank/themes/webdad-default/dock.theme | 71 +++++++++ .../live-overlay/etc/lightdm/lightdm.conf | 2 +- .../skel/.config/{jade => jde}/desktop.conf | 0 .../.config/{jade => jde}/theme/style.css | 0 .../.config/plank/dock1/architect.dockitem | 2 - .../.config/plank/dock1/calamares.dockitem | 2 - .../plank/dock1/launchers/architect.dockitem | 2 - .../usr/share/applications/architect.desktop | 13 -- community/webdad/profile.conf | 6 +- 15 files changed, 127 insertions(+), 174 deletions(-) delete mode 100644 community/webdad/desktop-overlay/etc/pulse/default.pa create mode 100644 community/webdad/desktop-overlay/etc/skel/.local/share/plank/themes/webdad-default/COPYING create mode 100644 community/webdad/desktop-overlay/etc/skel/.local/share/plank/themes/webdad-default/README.MD create mode 100644 community/webdad/desktop-overlay/etc/skel/.local/share/plank/themes/webdad-default/dock.theme rename community/webdad/live-overlay/etc/skel/.config/{jade => jde}/desktop.conf (100%) rename community/webdad/live-overlay/etc/skel/.config/{jade => jde}/theme/style.css (100%) delete mode 100644 community/webdad/live-overlay/etc/skel/.config/plank/dock1/architect.dockitem delete mode 100644 community/webdad/live-overlay/etc/skel/.config/plank/dock1/calamares.dockitem delete mode 100644 community/webdad/live-overlay/etc/skel/.config/plank/dock1/launchers/architect.dockitem delete mode 100644 community/webdad/live-overlay/usr/share/applications/architect.desktop diff --git a/community/webdad/Packages-Desktop b/community/webdad/Packages-Desktop index 1caeda92..aa24ccc5 100644 --- a/community/webdad/Packages-Desktop +++ b/community/webdad/Packages-Desktop @@ -71,7 +71,7 @@ openresolv ## Base manjaro-settings-manager-notifier -manjaro-jade-settings +manjaro-webdad-settings gnome-keyring manjaro-hotfixes manjaro-hello diff --git a/community/webdad/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf b/community/webdad/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf index 9cd453ec..7c392c89 100644 --- a/community/webdad/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf +++ b/community/webdad/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf @@ -2,7 +2,7 @@ theme-name = Matcha-sea icon-theme-name = Papirus-Dark-Maia font-name = Roboto Medium 10 -background = /usr/share/jadesktop/themes/default/backgrounds/background.jpg +background = /usr/share/backgrounds/jde-background.jpg hide-user-image = true indicators = ~spacer;~clock;~separator;~separator;~separator;~separator;~separator;~separator;~separator;~separator;~separator;~separator;~separator;~power;~spacer diff --git a/community/webdad/desktop-overlay/etc/lightdm/lightdm.conf b/community/webdad/desktop-overlay/etc/lightdm/lightdm.conf index 524a6c17..a195cece 100644 --- a/community/webdad/desktop-overlay/etc/lightdm/lightdm.conf +++ b/community/webdad/desktop-overlay/etc/lightdm/lightdm.conf @@ -107,7 +107,7 @@ greeter-session=lightdm-gtk-greeter #greeter-allow-guest=true #greeter-show-manual-login=false #greeter-show-remote-login=true -user-session=jade +user-session=jde #allow-user-switching=true #allow-guest=true #guest-session= diff --git a/community/webdad/desktop-overlay/etc/pulse/default.pa b/community/webdad/desktop-overlay/etc/pulse/default.pa deleted file mode 100644 index b2547d65..00000000 --- a/community/webdad/desktop-overlay/etc/pulse/default.pa +++ /dev/null @@ -1,148 +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 per-user -# (i.e. not 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-oss device="/dev/dsp" sink_name=output source_name=input -#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input -#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 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 -.ifexists module-bluetooth-policy.so -load-module module-bluetooth-policy -.endif - -.ifexists module-bluetooth-discover.so -load-module module-bluetooth-discover -.endif - -### Load several protocols -load-module module-dbus-protocol -.ifexists module-esound-protocol-unix.so -load-module module-esound-protocol-unix -.endif -load-module module-native-protocol-unix - -### Network access (may be configured with paprefs, so leave this commented -### here if you plan to use paprefs) -#load-module module-esound-protocol-tcp -#load-module module-native-protocol-tcp -#load-module module-zeroconf-publish - -### Load the RTP receiver module (also configured via paprefs, see above) -#load-module module-rtp-recv - -### Load the RTP sender module (also configured via paprefs, see above) -#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'" -#load-module module-rtp-send source=rtp.monitor - -### Load additional modules from GSettings. This can be configured with the paprefs tool. -### Please keep in mind that the modules configured by paprefs might conflict with manually -### loaded modules. -.ifexists module-gsettings.so -.nofail -load-module module-gsettings -.fail -.endif - - -### 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 - -### If autoexit on idle is enabled we want to make sure we only quit -### when no local session needs us anymore. -.ifexists module-console-kit.so -load-module module-console-kit -.endif -.ifexists module-systemd-login.so -load-module module-systemd-login -.endif - -### 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 - -### Enable Echo/Noise-Cancellation -load-module module-echo-cancel use_master_format=1 aec_method=webrtc aec_args="analog_gain_control=0\ digital_gain_control=1" source_name=echoCancel_source sink_name=echoCancel_sink -set-default-source echoCancel_source -set-default-sink echoCancel_sink - diff --git a/community/webdad/desktop-overlay/etc/skel/.local/share/plank/themes/webdad-default/COPYING b/community/webdad/desktop-overlay/etc/skel/.local/share/plank/themes/webdad-default/COPYING new file mode 100644 index 00000000..70cfa530 --- /dev/null +++ b/community/webdad/desktop-overlay/etc/skel/.local/share/plank/themes/webdad-default/COPYING @@ -0,0 +1,21 @@ +MIT LICENSE + +Copyright (c) 2019-2020 Alfredo F. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/community/webdad/desktop-overlay/etc/skel/.local/share/plank/themes/webdad-default/README.MD b/community/webdad/desktop-overlay/etc/skel/.local/share/plank/themes/webdad-default/README.MD new file mode 100644 index 00000000..98b74479 --- /dev/null +++ b/community/webdad/desktop-overlay/etc/skel/.local/share/plank/themes/webdad-default/README.MD @@ -0,0 +1,28 @@ +##Introduction + +The Cupertino Effect in Black is based on the Cupertino series, which was designed to mimic the appearance of the macOS dock itself, but giving a unique look and feel with my own adaptive design. + +**Cupertino Series** +This series includes 7 different Plank dock themes. You find it all at [Artwork e Design - Cupertino Series](https://artworkedesign.wordpress.com/tag/cupertino-series/). + +- The Cupertino Effect inWhite +- The Cupertino Effect inBlack +- The Cupertino Effect inGrey +- Sirius inLight +- Sirius deLight +- Sirius deepLight +- Catalinas + +##Instalation + +- Download the Plank dock theme to your system. +- Unzip it to the following path: .local/share/plank/themes +- Open Plank dock preferences menu and choose the theme you just added. + +##License + MIT © Alfredo F. + +##Author +Alfredo F. ( aka PT_Alfred ) + +[Artwork e Design](https://artworkedesign.wordpress.com) | [Twitter](https://twitter.com/ArtworkeDesign) | [Mastodon](https://mastodon.art/@PTalfred) diff --git a/community/webdad/desktop-overlay/etc/skel/.local/share/plank/themes/webdad-default/dock.theme b/community/webdad/desktop-overlay/etc/skel/.local/share/plank/themes/webdad-default/dock.theme new file mode 100644 index 00000000..a6a36b92 --- /dev/null +++ b/community/webdad/desktop-overlay/etc/skel/.local/share/plank/themes/webdad-default/dock.theme @@ -0,0 +1,71 @@ +#The Cupertino Effect inBlack - Octo Edition - Prime Version +# +#Created: October 2019 +#License: MIT © Alfredo F. +# +#Author: PT_Alfred +#Social: https://mastodon.art/@PTAlfred + +[PlankTheme] +#The roundness of the top corners. +TopRoundness=75 +#The roundness of the bottom corners. +BottomRoundness=0 +#The thickness (in pixels) of lines drawn. +LineWidth=0 +#The color (RGBA) of the outer stroke. +OuterStrokeColor=0;;0;;0;;0 +#The starting color (RGBA) of the fill gradient. +FillStartColor=0;;0;;0;;101 +#The ending color (RGBA) of the fill gradient. +FillEndColor=0;;0;;0;;81 +#The color (RGBA) of the inner stroke. +InnerStrokeColor=0;;0;;0;;0 + +[PlankDockTheme] +#The padding on the left/right dock edges, in tenths of a percent of IconSize. +HorizPadding=9 +#The padding on the top dock edge, in tenths of a percent of IconSize. +TopPadding=1 +#The padding on the bottom dock edge, in tenths of a percent of IconSize. +BottomPadding=1 +#The padding between items on the dock, in tenths of a percent of IconSize. +ItemPadding=5 +#The size of item indicators, in tenths of a percent of IconSize. +IndicatorSize=7 +#The size of the icon-shadow behind every item, in tenths of a percent of IconSize. +IconShadowSize=1.25 +#The height (in percent of IconSize) to bounce an icon when the application sets urgent. +UrgentBounceHeight=1.75 +#The height (in percent of IconSize) to bounce an icon when launching an application. +LaunchBounceHeight=0.625 +#The opacity value (0 to 1) to fade the dock to when hiding it. +FadeOpacity=1 +#The amount of time (in ms) for click animations. +ClickTime=175 +#The amount of time (in ms) to bounce an urgent icon. +UrgentBounceTime=600 +#The amount of time (in ms) to bounce an icon when launching an application. +LaunchBounceTime=600 +#The amount of time (in ms) for active window indicator animations. +ActiveTime=25 +#The amount of time (in ms) to slide icons into/out of the dock. +SlideTime=4750 +#The time (in ms) to fade the dock in/out on a hide (if FadeOpacity is < 1). +FadeTime=350 +#The time (in ms) to slide the dock in/out on a hide (if FadeOpacity is 1). +HideTime=725 +#The size of the urgent glow (shown when dock is hidden), in tenths of a percent of IconSize. +GlowSize=30 +#The total time (in ms) to show the hidden-dock urgent glow. +GlowTime=10000 +#The time (in ms) of each pulse of the hidden-dock urgent glow. +GlowPulseTime=2750 +#The hue-shift (-180 to 180) of the urgent indicator color. +UrgentHueShift=175 +#The time (in ms) to move an item to its new position or its addition/removal to/from the dock. +ItemMoveTime=450 +#Whether background and icons will unhide/hide with different speeds. The top-border of both will leave/hit the screen-edge at the same time. +CascadeHide=true +#The color (RGBA) of the badge displaying urgent count +BadgeColor=0;;0;;0;;0 diff --git a/community/webdad/live-overlay/etc/lightdm/lightdm.conf b/community/webdad/live-overlay/etc/lightdm/lightdm.conf index 023d8e8b..ebbe59c2 100644 --- a/community/webdad/live-overlay/etc/lightdm/lightdm.conf +++ b/community/webdad/live-overlay/etc/lightdm/lightdm.conf @@ -1,6 +1,6 @@ [Seat:*] greeter-session=lightdm-gtk-greeter -autologin-session=jade +autologin-session=jde session-wrapper=/etc/lightdm/Xsession autologin-user=manjaro autologin-user-timeout=0 diff --git a/community/webdad/live-overlay/etc/skel/.config/jade/desktop.conf b/community/webdad/live-overlay/etc/skel/.config/jde/desktop.conf similarity index 100% rename from community/webdad/live-overlay/etc/skel/.config/jade/desktop.conf rename to community/webdad/live-overlay/etc/skel/.config/jde/desktop.conf diff --git a/community/webdad/live-overlay/etc/skel/.config/jade/theme/style.css b/community/webdad/live-overlay/etc/skel/.config/jde/theme/style.css similarity index 100% rename from community/webdad/live-overlay/etc/skel/.config/jade/theme/style.css rename to community/webdad/live-overlay/etc/skel/.config/jde/theme/style.css diff --git a/community/webdad/live-overlay/etc/skel/.config/plank/dock1/architect.dockitem b/community/webdad/live-overlay/etc/skel/.config/plank/dock1/architect.dockitem deleted file mode 100644 index b6d43a65..00000000 --- a/community/webdad/live-overlay/etc/skel/.config/plank/dock1/architect.dockitem +++ /dev/null @@ -1,2 +0,0 @@ -[PlankDockItemPreferences] -Launcher=file:///usr/share/applications/architect.desktop diff --git a/community/webdad/live-overlay/etc/skel/.config/plank/dock1/calamares.dockitem b/community/webdad/live-overlay/etc/skel/.config/plank/dock1/calamares.dockitem deleted file mode 100644 index b3c34952..00000000 --- a/community/webdad/live-overlay/etc/skel/.config/plank/dock1/calamares.dockitem +++ /dev/null @@ -1,2 +0,0 @@ -[PlankDockItemPreferences] -Launcher=file:///usr/share/applications/calamares.desktop diff --git a/community/webdad/live-overlay/etc/skel/.config/plank/dock1/launchers/architect.dockitem b/community/webdad/live-overlay/etc/skel/.config/plank/dock1/launchers/architect.dockitem deleted file mode 100644 index b6d43a65..00000000 --- a/community/webdad/live-overlay/etc/skel/.config/plank/dock1/launchers/architect.dockitem +++ /dev/null @@ -1,2 +0,0 @@ -[PlankDockItemPreferences] -Launcher=file:///usr/share/applications/architect.desktop diff --git a/community/webdad/live-overlay/usr/share/applications/architect.desktop b/community/webdad/live-overlay/usr/share/applications/architect.desktop deleted file mode 100644 index 980467d1..00000000 --- a/community/webdad/live-overlay/usr/share/applications/architect.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Name=Manjaro-Architect -GenericName=CLI Installer -Keywords=architect;system;installer -TryExec=manjaro-architect -Exec=guake --show -e "sudo /usr/bin/setup" -Comment=Manjaro-Architect — CLI System Installer -Icon=manjaro-architect -Terminal=true -StartupNotify=true -Categories=System; diff --git a/community/webdad/profile.conf b/community/webdad/profile.conf index 1f191011..ab7e5e8d 100644 --- a/community/webdad/profile.conf +++ b/community/webdad/profile.conf @@ -63,7 +63,7 @@ disable_systemd=('pacman-init') # '/etc/defaults/useradd': " " # userShell : "/bin/zsh" # empty value will not be used -user_shell="/bin/zsh" +# user_shell="/bin/zsh" ################# live-session ################# @@ -78,7 +78,7 @@ user_shell="/bin/zsh" # the login shell # defaults to bash -login_shell="/bin/zsh" +# login_shell="/bin/zsh" # unset defaults to given values # names must match systemd service names @@ -90,4 +90,4 @@ disable_systemd_live=('tlp' 'tlp-sleep' 'apparmor' 'snapd.apparmor' 'snapd' 'ufw # names must match openrc service names # services in enable_openrc array don't need to be listed here # enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live') -# enable_systemd_live=('manjaro-live' 'pacman-init' 'mirrors-live') +