diff --git a/README.md b/README.md index 07771f9..9bc7c9d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ iso-profiles ========================== -######* profile.conf +###### * profile.conf ~~~ ########################################## @@ -80,7 +80,7 @@ iso-profiles # enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live') ~~~ -######* New Packagelist tags +###### * New Packagelist tags ~~~ >openrc @@ -102,22 +102,22 @@ iso-profiles >extra ~~~ -######* Packages-Root +###### * Packages-Root * Contains root image packages * ideally no xorg -######* Packages-Desktop +###### * Packages-Desktop * Contains the desktop image packages * desktop environment packages go here -######* Packages-Mhwd +###### * Packages-Mhwd * Contains the MHWD driver packages repo -######* Packages-Live +###### * Packages-Live * Contains packages you only want in live session but not installed on the target system with installer * default files are in shared folder and can be symlinked or defined in a real file -######* buildiso can be configured to use custom repos. +###### * buildiso can be configured to use custom repos. * create a user-repos.conf @@ -127,5 +127,5 @@ ${profile_dir}/user-repos.conf Add only your repos to user-repos.conf! -######* Calamares +###### * Calamares * netgroups definitions go in [this] (https://github.com/manjaro/calamares-netgroups) repo please diff --git a/community/bspwm/Packages-Desktop b/community/bspwm/Packages-Desktop index 87b1ffe..eff46c9 100644 --- a/community/bspwm/Packages-Desktop +++ b/community/bspwm/Packages-Desktop @@ -27,6 +27,7 @@ file-roller gedit gnome-disk-utility gtk3-classic +gtk2-compatibility gufw gvfs hibernator @@ -40,9 +41,11 @@ limepanel lxappearance-gtk3 maia-console manjaro-architect +manjaro-browser-settings manjaro-bspwm-settings manjaro-pulse manjaro-zsh-config +mate-notification-daemon mhwd-tui moc morc_menu @@ -67,6 +70,7 @@ ps_mem pulseaudio-ctl ranger rofi +rofi-scripts rootmenu spacefm speedtest-cli @@ -87,7 +91,6 @@ xf86-input-keyboard xf86-input-libinput xf86-input-mouse xf86-input-void -xfce4-notifyd-gtk3 xlogin xorg-xbacklight xorg-server diff --git a/community/bspwm/Packages-Mhwd b/community/bspwm/Packages-Mhwd deleted file mode 120000 index 9df3d5e..0000000 --- a/community/bspwm/Packages-Mhwd +++ /dev/null @@ -1 +0,0 @@ -../../shared/Packages-Mhwd \ No newline at end of file diff --git a/community/bspwm/Packages-Mhwd b/community/bspwm/Packages-Mhwd new file mode 100644 index 0000000..0d86011 --- /dev/null +++ b/community/bspwm/Packages-Mhwd @@ -0,0 +1,50 @@ +#KERNEL-bbswitch +#KERNEL-broadcom-wl +#KERNEL-r8168 +#KERNEL-rt3562sta +KERNEL-virtualbox-guest-modules +libva-intel-driver +libva-mesa-driver +#libva-vdpau-driver +#>multilib lib32-libva-vdpau-driver +libxaw +libxpm +libxvmc +mesa-vdpau +#>multilib lib32-mesa-vdpau +#>multilib lib32-libxvmc +#>multilib lib32-primus +#>nonfree_default catalyst-utils +#>nonfree_default KERNEL-catalyst +#>nonfree_default KERNEL-nvidia +#>nonfree_default KERNEL-nvidia-304xx +#>nonfree_default KERNEL-nvidia-340xx +#>nonfree_default nvidia-304xx-utils +#>nonfree_default nvidia-340xx-utils +#>nonfree_default nvidia-utils +#>nonfree_multilib lib32-catalyst-utils +#>nonfree_multilib lib32-nvidia-304xx-utils +#>nonfree_multilib lib32-nvidia-340xx-utils +#>nonfree_multilib lib32-nvidia-utils +opencl-mesa +open-vm-tools +pangox-compat +#primus +#bumblebee +virtualbox-guest-utils +#vulkan-radeon +#>multilib lib32-vulkan-radeon +vulkan-intel +#>multilib lib32-vulkan-intel +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/community/bspwm/desktop-overlay/usr/share/gtk-3.0/settings.ini b/community/bspwm/desktop-overlay/usr/share/gtk-3.0/settings.ini index 2d91741..d2a9741 100644 --- a/community/bspwm/desktop-overlay/usr/share/gtk-3.0/settings.ini +++ b/community/bspwm/desktop-overlay/usr/share/gtk-3.0/settings.ini @@ -2,7 +2,7 @@ gtk-theme-name=Adwaita-Maia gtk-icon-theme-name=Breeze-Maia-Dark gtk-font-name=xos4 Terminus 13 -gtk-cursor-theme-name=Breeze +gtk-cursor-theme-name=xcursor-breeze gtk-cursor-theme-size=0 gtk-toolbar-style=GTK_TOOLBAR_ICONS gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR diff --git a/community/budgie/Packages-Desktop b/community/budgie/Packages-Desktop index b006870..eb1ec0b 100644 --- a/community/budgie/Packages-Desktop +++ b/community/budgie/Packages-Desktop @@ -55,7 +55,7 @@ gvfs-smb inxi imagewriter mc # Midnight Commander -pacui +#pacui mhwd-tui manjaro-alsa manjaro-artwork @@ -111,7 +111,6 @@ arc-maia-icon-theme moka-icon-theme #arc-themes-maia #firefox-arc-maia-settings -ff-theme-util budgie-wallpapers vino xdg-su diff --git a/community/budgie/desktop-overlay/etc/profile.d/libreoffice-fresh.csh b/community/budgie/desktop-overlay/etc/profile.d/libreoffice-fresh.csh deleted file mode 100755 index dd66e9f..0000000 --- a/community/budgie/desktop-overlay/etc/profile.d/libreoffice-fresh.csh +++ /dev/null @@ -1,6 +0,0 @@ -# to force a certain look'n feel - -#setenv SAL_USE_VCLPLUGIN gen -#setenv SAL_USE_VCLPLUGIN kde4 -setenv SAL_USE_VCLPLUGIN gtk -#setenv SAL_USE_VCLPLUGIN gtk3 # currently broken and not available diff --git a/community/budgie/desktop-overlay/etc/profile.d/libreoffice-fresh.sh b/community/budgie/desktop-overlay/etc/profile.d/libreoffice-fresh.sh deleted file mode 100755 index d5e91ec..0000000 --- a/community/budgie/desktop-overlay/etc/profile.d/libreoffice-fresh.sh +++ /dev/null @@ -1,6 +0,0 @@ -# to force a certain look'n feel - -#export SAL_USE_VCLPLUGIN=gen -#export SAL_USE_VCLPLUGIN=kde4 -export SAL_USE_VCLPLUGIN=gtk -#export SAL_USE_VCLPLUGIN=gtk3 # currently broken and not available diff --git a/community/budgie/desktop-overlay/usr/share/icons/default/index.theme b/community/budgie/desktop-overlay/usr/share/icons/default/index.theme index 741f643..1270d0d 100644 --- a/community/budgie/desktop-overlay/usr/share/icons/default/index.theme +++ b/community/budgie/desktop-overlay/usr/share/icons/default/index.theme @@ -1,2 +1,2 @@ [Icon Theme] -Inherits=Breeze +Inherits=xcursor-breeze diff --git a/community/cinnamon/Packages-Desktop b/community/cinnamon/Packages-Desktop index 2635676..64889e7 100644 --- a/community/cinnamon/Packages-Desktop +++ b/community/cinnamon/Packages-Desktop @@ -1,3 +1,4 @@ +adapta-maia-theme alsa-firmware alsa-utils avahi @@ -9,9 +10,7 @@ cinnamon-sounds >extra dconf-editor dmidecode >extra ffmpegthumbnailer ->extra ff-theme-util >extra firefox ->extra flattr-icon-theme >extra galculator >extra gcolor2 >extra gimp @@ -22,6 +21,7 @@ gnome-keyring gnome-system-log gnome-system-monitor gnome-terminal +gnome-themes-standard >extra gparted >extra gprename >extra gst-libav @@ -133,3 +133,5 @@ xorg-xinit >extra yaourt xdg-user-dirs xorg-server +xorg-xhost +xorg-xkill diff --git a/community/cinnamon/Packages-Live b/community/cinnamon/Packages-Live index fba80e2..38e9bb9 100644 --- a/community/cinnamon/Packages-Live +++ b/community/cinnamon/Packages-Live @@ -4,6 +4,5 @@ manjaro-live-skel mkinitcpio-nfs-utils nbd grub-theme-live-manjaro ->openrc manjaro-live-openrc squashfs-tools ->systemd manjaro-live-systemd +manjaro-live-systemd diff --git a/community/cinnamon/desktop-overlay/usr/share/icons/default/index.theme b/community/cinnamon/desktop-overlay/usr/share/icons/default/index.theme index 741f643..1270d0d 100644 --- a/community/cinnamon/desktop-overlay/usr/share/icons/default/index.theme +++ b/community/cinnamon/desktop-overlay/usr/share/icons/default/index.theme @@ -1,2 +1,2 @@ [Icon Theme] -Inherits=Breeze +Inherits=xcursor-breeze diff --git a/community/deepin/Packages-Desktop b/community/deepin/Packages-Desktop index 9e02b15..406f5ca 100644 --- a/community/deepin/Packages-Desktop +++ b/community/deepin/Packages-Desktop @@ -9,12 +9,14 @@ avahi >extra firefox >extra dconf-editor deepin-calendar +>extra deepin-calculator deepin-file-manager deepin-gtk-theme >extra deepin-help >extra deepin-image-viewer >extra deepin-movie >extra deepin-music +>extra deepin-picker >extra deepin-screen-recorder >extra deepin-screenshot >extra deepin-system-monitor @@ -119,4 +121,5 @@ xorg-xinit >extra xsane-gimp >extra yaourt xdg-user-dirs +xorg-xhost xorg-server diff --git a/community/deepin/Packages-Live b/community/deepin/Packages-Live index fba80e2..38e9bb9 100644 --- a/community/deepin/Packages-Live +++ b/community/deepin/Packages-Live @@ -4,6 +4,5 @@ manjaro-live-skel mkinitcpio-nfs-utils nbd grub-theme-live-manjaro ->openrc manjaro-live-openrc squashfs-tools ->systemd manjaro-live-systemd +manjaro-live-systemd diff --git a/community/deepin/desktop-overlay/etc/skel/.config/deepin/deepin-wm-switcher/config.json b/community/deepin/desktop-overlay/etc/skel/.config/deepin/deepin-wm-switcher/config.json new file mode 100644 index 0000000..8346637 --- /dev/null +++ b/community/deepin/desktop-overlay/etc/skel/.config/deepin/deepin-wm-switcher/config.json @@ -0,0 +1,4 @@ +{ + "allow_switch": true, + "last_wm": "deepin-wm" +} diff --git a/community/i3/Packages-Desktop b/community/i3/Packages-Desktop index cf647a3..0d68eb4 100644 --- a/community/i3/Packages-Desktop +++ b/community/i3/Packages-Desktop @@ -17,7 +17,6 @@ dmidecode downgrade epdfview fakeroot -ff-theme-util ffmpeg ffmpegthumbnailer flac @@ -38,6 +37,7 @@ gst-plugins-base gst-plugins-good gst-plugins-ugly gstreamer +gtksourceview-pkgbuild gufw gvfs gvfs-afc @@ -141,6 +141,7 @@ xf86-input-void xfburn xfce4-power-manager xorg-twm +xorg-xhost xorg-xinit xorg-xkill xorg-xprop diff --git a/community/i3/Packages-Live b/community/i3/Packages-Live index 2266d97..75d5dff 100644 --- a/community/i3/Packages-Live +++ b/community/i3/Packages-Live @@ -5,6 +5,5 @@ manjaro-architect-launcher mkinitcpio-nfs-utils nbd grub-theme-live-manjaro ->openrc manjaro-live-openrc squashfs-tools ->systemd manjaro-live-systemd +manjaro-live-systemd diff --git a/community/i3/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf b/community/i3/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf index b525ca4..dc834ca 100644 --- a/community/i3/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf +++ b/community/i3/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf @@ -11,7 +11,7 @@ xft-antialias = true xft-hintstyle = hintfull icon-theme-name = Vibrancy-Full-Dark-Teal theme-name = Vertex-Maia-Dark -cursor-theme-name = Breeze +cursor-theme-name = xcursor-breeze panel-position = top show-clock = true clock-format = diff --git a/community/i3/live-overlay/etc/skel/.i3/config b/community/i3/live-overlay/etc/skel/.i3/config index a6f3407..805ca61 100644 --- a/community/i3/live-overlay/etc/skel/.i3/config +++ b/community/i3/live-overlay/etc/skel/.i3/config @@ -362,16 +362,16 @@ bar { strip_workspace_numbers yes colors { -# background $transparent background $i3_background statusline $i3_text separator $i3_separator -# border backgr. text - focused_workspace $i3_color1 $i3_color4 $i3_text - active_workspace $i3_color2 $i3_color3 $i3_color5 - inactive_workspace $i3_color2 $i3_color3 $i3_color6 - urgent_workspace $i3_color4 $i3_color5 $i3_color7 +# border backgr. text + focused_workspace $i3_color1 $i3_color4 $i3_text + active_workspace $i3_color2 $i3_color3 $i3_color5 + inactive_workspace $i3_color2 $i3_color3 $i3_color6 + binding_mode $i3_color8 $i3_background $i3_text + urgent_workspace $i3_color4 $i3_color5 $i3_color7 } } diff --git a/community/lxde/desktop-overlay/etc/X11/xorg.conf.d/70-synaptics.conf b/community/lxde/desktop-overlay/etc/X11/xorg.conf.d/70-synaptics.conf index 05be751..601120c 100644 --- a/community/lxde/desktop-overlay/etc/X11/xorg.conf.d/70-synaptics.conf +++ b/community/lxde/desktop-overlay/etc/X11/xorg.conf.d/70-synaptics.conf @@ -7,7 +7,6 @@ Section "InputClass" Option "TapButton3" "2" Option "VertEdgeScroll" "on" Option "HorizEdgeScroll" "on" - Option "SingleTapTimeout" "100" EndSection Section "InputClass" diff --git a/community/lxde/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf b/community/lxde/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf index aacfb0f..32434d0 100644 --- a/community/lxde/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf +++ b/community/lxde/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf @@ -5,7 +5,7 @@ xft-antialias = true icon-theme-name = Arc-Maia screensaver-timeout = 60 theme-name = Adapta-Eta-Maia -cursor-theme-name = Breeze +cursor-theme-name = xcursor-breeze show-clock = false default-user-image = #avatar-default xft-hintstyle = hintfull diff --git a/community/mate/Packages-Desktop b/community/mate/Packages-Desktop index c954c43..03d65f4 100644 --- a/community/mate/Packages-Desktop +++ b/community/mate/Packages-Desktop @@ -35,7 +35,7 @@ gnome-disk-utility gnome-keyring manjaro-mate-settings mc # Midnight Commander -pacui +#pacui mhwd-tui gparted grilo-plugins diff --git a/community/mate/desktop-overlay/etc/environment b/community/mate/desktop-overlay/etc/environment index 578e471..9474e03 100644 --- a/community/mate/desktop-overlay/etc/environment +++ b/community/mate/desktop-overlay/etc/environment @@ -5,3 +5,4 @@ # QT_QPA_PLATFORMTHEME="qt5ct" +EDITOR=/usr/bin/nano diff --git a/community/mate/desktop-overlay/etc/lightdm/lightdm.conf b/community/mate/desktop-overlay/etc/lightdm/lightdm.conf deleted file mode 100644 index f1df189..0000000 --- a/community/mate/desktop-overlay/etc/lightdm/lightdm.conf +++ /dev/null @@ -1,165 +0,0 @@ -# -# 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 -# -[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=/usr/share/lightdm/greeters:/usr/share/xgreeters -#backup-logs=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 (xlocal, 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-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=xlocal -#pam-service=lightdm -#pam-autologin-service=lightdm-autologin -#pam-greeter-service=lightdm-greeter -#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=default -#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= -#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/community/mate/desktop-overlay/etc/lightdm/slick-greeter.conf b/community/mate/desktop-overlay/etc/lightdm/slick-greeter.conf deleted file mode 100644 index 0125785..0000000 --- a/community/mate/desktop-overlay/etc/lightdm/slick-greeter.conf +++ /dev/null @@ -1,5 +0,0 @@ -[Greeter] -background=/usr/share/backgrounds/manjaro-mate/manjaro-mate.png -theme-name=Arc-Maia-Dark -icon-theme-name=Arc-Maia -draw-grid=false diff --git a/community/mate/desktop-overlay/etc/profile.d/libreoffice-gtk2.csh b/community/mate/desktop-overlay/etc/profile.d/libreoffice-gtk2.csh deleted file mode 100755 index dd66e9f..0000000 --- a/community/mate/desktop-overlay/etc/profile.d/libreoffice-gtk2.csh +++ /dev/null @@ -1,6 +0,0 @@ -# to force a certain look'n feel - -#setenv SAL_USE_VCLPLUGIN gen -#setenv SAL_USE_VCLPLUGIN kde4 -setenv SAL_USE_VCLPLUGIN gtk -#setenv SAL_USE_VCLPLUGIN gtk3 # currently broken and not available diff --git a/community/mate/desktop-overlay/etc/profile.d/libreoffice-gtk2.sh b/community/mate/desktop-overlay/etc/profile.d/libreoffice-gtk2.sh deleted file mode 100755 index d5e91ec..0000000 --- a/community/mate/desktop-overlay/etc/profile.d/libreoffice-gtk2.sh +++ /dev/null @@ -1,6 +0,0 @@ -# to force a certain look'n feel - -#export SAL_USE_VCLPLUGIN=gen -#export SAL_USE_VCLPLUGIN=kde4 -export SAL_USE_VCLPLUGIN=gtk -#export SAL_USE_VCLPLUGIN=gtk3 # currently broken and not available diff --git a/community/mate/desktop-overlay/usr/share/icons/default/index.theme b/community/mate/desktop-overlay/usr/share/icons/default/index.theme index 741f643..1270d0d 100644 --- a/community/mate/desktop-overlay/usr/share/icons/default/index.theme +++ b/community/mate/desktop-overlay/usr/share/icons/default/index.theme @@ -1,2 +1,2 @@ [Icon Theme] -Inherits=Breeze +Inherits=xcursor-breeze diff --git a/manjaro/gnome/Packages-Desktop b/manjaro/gnome/Packages-Desktop index be66cb4..1cb599d 100644 --- a/manjaro/gnome/Packages-Desktop +++ b/manjaro/gnome/Packages-Desktop @@ -6,13 +6,13 @@ dmidecode hexchat gthumb evince -firefox +>basic epiphany +>extra firefox gdm -manjaro-gnome-maia-theme -#>extra gdm3setup -#lightdm -#lightdm-slick-greeter -gedit +manjaro-gdm-check #this check if nvidia closed drivers are installed and disable wayland session +manjaro-gnome-maia-theme #branding theme for GDM +gedit +gtksourceview-pkgbuild #highlight for PKGBUILD gnome-backgrounds gnome-calculator gnome-control-center @@ -21,6 +21,7 @@ gnome-disk-utility gnome-font-viewer gnome-keyring >extra gnome-online-accounts +>extra gnome-contacts gnome-screenshot gnome-session gnome-settings-daemon @@ -53,18 +54,19 @@ gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly -gucharmap gufw gvfs-afc -gvfs #-gphoto2 +gvfs gvfs-mtp gvfs-google gvfs-smb inxi imagewriter -pacui +#cli tool# +#pacui mc mhwd-tui +######## manjaro-alsa manjaro-artwork manjaro-wallpapers-17.0 @@ -116,7 +118,7 @@ ttf-indic-otf ttf-liberation >systemd usb_modeswitch arc-maia-icon-theme -moka-icon-theme +kvantum-manjaro #support for qt5 theming match with adapta #firefox-arc-maia-settings #disable theming since upstream no adjust the theme vino xdg-su @@ -134,6 +136,8 @@ xorg-twm xorg-xinit yelp +ms-office-online + #extra depends for file-roller >extra gnome-getting-started-docs >extra p7zip @@ -142,7 +146,6 @@ yelp >extra lrzip >extra gtk3-print-backends >extra libreoffice-fresh -#>extra thunderbird >extra evolution >extra lollypop >extra empathy @@ -153,10 +156,11 @@ yelp >extra manjaro-documentation-en >extra jre8-openjdk >extra jre8-openjdk-headless ->extra flashplugin +#>extra flashplugin >extra libdvdcss >extra steam-manjaro >extra manjaro-printer + #AUR complete support ( base devel + yaourt ) #>extra autoconf #>extra automake diff --git a/manjaro/gnome/desktop-overlay/etc/environment b/manjaro/gnome/desktop-overlay/etc/environment new file mode 100644 index 0000000..9474e03 --- /dev/null +++ b/manjaro/gnome/desktop-overlay/etc/environment @@ -0,0 +1,8 @@ +# +# This file is parsed by pam_env module +# +# Syntax: simple "KEY=VAL" pairs on separate lines +# + +QT_QPA_PLATFORMTHEME="qt5ct" +EDITOR=/usr/bin/nano diff --git a/manjaro/gnome/desktop-overlay/etc/gdm/custom.conf b/manjaro/gnome/desktop-overlay/etc/gdm/custom.conf index 37d148d..d255651 100644 --- a/manjaro/gnome/desktop-overlay/etc/gdm/custom.conf +++ b/manjaro/gnome/desktop-overlay/etc/gdm/custom.conf @@ -8,8 +8,6 @@ WaylandEnable=false [xdmcp] -[greeter] - [chooser] [debug] diff --git a/manjaro/gnome/desktop-overlay/etc/profile.d/libreoffice-fresh.csh b/manjaro/gnome/desktop-overlay/etc/profile.d/libreoffice-fresh.csh deleted file mode 100755 index dd66e9f..0000000 --- a/manjaro/gnome/desktop-overlay/etc/profile.d/libreoffice-fresh.csh +++ /dev/null @@ -1,6 +0,0 @@ -# to force a certain look'n feel - -#setenv SAL_USE_VCLPLUGIN gen -#setenv SAL_USE_VCLPLUGIN kde4 -setenv SAL_USE_VCLPLUGIN gtk -#setenv SAL_USE_VCLPLUGIN gtk3 # currently broken and not available diff --git a/manjaro/gnome/desktop-overlay/etc/profile.d/libreoffice-fresh.sh b/manjaro/gnome/desktop-overlay/etc/profile.d/libreoffice-fresh.sh deleted file mode 100755 index d5e91ec..0000000 --- a/manjaro/gnome/desktop-overlay/etc/profile.d/libreoffice-fresh.sh +++ /dev/null @@ -1,6 +0,0 @@ -# to force a certain look'n feel - -#export SAL_USE_VCLPLUGIN=gen -#export SAL_USE_VCLPLUGIN=kde4 -export SAL_USE_VCLPLUGIN=gtk -#export SAL_USE_VCLPLUGIN=gtk3 # currently broken and not available diff --git a/manjaro/gnome/desktop-overlay/usr/share/icons/default/index.theme b/manjaro/gnome/desktop-overlay/usr/share/icons/default/index.theme index 741f643..1270d0d 100644 --- a/manjaro/gnome/desktop-overlay/usr/share/icons/default/index.theme +++ b/manjaro/gnome/desktop-overlay/usr/share/icons/default/index.theme @@ -1,2 +1,2 @@ [Icon Theme] -Inherits=Breeze +Inherits=xcursor-breeze diff --git a/manjaro/gnome/live-overlay/etc/skel/.config/manjaro b/manjaro/gnome/live-overlay/etc/skel/.config/manjaro new file mode 120000 index 0000000..3a25db6 --- /dev/null +++ b/manjaro/gnome/live-overlay/etc/skel/.config/manjaro @@ -0,0 +1 @@ +../../../../../../shared/manjaro/live-overlay/etc/skel/.config/manjaro \ No newline at end of file diff --git a/manjaro/gnome/live-overlay/usr/bin/update-check b/manjaro/gnome/live-overlay/usr/bin/update-check new file mode 100644 index 0000000..e69de29 diff --git a/manjaro/gnome/live-overlay/usr/bin/update-checker b/manjaro/gnome/live-overlay/usr/bin/update-checker new file mode 100644 index 0000000..e69de29 diff --git a/manjaro/gnome/live-overlay/usr/bin/update-command b/manjaro/gnome/live-overlay/usr/bin/update-command new file mode 100644 index 0000000..e69de29 diff --git a/manjaro/gnome/live-overlay/usr/bin/update-notifier b/manjaro/gnome/live-overlay/usr/bin/update-notifier new file mode 100644 index 0000000..e69de29 diff --git a/manjaro/gnome/profile.conf b/manjaro/gnome/profile.conf index efbb7d6..c835c74 100644 --- a/manjaro/gnome/profile.conf +++ b/manjaro/gnome/profile.conf @@ -6,7 +6,7 @@ # multilib="true" # use extra packages as defined in pkglist to activate a full profile - extra="true" +extra="true" ################ install ################ diff --git a/manjaro/kde/Packages-Desktop b/manjaro/kde/Packages-Desktop index 83910c1..1a5abb9 100644 --- a/manjaro/kde/Packages-Desktop +++ b/manjaro/kde/Packages-Desktop @@ -73,7 +73,7 @@ pkg-config >extra git >extra patchutils >extra subversion -yaourt +#yaourt ## Fonts # cantarell-fonts # Installed as gnome-themes-standard dependency @@ -174,13 +174,13 @@ kcalc kfind kdeconnect okular ->extra kdenetwork-kget +>extra kget kdenetwork-filesharing ->extra kdenlive +#>extra kdenlive kde-servicemenus-rootactions khelpcenter kio-extras ->extra kleopatra +#>extra kleopatra konsole konversation ksystemlog @@ -224,12 +224,12 @@ kaccounts-providers sshfs # remote filesystem browser ## Optional dependencies for kdenlive ->extra cdrtools # for creation of DVD ISO images ->extra dvdauthor # for creation of DVD ->extra dvgrab # for firewire capture ->extra recordmydesktop # for screen capture +#>extra cdrtools # for creation of DVD ISO images +#>extra dvdauthor # for creation of DVD +#>extra dvgrab # for firewire capture +#>extra recordmydesktop # for screen capture #>extra vlc-nightly # for DVD preview, needs xine-ui or vlc, vlc is in "Applications" section ->extra movit # for GPU video processing +#>extra movit # for GPU video processing ## Optional dependencies for okular poppler-data # encoding data to display PDF documents containing CJK characters @@ -246,8 +246,9 @@ imagewriter >extra inkscape inxi >extra krita ->extra firefox-kde +>extra firefox >basic qupzilla +ms-office-online >extra libreoffice-still manjaro-hello manjaro-settings-manager-kcm @@ -256,7 +257,7 @@ powertop >extra qbittorrent screenfetch systemd-kcm ->extra thunderbird-kde +>extra thunderbird vlc-nightly yakuake diff --git a/manjaro/kde/live-overlay/etc/skel/.config/manjaro b/manjaro/kde/live-overlay/etc/skel/.config/manjaro new file mode 120000 index 0000000..3a25db6 --- /dev/null +++ b/manjaro/kde/live-overlay/etc/skel/.config/manjaro @@ -0,0 +1 @@ +../../../../../../shared/manjaro/live-overlay/etc/skel/.config/manjaro \ No newline at end of file diff --git a/manjaro/kde/profile.conf b/manjaro/kde/profile.conf index d583b16..71559c0 100644 --- a/manjaro/kde/profile.conf +++ b/manjaro/kde/profile.conf @@ -15,7 +15,7 @@ displaymanager="sddm" # use extra packages as defined in pkglist to activate a full profile # extra="false" -#extra="true" +extra="true" ################ install ################ diff --git a/manjaro/lxqt/Packages-Desktop b/manjaro/lxqt/Packages-Desktop index 6376479..d001072 100644 --- a/manjaro/lxqt/Packages-Desktop +++ b/manjaro/lxqt/Packages-Desktop @@ -14,7 +14,7 @@ inxi juffed-qt5 lxqt-about lxqt-admin -lxqt-common +lxqt-themes lxqt-config lxqt-globalkeys lxqt-notificationd diff --git a/manjaro/lxqt/Packages-Live b/manjaro/lxqt/Packages-Live index e608cb3..520d42c 100644 --- a/manjaro/lxqt/Packages-Live +++ b/manjaro/lxqt/Packages-Live @@ -10,8 +10,7 @@ KERNEL-virtualbox-guest-modules >manjaro grub-theme-live-manjaro manjaro-live-skel ->openrc manjaro-live-openrc ->systemd manjaro-live-systemd +manjaro-live-systemd mkinitcpio-nfs-utils nbd @@ -22,8 +21,7 @@ virtualbox-guest-utils xf86-input-elographics xf86-input-evdev xf86-input-keyboard ->systemd xf86-input-libinput ->openrc xf86-input-libinput-nosystemd +xf86-input-libinput xf86-input-mouse xf86-input-vmmouse xf86-input-void @@ -41,6 +39,5 @@ xf86-video-voodoo ## system rescue utilities manjaro-tools-base ->systemd gparted ->openrc partitionmanager +gparted imagewriter diff --git a/manjaro/netinstall/live-overlay/etc/sddm.conf b/manjaro/netinstall/live-overlay/etc/sddm.conf index c3a1b3f..bd7cf10 100644 --- a/manjaro/netinstall/live-overlay/etc/sddm.conf +++ b/manjaro/netinstall/live-overlay/etc/sddm.conf @@ -10,7 +10,7 @@ RebootCommand=/usr/bin/systemctl reboot [Theme] Current=andromeda-qt -CursorTheme=Breeze +CursorTheme=xcursor-breeze FacesDir=/usr/share/sddm/faces ThemeDir=/usr/share/sddm/themes diff --git a/manjaro/xfce/Packages-Desktop b/manjaro/xfce/Packages-Desktop index 85acc75..bd6c714 100644 --- a/manjaro/xfce/Packages-Desktop +++ b/manjaro/xfce/Packages-Desktop @@ -192,7 +192,6 @@ dmidecode # optional dependency inxi engrampa engrampa-thunar-plugin >extra firefox ->extra ff-theme-util # >extra flashplugin >extra galculator-gtk2 >extra gimp @@ -202,10 +201,9 @@ gufw >extra hexchat htop qpdfview ->extra qpdfview-djvu-plugin ->extra qpdfview-ps-plugin inxi >extra libreoffice-still +ms-office-online manjaro-hello manjaro-settings-manager manjaro-settings-manager-notifier diff --git a/manjaro/xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf b/manjaro/xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf index 896a92d..16c96d3 100644 --- a/manjaro/xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf +++ b/manjaro/xfce/desktop-overlay/etc/lightdm/lightdm-gtk-greeter.conf @@ -5,10 +5,11 @@ xft-antialias = true icon-theme-name = Vertex-Maia screensaver-timeout = 60 theme-name = Vertex-Maia -cursor-theme-name = Breeze +cursor-theme-name = xcursor-breeze show-clock = false default-user-image = #avatar-default xft-hintstyle = hintfull position = 50%,center 50%,center clock-format = panel-position = bottom +indicators = ~host;~spacer;~clock;~spacer;~language;~session;~a11y;~power diff --git a/manjaro/xfce/profile.conf b/manjaro/xfce/profile.conf index deb8325..7220bba 100644 --- a/manjaro/xfce/profile.conf +++ b/manjaro/xfce/profile.conf @@ -14,7 +14,7 @@ displaymanager="lightdm" # nonfree_mhwd="true" # use extra packages as defined in pkglist to activate a full profile -# extra="true" +extra="true" ################ install ################ diff --git a/shared/Packages-Live b/shared/Packages-Live index 39acf5c..3f485bc 100644 --- a/shared/Packages-Live +++ b/shared/Packages-Live @@ -3,9 +3,10 @@ manjaro-live-skel mkinitcpio-nfs-utils nbd gsmartcontrol ->manjaro grub-theme-live-manjaro +>manjaro grub-theme-live-manjaro-dev +#>manjaro grub-theme-live-manjaro >sonar grub-theme-live-sonar >sonar sonar-calamares-branding squashfs-tools manjaro-live-systemd ->sonar thus +manjaro-architect diff --git a/shared/Packages-Live-Xorg b/shared/Packages-Live-Xorg index ceb7a43..26df5ea 100644 --- a/shared/Packages-Live-Xorg +++ b/shared/Packages-Live-Xorg @@ -10,11 +10,13 @@ mkinitcpio-nfs-utils nbd open-vm-tools primus ->manjaro grub-theme-live-manjaro +>manjaro grub-theme-live-manjaro-dev +#>manjaro grub-theme-live-manjaro >sonar grub-theme-live-sonar squashfs-tools bumblebee manjaro-live-systemd +manjaro-architect xf86-input-vmmouse xf86-video-amdgpu xf86-video-ati @@ -27,4 +29,3 @@ xf86-video-sisusb xf86-video-vesa xf86-video-vmware xf86-video-voodoo ->sonar thus diff --git a/shared/manjaro/live-overlay/etc/skel/.config/manjaro/manjaro-settings-manager.conf b/shared/manjaro/live-overlay/etc/skel/.config/manjaro/manjaro-settings-manager.conf new file mode 100644 index 0000000..0e4675d --- /dev/null +++ b/shared/manjaro/live-overlay/etc/skel/.config/manjaro/manjaro-settings-manager.conf @@ -0,0 +1,7 @@ +[notifications] +checkLanguagePackages=false +checkNewKernel=false +checkNewKernelLts=false +checkNewKernelRecommended=false +checkUnsupportedKernel=false +checkUnsupportedKernelRunning=false diff --git a/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc b/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc deleted file mode 100644 index 2d5cad0..0000000 --- a/shared/manjaro/live-overlay/usr/share/calamares/branding/manjaro/branding.desc +++ /dev/null @@ -1,23 +0,0 @@ ---- -componentName: manjaro - -strings: - productName: Manjaro Linux - shortProductName: Manjaro - version: 17.1-pre1 - shortVersion: 17.1-pre1 - versionedName: Manjaro Linux 17.1-pre1 "Hakoila" - shortVersionedName: Manjaro 17.1-pre1 - bootloaderEntryName: Manjaro - -images: - productLogo: "squid.png" - productIcon: "logo.png" - productWelcome: "languages.png" - -slideshow: "show.qml" - -style: - sidebarBackground: "#454948" - sidebarText: "#efefef" - sidebarTextSelect: "#9E4F5D"