From 1e3b4217c27bf74eb4dff6e2e389c4b25e8e712b Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Mon, 14 Jun 2021 23:39:19 +0200 Subject: [PATCH] gnupg and xfce4 changes --- pkg/de-p1st-gnupg/PKGBUILD | 9 ++- pkg/de-p1st-installer/example-vbox.cfg | 2 + pkg/de-p1st-smartcard/README.md | 10 ++- pkg/de-p1st-xfce4/PKGBUILD | 7 +- pkg/de-p1st-xfce4/TESTED | 5 +- .../config/xfce4/panel/whiskermenu-7.rc | 79 +++++++++++++++++++ 6 files changed, 102 insertions(+), 10 deletions(-) create mode 100644 pkg/de-p1st-xfce4/config/xfce4/panel/whiskermenu-7.rc diff --git a/pkg/de-p1st-gnupg/PKGBUILD b/pkg/de-p1st-gnupg/PKGBUILD index 9ba3f2d..dc37ae3 100644 --- a/pkg/de-p1st-gnupg/PKGBUILD +++ b/pkg/de-p1st-gnupg/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=gnupg _reponame=arch pkgname="de-p1st-$_pkgname" -pkgver=0.0.2 +pkgver=0.0.3 pkgrel=2 pkgdesc="gnupg with configuration" arch=('any') @@ -27,7 +27,8 @@ build() { package() { cd "${_reponame}/pkg/${pkgname}" - install -Dm0644 gpg.conf "$pkgdir"/etc/skel/.gnupg/gpg.conf - install -Dm0644 gpg-agent.conf "$pkgdir"/etc/skel/.gnupg/gpg-agent.conf - install -Dm0644 99_gnupg.sh "$pkgdir"/etc/profile.d/99_gnupg.sh + install -dm0700 "$pkgdir"/etc/skel/.gnupg/ + install -Dm0600 gpg.conf "$pkgdir"/etc/skel/.gnupg/gpg.conf + install -Dm0600 gpg-agent.conf "$pkgdir"/etc/skel/.gnupg/gpg-agent.conf + install -Dm0600 99_gnupg.sh "$pkgdir"/etc/profile.d/99_gnupg.sh } diff --git a/pkg/de-p1st-installer/example-vbox.cfg b/pkg/de-p1st-installer/example-vbox.cfg index 57a5469..c114edf 100644 --- a/pkg/de-p1st-installer/example-vbox.cfg +++ b/pkg/de-p1st-installer/example-vbox.cfg @@ -42,3 +42,5 @@ ADDITIONAL_PKGS+=('mkinitcpio' 'de-p1st-kernel-lts' 'de-p1st-ucode-placeholder' # # XFCE4 desktop with HiDPI ADDITIONAL_PKGS+=('de-p1st-gpu-generic' 'de-p1st-xfce4-hidpi' 'de-p1st-sddm-autologin-yoda' 'de-p1st-sddm-theme-default') +# smartcard +ADDITIONAL_PKGS+=('de-p1st-smartcard') \ No newline at end of file diff --git a/pkg/de-p1st-smartcard/README.md b/pkg/de-p1st-smartcard/README.md index 9249b2a..de9582e 100644 --- a/pkg/de-p1st-smartcard/README.md +++ b/pkg/de-p1st-smartcard/README.md @@ -1,18 +1,20 @@ ## Using a smartcard -* [](https://wiki.archlinux.org/index.php/Smartcards) +* archwiki [Smartcards](https://wiki.archlinux.org/index.php/Smartcards) -``` +```shell sudo pacman -S ccid opensc ``` * If the card reader does not have a PIN pad, append the line(s) and set `enable_pinpad = false` in the opensc configuration file `/etc/opensc.conf`: -``` +```shell echo "enable_pinpad = false" | sudo tee -a /etc/opensc.conf >/dev/null sudo systemctl enable --now pcscd.service ``` ## Configuration -* `sudo pacman -S de-p1st-gnupg` +```shell +sudo pacman -S de-p1st-gnupg +``` diff --git a/pkg/de-p1st-xfce4/PKGBUILD b/pkg/de-p1st-xfce4/PKGBUILD index 75cf43e..3ee61ca 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.15 +pkgver=0.0.16 pkgrel=1 pkgdesc="XFCE4 with configuration" arch=('any') @@ -62,6 +62,9 @@ depends+=(de-p1st-theme) # x11 keyboard layouts depends+=(de-p1st-keyboard-x11) +# ============== browser ============== +depends+=(firefox) + package() { cd "${_reponame}/pkg/${pkgname}" @@ -81,6 +84,8 @@ package() { # === panel === # config/xfce4/xfconf/xfce4-perchannel-xml/xfce4-panel.xml # config/xfce4/panel/launcher-8/16218680691.desktop + # === Whisker Menu === + # config/xfce4/panel/whiskermenu-7.rc # mkdir -p "$pkgdir"/etc/skel/ cp -ra config "$pkgdir"/etc/skel/.config diff --git a/pkg/de-p1st-xfce4/TESTED b/pkg/de-p1st-xfce4/TESTED index 3d8fadc..0c14864 100644 --- a/pkg/de-p1st-xfce4/TESTED +++ b/pkg/de-p1st-xfce4/TESTED @@ -1,4 +1,7 @@ +.face shown in Whisker Menu desktop-icons on primary display is set to "true" 2 workspaces (instead of 4) "screenshot" launcher works -lower (2nd) panel removed \ No newline at end of file +lower (2nd) panel removed + +TODO: Whisker Menu: Favourite: Firefox \ No newline at end of file diff --git a/pkg/de-p1st-xfce4/config/xfce4/panel/whiskermenu-7.rc b/pkg/de-p1st-xfce4/config/xfce4/panel/whiskermenu-7.rc new file mode 100644 index 0000000..5ab299d --- /dev/null +++ b/pkg/de-p1st-xfce4/config/xfce4/panel/whiskermenu-7.rc @@ -0,0 +1,79 @@ +favorites=firefox.desktop,xfce4-mail-reader.desktop,xfce4-file-manager.desktop,xfce4-terminal-emulator.desktop +recent=firefox.desktop,xfce4-terminal-emulator.desktop +button-icon=xfce4-whiskermenu +button-single-row=false +show-button-title=false +show-button-icon=true +launcher-show-name=true +launcher-show-description=true +launcher-show-tooltip=true +item-icon-size=3 +hover-switch-category=false +category-show-name=true +category-icon-size=1 +load-hierarchy=false +view-as-icons=true +default-category=0 +recent-items-max=10 +favorites-in-recent=true +position-search-alternate=true +position-commands-alternate=false +position-categories-alternate=true +stay-on-focus-out=false +confirm-session-command=true +menu-width=450 +menu-height=500 +menu-opacity=100 +command-settings=xfce4-settings-manager +show-command-settings=true +command-lockscreen=xflock4 +show-command-lockscreen=true +command-switchuser=gdmflexiserver +show-command-switchuser=false +command-logoutuser=xfce4-session-logout --logout --fast +show-command-logoutuser=false +command-restart=xfce4-session-logout --reboot --fast +show-command-restart=false +command-shutdown=xfce4-session-logout --halt --fast +show-command-shutdown=false +command-suspend=xfce4-session-logout --suspend +show-command-suspend=false +command-hibernate=xfce4-session-logout --hibernate +show-command-hibernate=false +command-logout=xfce4-session-logout +show-command-logout=true +command-menueditor=menulibre +show-command-menueditor=true +command-profile=mugshot +show-command-profile=true +search-actions=5 + +[action0] +name=Man Pages +pattern=# +command=exo-open --launch TerminalEmulator man %s +regex=false + +[action1] +name=Web Search +pattern=? +command=exo-open --launch WebBrowser https://duckduckgo.com/?q=%u +regex=false + +[action2] +name=Wikipedia +pattern=!w +command=exo-open --launch WebBrowser https://en.wikipedia.org/wiki/%u +regex=false + +[action3] +name=Run in Terminal +pattern=! +command=exo-open --launch TerminalEmulator %s +regex=false + +[action4] +name=Open URI +pattern=^(file|http|https):\\/\\/(.*)$ +command=exo-open \\0 +regex=true