From c013c6ea0e9899cf79002bdfa3d72d3d179b4740 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Fri, 3 Sep 2021 15:24:47 +0200 Subject: [PATCH] de-p1st-xfce4: use Nautilus instead of Thunar as file manager; add scripts for nautilus context menu --- .../share/nautilus/scripts/open-terminal | 2 + pkg/de-p1st-xfce4/PKGBUILD | 87 ++++++++++++++----- pkg/de-p1st-xfce4/config/user-dirs.dirs | 15 ++++ 3 files changed, 81 insertions(+), 23 deletions(-) create mode 100755 pkg/de-p1st-xfce4/.local/share/nautilus/scripts/open-terminal create mode 100644 pkg/de-p1st-xfce4/config/user-dirs.dirs diff --git a/pkg/de-p1st-xfce4/.local/share/nautilus/scripts/open-terminal b/pkg/de-p1st-xfce4/.local/share/nautilus/scripts/open-terminal new file mode 100755 index 0000000..708f6bd --- /dev/null +++ b/pkg/de-p1st-xfce4/.local/share/nautilus/scripts/open-terminal @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +exo-open --launch TerminalEmulator diff --git a/pkg/de-p1st-xfce4/PKGBUILD b/pkg/de-p1st-xfce4/PKGBUILD index ad0ff6c..5c7429d 100644 --- a/pkg/de-p1st-xfce4/PKGBUILD +++ b/pkg/de-p1st-xfce4/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=xfce4 _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.0.29 +pkgver=0.1.0 pkgrel=1 pkgdesc="XFCE4 with configuration" arch=('any') @@ -11,7 +11,7 @@ license=('MIT') makedepends=('git') backup=('etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml') # de-p1st-xfce4-hidpi changes this file through holo install='.install' -source=("git+${url}.git") +source=("git+${url}.git" "git+https://codeberg.org/privacy1st/md-to-pdf.git") sha256sums=('SKIP') @@ -24,21 +24,30 @@ depends+=('xorg-meta') # ============== XFCE4 ============== # -# xfce4 group -# pacman -Sg xfce4 | sed 's|^xfce4 |depends+=(|; s|$|)|' -depends+=(xfce4-meta) -# some pkgs from xfce4-goodies group, except e.g. -# ristretto (image viewer) -# xfce4-artwork -# xfce4-time-out-plugin (take breaks) -# xfce4-timer-plugin -# xfce4-xkb-plugin (keyboard layouts) -depends+=(mousepad thunar-media-tags-plugin xfce4-genmon-plugin xfce4-notifyd xfce4-screensaver xfce4-screenshooter xfce4-weather-plugin xfce4-whiskermenu-plugin) +# xfce4 group except thunar, thunar-volman, tumbler +# -> pacman -Sg xfce4 | sed 's|^xfce4 |depends+=(|; s|$|)|' +depends+=(exo) +depends+=(garcon) +depends+=(xfce4-appfinder) +depends+=(xfce4-panel) +depends+=(xfce4-power-manager) +depends+=(xfce4-session) +depends+=(xfce4-settings) +depends+=(xfce4-terminal) +depends+=(xfconf) +depends+=(xfdesktop) +depends+=(xfwm4) +depends+=(xfwm4-themes) +# +# some pkgs from xfce4-goodies group, except e.g. +# -> ristretto (image viewer) +# -> xfce4-artwork +# -> xfce4-time-out-plugin (take breaks) +# -> xfce4-timer-plugin +# -> xfce4-xkb-plugin (keyboard layouts) +# -> thunar-media-tags-plugin +depends+=(mousepad xfce4-genmon-plugin xfce4-notifyd xfce4-screensaver xfce4-screenshooter xfce4-weather-plugin xfce4-whiskermenu-plugin) # -# thunar optional dependencies: -# - gvfs: for trash support, mounting with udisk and remote -# filesystems (e.g. webdav) -depends+=(gvfs) # keyring/secrets # -> https://wiki.archlinux.org/title/GNOME/Keyring#Installation depends+=(gnome-keyring libsecret) @@ -53,6 +62,31 @@ depends+=(de-p1st-redshift) # sddm themeing depends+=(de-p1st-sddm-theme) +# ============== file manager: thunar and optional dependencies ============== + +# Option1: thunar +depends+=(thunar thunar-media-tags-plugin thunar-volman) +depends+=(tumbler) # thunar thumbnail previews +depends+=(gvfs) # for trash support, mounting with udisk and remote filesystems (e.g. webdav) +# +# Option2: nautilus (GNOME files) +#depends+=(nautilus) +#depends+=(xdg-user-dirs) # nautilus new file templates +#depends+=(python-nautilus) # e.g. Nextcloud integration +#depends+=(chromium cmark-gfm) # md-to-pdf script depends on these two packages + +# compression/archiving +# -> https://docs.xfce.org/xfce/thunar/archive#supported_archive_managers +# +# Option1: thunar and xarchiver +#depends+=(thunar-archive-plugin xarchiver p7zip unzip zip unrar) +# +# Option2: thunar and file-roller +depends+=(thunar-archive-plugin file-roller p7zip unrar) +# +# Option3: nautilus and file-roller +# TODO + # ============== audio ============== # pulseaudio - base depends+=('pulseaudio' 'pulseaudio-alsa' 'pavucontrol') @@ -78,16 +112,16 @@ depends+=(de-p1st-wallpaper) # x11 keyboard layouts depends+=(de-p1st-keyboard-x11) -# ============== compression/archiving ============== -# https://docs.xfce.org/xfce/thunar/archive#supported_archive_managers -#depends+=(thunar-archive-plugin xarchiver p7zip unzip zip unrar) -depends+=(thunar-archive-plugin file-roller p7zip unrar) +optdepends=() # https://wiki.archlinux.org/title/GNOME/Keyring#Manage_using_GUI -optdepends=('seahorse: Manage the contents of GNOME Keyring; manage GPG keys') +optdepends+=('seahorse: Manage the contents of GNOME Keyring; manage GPG keys') package() { + # copy nautilus script + cp md-to-pdf/md-to-pdf "${_reponame}/pkg/${pkgname}"/.local/share/nautilus/scripts/md-to-pdf + # cd into de-p1st-xfce4 package dir cd "${_reponame}/pkg/${pkgname}" install -Dm0644 img/face.jpg "$pkgdir"/etc/skel/.face @@ -95,8 +129,8 @@ package() { # Adding a xml configuration to /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/*.xml does not work. # (It will not be copied to ~/.config/xfce4/xfconf/xfce-perchannel-xml/*.xml) # Thus we place it in the skeleton for new users! - - # See comments in individual files in directory "config" + # -> See comments in individual files in directory "config" + # -> Additionally there is the file .config/user-dirs.dirs for nautilus new file templates mkdir -p "$pkgdir"/etc/skel/ cp -ra config "$pkgdir"/etc/skel/.config @@ -106,4 +140,11 @@ package() { # === display manager === install -Dm0644 systemd.preset "$pkgdir"/usr/lib/systemd/system-preset/20-"$pkgname".preset install -Dm0644 p1st-settings.conf "$pkgdir"/etc/sddm.conf.d/p1st-settings.conf + + # === nautilus scripts === + mkdir -p "$pkgdir"/etc/skel/ + cp -ra .local "$pkgdir"/etc/skel/.local + mkdir -p "$pkgdir"/etc/skel/Templates/ + touch "$pkgdir"/etc/skel/Templates/new_md.md + touch "$pkgdir"/etc/skel/Templates/new_txt.txt } diff --git a/pkg/de-p1st-xfce4/config/user-dirs.dirs b/pkg/de-p1st-xfce4/config/user-dirs.dirs new file mode 100644 index 0000000..9ad2d2e --- /dev/null +++ b/pkg/de-p1st-xfce4/config/user-dirs.dirs @@ -0,0 +1,15 @@ +# This file is written by xdg-user-dirs-update +# If you want to change or add directories, just edit the line you're +# interested in. All local changes will be retained on the next run. +# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped +# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an +# absolute path. No other format is supported. +# +XDG_DESKTOP_DIR="$HOME/Desktop" +XDG_DOWNLOAD_DIR="$HOME/Downloads" +XDG_TEMPLATES_DIR="$HOME/Templates" +XDG_PUBLICSHARE_DIR="$HOME/" +XDG_DOCUMENTS_DIR="$HOME/" +XDG_MUSIC_DIR="$HOME/Music" +XDG_PICTURES_DIR="$HOME/Pictures" +XDG_VIDEOS_DIR="$HOME/"