From f5b6ed07b2fed12bf1c762242d704abb225fc747 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Mon, 6 Sep 2021 12:52:19 +0200 Subject: [PATCH] xfce4: nautilus as default file manager --- pkg/de-p1st-xfce4/PKGBUILD | 15 +++++++-------- .../{config => skel/.config}/user-dirs.dirs | 0 .../xfce4/panel/launcher-8/16218680691.desktop | 0 .../.config}/xfce4/panel/launcher-99/99.desktop | 0 .../xfce4/xfconf/xfce-perchannel-xml/displays.xml | 0 .../xfce4/xfconf/xfce-perchannel-xml/thunar.xml | 0 .../xfconf/xfce-perchannel-xml/xfce4-desktop.xml | 0 .../xfconf/xfce-perchannel-xml/xfce4-panel.xml | 0 .../xfce-perchannel-xml/xfce4-power-manager.xml | 0 .../xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml | 0 .../skel_nautilus/.config/mimeapps.list | 1 + .../skel_nautilus/.config/xfce4/helpers.rc | 1 + .../.local}/share/nautilus/scripts/open-terminal | 0 .../skel_nautilus/Templates/new_md.md | 0 .../skel_nautilus/Templates/new_txt.txt | 0 15 files changed, 9 insertions(+), 8 deletions(-) rename pkg/de-p1st-xfce4/{config => skel/.config}/user-dirs.dirs (100%) rename pkg/de-p1st-xfce4/{config => skel/.config}/xfce4/panel/launcher-8/16218680691.desktop (100%) rename pkg/de-p1st-xfce4/{config => skel/.config}/xfce4/panel/launcher-99/99.desktop (100%) rename pkg/de-p1st-xfce4/{config => skel/.config}/xfce4/xfconf/xfce-perchannel-xml/displays.xml (100%) rename pkg/de-p1st-xfce4/{config => skel/.config}/xfce4/xfconf/xfce-perchannel-xml/thunar.xml (100%) rename pkg/de-p1st-xfce4/{config => skel/.config}/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml (100%) rename pkg/de-p1st-xfce4/{config => skel/.config}/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml (100%) rename pkg/de-p1st-xfce4/{config => skel/.config}/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml (100%) rename pkg/de-p1st-xfce4/{config => skel/.config}/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml (100%) create mode 100644 pkg/de-p1st-xfce4/skel_nautilus/.config/mimeapps.list create mode 100644 pkg/de-p1st-xfce4/skel_nautilus/.config/xfce4/helpers.rc rename pkg/de-p1st-xfce4/{local => skel_nautilus/.local}/share/nautilus/scripts/open-terminal (100%) create mode 100644 pkg/de-p1st-xfce4/skel_nautilus/Templates/new_md.md create mode 100644 pkg/de-p1st-xfce4/skel_nautilus/Templates/new_txt.txt diff --git a/pkg/de-p1st-xfce4/PKGBUILD b/pkg/de-p1st-xfce4/PKGBUILD index c388129..86e4b71 100644 --- a/pkg/de-p1st-xfce4/PKGBUILD +++ b/pkg/de-p1st-xfce4/PKGBUILD @@ -9,6 +9,7 @@ arch=('any') url="https://codeberg.org/privacy1st/${_reponame}" license=('MIT') makedepends=('git') +makedepends+=('rsync') # to merge two directories 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" "git+https://codeberg.org/privacy1st/md-to-pdf.git") @@ -136,8 +137,8 @@ package() { # Thus we place it in the skeleton for new users! # -> 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 + mkdir -p "$pkgdir"/etc/ + rsync -av skel/ "$pkgdir"/etc/skel/ # === shortcuts === install -Dm0544 xfce4-keyboard-shortcuts.xml.holoscript "$pkgdir"/usr/share/holo/files/20-"$pkgname"/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml.holoscript @@ -146,10 +147,8 @@ package() { 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 + # === nautilus === + # -> default file manager and nautilus scripts + mkdir -p "$pkgdir"/etc/ + rsync -av skel_nautilus/ "$pkgdir"/etc/skel/ } diff --git a/pkg/de-p1st-xfce4/config/user-dirs.dirs b/pkg/de-p1st-xfce4/skel/.config/user-dirs.dirs similarity index 100% rename from pkg/de-p1st-xfce4/config/user-dirs.dirs rename to pkg/de-p1st-xfce4/skel/.config/user-dirs.dirs diff --git a/pkg/de-p1st-xfce4/config/xfce4/panel/launcher-8/16218680691.desktop b/pkg/de-p1st-xfce4/skel/.config/xfce4/panel/launcher-8/16218680691.desktop similarity index 100% rename from pkg/de-p1st-xfce4/config/xfce4/panel/launcher-8/16218680691.desktop rename to pkg/de-p1st-xfce4/skel/.config/xfce4/panel/launcher-8/16218680691.desktop diff --git a/pkg/de-p1st-xfce4/config/xfce4/panel/launcher-99/99.desktop b/pkg/de-p1st-xfce4/skel/.config/xfce4/panel/launcher-99/99.desktop similarity index 100% rename from pkg/de-p1st-xfce4/config/xfce4/panel/launcher-99/99.desktop rename to pkg/de-p1st-xfce4/skel/.config/xfce4/panel/launcher-99/99.desktop diff --git a/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/displays.xml b/pkg/de-p1st-xfce4/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml similarity index 100% rename from pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/displays.xml rename to pkg/de-p1st-xfce4/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml diff --git a/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/pkg/de-p1st-xfce4/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml similarity index 100% rename from pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml rename to pkg/de-p1st-xfce4/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml diff --git a/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/pkg/de-p1st-xfce4/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml similarity index 100% rename from pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml rename to pkg/de-p1st-xfce4/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml diff --git a/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/pkg/de-p1st-xfce4/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml similarity index 100% rename from pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml rename to pkg/de-p1st-xfce4/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml diff --git a/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml b/pkg/de-p1st-xfce4/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml similarity index 100% rename from pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml rename to pkg/de-p1st-xfce4/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml diff --git a/pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/pkg/de-p1st-xfce4/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml similarity index 100% rename from pkg/de-p1st-xfce4/config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml rename to pkg/de-p1st-xfce4/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml diff --git a/pkg/de-p1st-xfce4/skel_nautilus/.config/mimeapps.list b/pkg/de-p1st-xfce4/skel_nautilus/.config/mimeapps.list new file mode 100644 index 0000000..1565ad8 --- /dev/null +++ b/pkg/de-p1st-xfce4/skel_nautilus/.config/mimeapps.list @@ -0,0 +1 @@ +"$pkgdir"/etc/skel/.config \ No newline at end of file diff --git a/pkg/de-p1st-xfce4/skel_nautilus/.config/xfce4/helpers.rc b/pkg/de-p1st-xfce4/skel_nautilus/.config/xfce4/helpers.rc new file mode 100644 index 0000000..0cbc765 --- /dev/null +++ b/pkg/de-p1st-xfce4/skel_nautilus/.config/xfce4/helpers.rc @@ -0,0 +1 @@ +FileManager=nautilus diff --git a/pkg/de-p1st-xfce4/local/share/nautilus/scripts/open-terminal b/pkg/de-p1st-xfce4/skel_nautilus/.local/share/nautilus/scripts/open-terminal similarity index 100% rename from pkg/de-p1st-xfce4/local/share/nautilus/scripts/open-terminal rename to pkg/de-p1st-xfce4/skel_nautilus/.local/share/nautilus/scripts/open-terminal diff --git a/pkg/de-p1st-xfce4/skel_nautilus/Templates/new_md.md b/pkg/de-p1st-xfce4/skel_nautilus/Templates/new_md.md new file mode 100644 index 0000000..e69de29 diff --git a/pkg/de-p1st-xfce4/skel_nautilus/Templates/new_txt.txt b/pkg/de-p1st-xfce4/skel_nautilus/Templates/new_txt.txt new file mode 100644 index 0000000..e69de29