From 26f22bf49d2418a1e0ecc16fd48aa78d174f7836 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Fri, 30 Sep 2022 07:25:43 -0400 Subject: [PATCH 01/13] renamed: usr/lib/systemd/system.conf.d/30_kicksecure.conf -> usr/lib/systemd/system.conf.d/30_kicksecure-desktop-config-dist-zsh.conf --- ...kicksecure.conf => 30_kicksecure-desktop-config-dist-zsh.conf} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename usr/lib/systemd/system.conf.d/{30_kicksecure.conf => 30_kicksecure-desktop-config-dist-zsh.conf} (100%) diff --git a/usr/lib/systemd/system.conf.d/30_kicksecure.conf b/usr/lib/systemd/system.conf.d/30_kicksecure-desktop-config-dist-zsh.conf similarity index 100% rename from usr/lib/systemd/system.conf.d/30_kicksecure.conf rename to usr/lib/systemd/system.conf.d/30_kicksecure-desktop-config-dist-zsh.conf From d9efa1d54ff8bc31e319470befc8051dd00f71d1 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Fri, 30 Sep 2022 07:34:06 -0400 Subject: [PATCH 02/13] bumped changelog version --- changelog.upstream | 34 ++++++++++++++++++++++++++++++++++ debian/changelog | 6 ++++++ 2 files changed, 40 insertions(+) diff --git a/changelog.upstream b/changelog.upstream index bb95c0b..f559a3b 100644 --- a/changelog.upstream +++ b/changelog.upstream @@ -1,3 +1,37 @@ +commit 26f22bf49d2418a1e0ecc16fd48aa78d174f7836 +Author: Patrick Schleizer +Date: Fri Sep 30 07:25:43 2022 -0400 + + renamed: usr/lib/systemd/system.conf.d/30_kicksecure.conf -> usr/lib/systemd/system.conf.d/30_kicksecure-desktop-config-dist-zsh.conf + +commit 533f7353fb1ebcb1e267af6248c6503b01d823e8 +Merge: a361d37 e7b499a +Author: Patrick Schleizer +Date: Fri Sep 30 07:24:44 2022 -0400 + + Merge remote-tracking branch 'github-kicksecure/master' + +commit e7b499aecc7581951e9caaf26b0c96aeff13c8ad +Merge: a361d37 0e6ec56 +Author: Patrick Schleizer +Date: Fri Sep 30 07:21:29 2022 -0400 + + Merge pull request #1 from nyxnor/master + + add zsh files + +commit 0e6ec566a99d7805a9b33895b2a66e2dbb317a16 +Author: nyxnor +Date: Thu Sep 29 21:31:56 2022 +0000 + + add zsh files + +commit a361d370ed8c7da743b273c2e7d52ddd1348c262 +Author: Patrick Schleizer +Date: Wed May 25 06:05:44 2022 -0400 + + bumped changelog version + commit 29ee6b641f49122a929908fbf666d76da4c59dbc Author: Patrick Schleizer Date: Fri May 20 15:27:04 2022 -0400 diff --git a/debian/changelog b/debian/changelog index 1e26615..759d485 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +desktop-config-dist (3:5.2-1) unstable; urgency=medium + + * New upstream version (local package). + + -- Patrick Schleizer Fri, 30 Sep 2022 11:34:06 +0000 + desktop-config-dist (3:5.1-1) unstable; urgency=medium * New upstream version (local package). From 64761c8f525b991d40c842f05878ce2ad4469621 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Fri, 30 Sep 2022 07:37:43 -0400 Subject: [PATCH 03/13] make executable to fix lintian warning https://forums.whonix.org/t/change-default-shell-from-bash-to-zsh-by-default/14792/30 --- etc/zsh/dist/.aliasrc | 0 etc/zsh/dist/.shrc | 0 etc/zsh/dist/.zshrc | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 etc/zsh/dist/.aliasrc mode change 100644 => 100755 etc/zsh/dist/.shrc mode change 100644 => 100755 etc/zsh/dist/.zshrc diff --git a/etc/zsh/dist/.aliasrc b/etc/zsh/dist/.aliasrc old mode 100644 new mode 100755 diff --git a/etc/zsh/dist/.shrc b/etc/zsh/dist/.shrc old mode 100644 new mode 100755 diff --git a/etc/zsh/dist/.zshrc b/etc/zsh/dist/.zshrc old mode 100644 new mode 100755 From adc380ad667ba8ba06d68b9e0cc66964249d1c6b Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Fri, 30 Sep 2022 07:39:04 -0400 Subject: [PATCH 04/13] minor --- etc/zsh/dist/.aliasrc | 3 --- etc/zsh/dist/.shrc | 2 -- etc/zsh/dist/.zshrc | 13 ++++++------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/etc/zsh/dist/.aliasrc b/etc/zsh/dist/.aliasrc index a809a7f..3b4e91b 100755 --- a/etc/zsh/dist/.aliasrc +++ b/etc/zsh/dist/.aliasrc @@ -21,6 +21,3 @@ if command -v dircolors >/dev/null; then export LESS_TERMCAP_us=$'\E[1;32m' # begin underline export LESS_TERMCAP_ue=$'\E[0m' # reset underline fi - - - diff --git a/etc/zsh/dist/.shrc b/etc/zsh/dist/.shrc index 0267994..e25d8be 100755 --- a/etc/zsh/dist/.shrc +++ b/etc/zsh/dist/.shrc @@ -48,5 +48,3 @@ fi ## ==================== ## End Whonix section - - diff --git a/etc/zsh/dist/.zshrc b/etc/zsh/dist/.zshrc index 9f084f5..686fc34 100755 --- a/etc/zsh/dist/.zshrc +++ b/etc/zsh/dist/.zshrc @@ -22,11 +22,11 @@ _git_prompt_info() { ref=${$(command git symbolic-ref HEAD 2> /dev/null)#refs/heads/} || \ ref=${$(command git rev-parse HEAD 2>/dev/null)[1][1,7]} || \ return - fi + fi case "$TERM" in - *-256color|xterm-kitty) branchcolor=$'\e[38;5;31m' ;; - *-88color|rxvt-unicode) branchcolor=$'\e[38;5;22m' ;; - *) branchcolor=$'\e[00;94m' ;; + *-256color|xterm-kitty) branchcolor=$'\e[38;5;31m' ;; + *-88color|rxvt-unicode) branchcolor=$'\e[38;5;22m' ;; + *) branchcolor=$'\e[00;94m' ;; esac print -Pn '(%%{$branchcolor%%}%20>...>$ref%<<%%{\e[00m%%})' } @@ -57,7 +57,7 @@ reset_color=$'\e[00m' PROMPT="%{$fg[red]%}[\$(_get_dist_prompt)%{$usercolor%}%n%{$reset_color%}%{$reset_color%} %{$dircolor%}%~%{$reset_color%}%{$fg[red]%}]%{$reset_color%}%# " ## developer prompt #PROMPT="%{$fg[red]%}[\$(_get_dist_prompt)%{$usercolor%}%n%{$reset_color%}%{$reset_color%} %{$dircolor%}%30<...<%~%<<%{$reset_color%}\$(_git_prompt_info)%{$fg[red]%}]%{$reset_color%}%# " -## print previous command exit code +## print previous command exit code #RPS1="%(?..(%{"$'\e[01;35m'"%}%?%{$reset_color%}%)%<<)" ## necessary when there is functions inside the prompt @@ -204,7 +204,7 @@ zle -N zle-line-init ## https://unix.stackexchange.com/questions/433273/changing-cursor-style-based-on-mode-in-both-zsh-and-vim ## The only result that worked is by adding this to the vimrc: ## autocmd VimEnter * silent exec "! echo -ne '\e[1 q'" -## autocmd VimLeave * silent exec "! echo -ne '\e[5 q'" +## autocmd VimLeave * silent exec "! echo -ne '\e[5 q'" autoload -Uz select-word-style @@ -284,4 +284,3 @@ fi if test -f /etc/zsh_command_not_found; then source /etc/zsh_command_not_found fi - From 86ae7cd7e274fea7f64209f1c22d1a1a3bf7762a Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Fri, 30 Sep 2022 08:18:41 -0400 Subject: [PATCH 05/13] ignore lintian error desktop-config-dist: missing-dep-for-interpreter zsh => zsh | zsh-beta (etc/zsh/dist/.zshrc) #!zsh to avoid zsh being a dependency of this package --- make-helper-overrides.bsh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 make-helper-overrides.bsh diff --git a/make-helper-overrides.bsh b/make-helper-overrides.bsh new file mode 100755 index 0000000..e67b418 --- /dev/null +++ b/make-helper-overrides.bsh @@ -0,0 +1,6 @@ +#!/bin/bash + +## Copyright (C) 2022 - 2022 ENCRYPTED SUPPORT LP +## See the file COPYING for copying conditions. + +genmkfile_lintian_post_opts+=" --suppress-tags missing-dep-for-interpreter " From 6058791683507c5c17fafdcf364e27efa49e2169 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Fri, 30 Sep 2022 08:19:46 -0400 Subject: [PATCH 06/13] comment --- make-helper-overrides.bsh | 1 + 1 file changed, 1 insertion(+) diff --git a/make-helper-overrides.bsh b/make-helper-overrides.bsh index e67b418..38ce558 100755 --- a/make-helper-overrides.bsh +++ b/make-helper-overrides.bsh @@ -3,4 +3,5 @@ ## Copyright (C) 2022 - 2022 ENCRYPTED SUPPORT LP ## See the file COPYING for copying conditions. +## Avoid zsh being a dependency of this package due to /etc/zsh/dist folder. genmkfile_lintian_post_opts+=" --suppress-tags missing-dep-for-interpreter " From 7d31cf50771b0e92d1625e3663a5e12079276247 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Fri, 30 Sep 2022 08:43:35 -0400 Subject: [PATCH 07/13] bumped changelog version --- changelog.upstream | 36 ++++++++++++++++++++++++++++++++++++ debian/changelog | 6 ++++++ 2 files changed, 42 insertions(+) diff --git a/changelog.upstream b/changelog.upstream index f559a3b..eae5861 100644 --- a/changelog.upstream +++ b/changelog.upstream @@ -1,3 +1,39 @@ +commit 6058791683507c5c17fafdcf364e27efa49e2169 +Author: Patrick Schleizer +Date: Fri Sep 30 08:19:46 2022 -0400 + + comment + +commit 86ae7cd7e274fea7f64209f1c22d1a1a3bf7762a +Author: Patrick Schleizer +Date: Fri Sep 30 08:18:41 2022 -0400 + + ignore lintian error + + desktop-config-dist: missing-dep-for-interpreter zsh => zsh | zsh-beta (etc/zsh/dist/.zshrc) #!zsh + + to avoid zsh being a dependency of this package + +commit adc380ad667ba8ba06d68b9e0cc66964249d1c6b +Author: Patrick Schleizer +Date: Fri Sep 30 07:39:04 2022 -0400 + + minor + +commit 64761c8f525b991d40c842f05878ce2ad4469621 +Author: Patrick Schleizer +Date: Fri Sep 30 07:37:43 2022 -0400 + + make executable to fix lintian warning + + https://forums.whonix.org/t/change-default-shell-from-bash-to-zsh-by-default/14792/30 + +commit d9efa1d54ff8bc31e319470befc8051dd00f71d1 +Author: Patrick Schleizer +Date: Fri Sep 30 07:34:06 2022 -0400 + + bumped changelog version + commit 26f22bf49d2418a1e0ecc16fd48aa78d174f7836 Author: Patrick Schleizer Date: Fri Sep 30 07:25:43 2022 -0400 diff --git a/debian/changelog b/debian/changelog index 759d485..2e71056 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +desktop-config-dist (3:5.3-1) unstable; urgency=medium + + * New upstream version (local package). + + -- Patrick Schleizer Fri, 30 Sep 2022 12:43:35 +0000 + desktop-config-dist (3:5.2-1) unstable; urgency=medium * New upstream version (local package). From 62347318519e7a65ab4c637f2e1ad76dc462a016 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Fri, 30 Sep 2022 09:01:08 -0400 Subject: [PATCH 08/13] genmkfile debinstfile --- debian/desktop-config-dist.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/desktop-config-dist.install b/debian/desktop-config-dist.install index 7c38920..bc5f34d 100644 --- a/debian/desktop-config-dist.install +++ b/debian/desktop-config-dist.install @@ -1,7 +1,7 @@ ## Copyright (C) 2020 - 2022 ENCRYPTED SUPPORT LP ## See the file COPYING for copying conditions. -## This file was generated using genmkfile 'make debinstfile'. +## This file was generated using 'genmkfile debinstfile'. etc/* usr/* From c84605e61dbeedd09159a57890c85508cf8143c5 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Sat, 1 Oct 2022 10:10:48 -0400 Subject: [PATCH 09/13] split into desktop-config-dist and desktop-config-dist-dependencies https://forums.whonix.org/t/change-default-shell-from-bash-to-zsh-by-default/14792 --- debian/control | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index c63a295..a6f1521 100644 --- a/debian/control +++ b/debian/control @@ -17,10 +17,7 @@ Architecture: all Provides: whonix-xfce-desktop-config Replaces: whonix-xfce-desktop-config Conficts: whonix-xfce-desktop-config -Depends: xfce4-whiskermenu-plugin, xfce4-genmon-plugin, - arc-theme, gnome-themes-extra, gnome-themes-extra-data, gtk2-engines-murrine, - gnome-colors-common, adwaita-icon-theme, - ${misc:Depends} +Depends: ${misc:Depends} Description: Configuration for Derivative Xfce Desktop Sets desktop and display setting, wallpaper and desktop icons. Sets icon theme and style. @@ -42,3 +39,14 @@ Description: Configuration for Derivative Xfce Desktop Disables thumbnails for better security. . Disables save on exit for better privacy. + +Package: desktop-config-dist-dependencies +Architecture: all +Depends: xfce4-whiskermenu-plugin, xfce4-genmon-plugin, + arc-theme, gnome-themes-extra, gnome-themes-extra-data, gtk2-engines-murrine, + gnome-colors-common, adwaita-icon-theme, + ${misc:Depends} +Description: Dependencies of desktop-config-dist + A metapackage with dependencies for package desktop-config-dist. + . + Only useful for Non-Qubes. Not useful in Qubes. From 3ede5b548979f41610119eef8431683c2b7bb986 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Sat, 1 Oct 2022 10:15:53 -0400 Subject: [PATCH 10/13] description --- README.md | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6cdb122..9103814 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Configuration for Derivative Xfce Desktop # +# Configuration for Derivative Desktop # Sets desktop and display setting, wallpaper and desktop icons. Sets icon theme and style. diff --git a/debian/control b/debian/control index a6f1521..1ea2f6d 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Provides: whonix-xfce-desktop-config Replaces: whonix-xfce-desktop-config Conficts: whonix-xfce-desktop-config Depends: ${misc:Depends} -Description: Configuration for Derivative Xfce Desktop +Description: Configuration for Derivative Desktop Sets desktop and display setting, wallpaper and desktop icons. Sets icon theme and style. Settings for the default panel aka task bar, like panel position/color/size From e4a88c57057e5fe5f714870d407f2f8eb00152e5 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Sat, 1 Oct 2022 10:18:47 -0400 Subject: [PATCH 11/13] description --- README.md | 4 ++++ debian/control | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/README.md b/README.md index 9103814..86ed168 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,10 @@ Disables thumbnails for better security. Disables save on exit for better privacy. +Ships `zsh` derivative configuration settings folder `/etc/zsh/dist`. +But does not configure `zsh` as default shell. +(That is up to package `dist-base-files`.) + ## How to install `desktop-config-dist` using apt-get ## 1\. Download the APT Signing Key. diff --git a/debian/control b/debian/control index 1ea2f6d..288b5b9 100644 --- a/debian/control +++ b/debian/control @@ -39,6 +39,10 @@ Description: Configuration for Derivative Desktop Disables thumbnails for better security. . Disables save on exit for better privacy. + . + Ships `zsh` derivative configuration settings folder `/etc/zsh/dist`. + But does not configure `zsh` as default shell. + (That is up to package `dist-base-files`.) Package: desktop-config-dist-dependencies Architecture: all From 9a55251b271636d93cd12c6fc7e69394a6870c44 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Sat, 1 Oct 2022 10:22:51 -0400 Subject: [PATCH 12/13] description --- README.md | 2 ++ debian/control | 2 ++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index 86ed168..fd09880 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,8 @@ Disables thumbnails for better security. Disables save on exit for better privacy. Ships `zsh` derivative configuration settings folder `/etc/zsh/dist`. +Set environment variable `ZDOTDIR=/etc/zsh/dist` through use of file +`/usr/lib/systemd/system.conf.d/30_kicksecure-desktop-config-dist-zsh.conf`. But does not configure `zsh` as default shell. (That is up to package `dist-base-files`.) diff --git a/debian/control b/debian/control index 288b5b9..a1dbeb1 100644 --- a/debian/control +++ b/debian/control @@ -41,6 +41,8 @@ Description: Configuration for Derivative Desktop Disables save on exit for better privacy. . Ships `zsh` derivative configuration settings folder `/etc/zsh/dist`. + Set environment variable `ZDOTDIR=/etc/zsh/dist` through use of file + `/usr/lib/systemd/system.conf.d/30_kicksecure-desktop-config-dist-zsh.conf`. But does not configure `zsh` as default shell. (That is up to package `dist-base-files`.) From ba82079af7be30cbb0f0ecf1f8a77482ada70b45 Mon Sep 17 00:00:00 2001 From: Patrick Schleizer Date: Sat, 1 Oct 2022 10:28:03 -0400 Subject: [PATCH 13/13] bumped changelog version --- changelog.upstream | 38 ++++++++++++++++++++++++++++++++++++++ debian/changelog | 6 ++++++ 2 files changed, 44 insertions(+) diff --git a/changelog.upstream b/changelog.upstream index eae5861..00edfa0 100644 --- a/changelog.upstream +++ b/changelog.upstream @@ -1,3 +1,41 @@ +commit 9a55251b271636d93cd12c6fc7e69394a6870c44 +Author: Patrick Schleizer +Date: Sat Oct 1 10:22:51 2022 -0400 + + description + +commit e4a88c57057e5fe5f714870d407f2f8eb00152e5 +Author: Patrick Schleizer +Date: Sat Oct 1 10:18:47 2022 -0400 + + description + +commit 3ede5b548979f41610119eef8431683c2b7bb986 +Author: Patrick Schleizer +Date: Sat Oct 1 10:15:53 2022 -0400 + + description + +commit c84605e61dbeedd09159a57890c85508cf8143c5 +Author: Patrick Schleizer +Date: Sat Oct 1 10:10:48 2022 -0400 + + split into desktop-config-dist and desktop-config-dist-dependencies + + https://forums.whonix.org/t/change-default-shell-from-bash-to-zsh-by-default/14792 + +commit 62347318519e7a65ab4c637f2e1ad76dc462a016 +Author: Patrick Schleizer +Date: Fri Sep 30 09:01:08 2022 -0400 + + genmkfile debinstfile + +commit 7d31cf50771b0e92d1625e3663a5e12079276247 +Author: Patrick Schleizer +Date: Fri Sep 30 08:43:35 2022 -0400 + + bumped changelog version + commit 6058791683507c5c17fafdcf364e27efa49e2169 Author: Patrick Schleizer Date: Fri Sep 30 08:19:46 2022 -0400 diff --git a/debian/changelog b/debian/changelog index 2e71056..1fd4ae9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +desktop-config-dist (3:5.4-1) unstable; urgency=medium + + * New upstream version (local package). + + -- Patrick Schleizer Sat, 01 Oct 2022 14:28:03 +0000 + desktop-config-dist (3:5.3-1) unstable; urgency=medium * New upstream version (local package).