diff --git a/README.md b/README.md index 19f157c..813af10 100644 --- a/README.md +++ b/README.md @@ -184,6 +184,11 @@ Primary key fingerprint: 3E80 CA1A 8B89 F69C BA57 D98A 76A5 EF90 5444 9A5C - wait for nextcloud to complete syncronisation - this will likely take time. how long depends on the internet speed and the amount of data stored with nextcloud. + + +DOCUMENT CRYPTOMATOR AND KEY UPDATES! AND/OR - CHANGE KEY UPDATES FROM NEXTCLOUD TO CRYPTOMATOR??? OR,,, + + ## step six :: post syncronisation tasks - `syncDirSetup.sh` (will set up `~/syncDir`) @@ -200,28 +205,28 @@ if the system runs nvidia, follow the steps in [nvidia.md](nvidia.md) to set up ## step eight :: post installation tasks - **KITTEN** - - `$ kitten themes 'falcon'` + - `$ kitten themes 'paul millr'` - to list all themes: `$ kitten themes` + - (search for `tropical` ➔ select `tropical neon` ➔ press `M` to modify kitten.conf and start using the theme) - selected themes: - - `kitten themes '1984 dark'` - - `kitten themes 'adwaita darker'` - - `kitten themes 'box'` - - `kitten themes 'copland os'` - - `kitten themes 'cyberpunk neon'` - - `kitten themes 'default'` - - `kitten themes 'encom'` - - `kitten themes 'falcon'` - - `kitten themes 'hachiko'` - - `kitten themes 'neowave'` - - `kitten themes 'papercolor dark'` - - `kitten themes 'paul millr'` - - `kitten themes 'tropical neon'` - - `kitten themes 'ubuntu'` - - `kitten themes 'vibrant ink'` - - `kitten themes 'wez'` - - - - (search for `tropical` ➔ select `tropical neon` ➔ press `M` to modify kitten.conf and start using the theme) + - dark background + - `kitten themes 'adwaita darker'` + - `kitten themes 'encom'` + - `kitten themes 'hachiko'` + - `kitten themes 'paul millr'` + - `kitten themes 'vibrant ink'` + - `kitten themes 'wez'` + - other dark themes + - `kitten themes '1984 dark'` + - `kitten themes 'box'` + - `kitten themes 'copland os'` + - `kitten themes 'cyberpunk neon'` + - `kitten themes 'default'` + - `kitten themes 'falcon'` + - `kitten themes 'neowave'` + - `kitten themes 'papercolor dark'` + - `kitten themes 'tropical neon'` + - `kitten themes 'ubuntu'` - **VSCODIUM** - **local sync** - open extensions and search for `local sync` diff --git a/dots/archinstall/common/packages.txt b/dots/archinstall/common/packages.txt index ecd765a..664bd1c 100644 --- a/dots/archinstall/common/packages.txt +++ b/dots/archinstall/common/packages.txt @@ -36,7 +36,7 @@ aur:hyprmon-bin # multi-monitor profile manager #aur:canon-pixma-mg2500-complete # stand alone driver set (print and scan) for Canon Pixma MG2500 series aur:cryptomator-bin # encryption tool | need to decrypt ssh vault in the cloud #aur:ctpv-git # image previewer for lf -#aur:dragon-drop # simple drag-and-drop source/sink +aur:dragon-drop # simple drag-and-drop source/sink #aur:figlet-fonts # fonts for figlet - ascii #aur:figlet-fonts-extra # extra fonts for figlet - ascii aur:gitkraken # git client @@ -128,10 +128,10 @@ pcmanfm # file manager psensor # graphical hardware temperature monitoring application #reaper # daw #redshift # colour temperature adjustment tool (not maintained) -#rsync # file copying tool -#samba # access samba shares (smb://) and cifs mounts (cifs-utils) +rsync # file copying tool +samba # access samba shares (smb://) and cifs mounts (cifs-utils) #scrot # screenshot cli utility -#seahorse # gui for viewing keyring entries / managing pgp keys +seahorse # gui for viewing keyring entries / managing pgp keys #shotcut # video editor #sigil # multi-platform EPUB2/EPUB3 ebook editor #signal-desktop # signal messenger diff --git a/dots/bash/.bashrc b/dots/bash/.bashrc index fa9d388..7c23a9a 100644 --- a/dots/bash/.bashrc +++ b/dots/bash/.bashrc @@ -28,13 +28,13 @@ alias azurevpnclient="/opt/microsoft/microsoft-azurevpnclient/microsoft-azurevpn alias cp="cp -i" # confirm before overwriting something alias ct="sudo ct" -#alias decrypt="gpg --decrypt" +alias decrypt="gpg --decrypt" alias df='df -h' # human-readable sizes alias diskusage="ncdu -x" alias dragon="dragon-drop --and-exit --all --print-path" alias du="du --summarize --human-readable" alias dus="du --summarize --human-readable * | sort -h" -#alias encrypt="gpg --encrypt --sign --recipient frode@klevstul.com" +alias encrypt="gpg --encrypt --sign --recipient frode@klevstul.com" alias faf="find . -type f -iname" # faf (find a file) alias fif="grep -rnw . -e" # fif (find in file) | https://stackoverflow.com/questions/16956810/find-all-files-containing-a-specific-text-string-on-linux alias gparted="sudo gparted" diff --git a/dots/bin/cryptomatorBackup.sh b/dots/bin/cryptomatorBackup.sh new file mode 100755 index 0000000..8e21e22 --- /dev/null +++ b/dots/bin/cryptomatorBackup.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env bash + +# klevstul :: 26.02.24 + + +# make sure cryptLocal is mounted and available + +src_dir=/home/poq/.local/share/Cryptomator/mnt/cryptLocal +tmp_dir=/tmp +trg_dir=/home/poq/syncDir/0_downloads + +if ! [ -d "$src_dir" ] +then + echo "missing source directory:" + echo "$src_dir" + echo "is the cryptLocal vault mounted?" + exit +fi + +# zip the content +timestamp=$(date +%y%m%d) +zip_file=${tmp_dir}/${timestamp}_cryptLocal.zip +zip -r "${zip_file}" "${trg_dir}/" + +# gpg encrypt the content +gpg --encrypt --sign --recipient frode@klevstul.com "${zip_file}" + +# delete the .zip file +srm -v "${zip_file}" + +# move the .gpg file to the target dir +mv "${zip_file}.gpg" "${trg_dir}/" + +ls -al "${trg_dir}/" diff --git a/dots/bin/hypr.sh b/dots/bin/hypr.sh index 44fb25f..25a0a51 100755 --- a/dots/bin/hypr.sh +++ b/dots/bin/hypr.sh @@ -1 +1,5 @@ +#!/usr/bin/env bash + +# klevstul :: 26.02.23 + start-hyprland & diff --git a/dots/bin/importGnupgKeys.sh b/dots/bin/importGnupgKeys.sh index 3892d4f..1459556 100755 --- a/dots/bin/importGnupgKeys.sh +++ b/dots/bin/importGnupgKeys.sh @@ -2,19 +2,30 @@ # klevstul :: 24.06 +# --------------------------------------------------------------------------------------------------------------------- # how to backup gpg: -# gpg --export --export-options backup --output public.gpg frode@thisworld.is -# gpg --export-secret-keys --export-options backup --output private.gpg frode@thisworld.is -# ref: https://www.howtogeek.com/816878/how-to-back-up-and-restore-gpg-keys-on-linux/ +# +# new method: +# cp /home/poq/.gnupg/ +# gpg --armor --export frode@klevstul.com > /home/poq/.local/share/Cryptomator/mnt/cryptLocal/content/keys/openPgp/.gnupg/251110_frodeKlevstul_publicKey.asc +# gpg --armor --export-secret-keys frode@klevstul.com > /home/poq/.local/share/Cryptomator/mnt/cryptLocal/content/keys/openPgp/.gnupg/251110_frodeKlevstul_privateKey.asc +# +# old method: +# gpg --export --export-options backup --output public.gpg frode@thisworld.is +# gpg --export-secret-keys --export-options backup --output private.gpg frode@thisworld.is +# ref: https://www.howtogeek.com/816878/how-to-back-up-and-restore-gpg-keys-on-linux/ +# --------------------------------------------------------------------------------------------------------------------- this_file_name=`basename "$0"` echo "$this_file_name" +echo "please, remember the hint: poq.l2" + # location of ssh keys syncdir_env_var=SYNCDIR_${HOSTNAME} src_gnupg_dir=${!syncdir_env_var}/secrets/gnupg -gpg --import ${src_gnupg_dir}/public.gpg -gpg --import ${src_gnupg_dir}/private.gpg +gpg --import ${src_gnupg_dir}/*publicKey.asc +gpg --import ${src_gnupg_dir}/*privateKey.asc gpg --list-secret-keys --keyid-format LONG diff --git a/dots/bin/figlets.sh b/dots/bin/obsolete/obsolete.figlets.sh similarity index 100% rename from dots/bin/figlets.sh rename to dots/bin/obsolete/obsolete.figlets.sh diff --git a/dots/bin/toilets.sh b/dots/bin/obsolete/obsolete.toilets.sh similarity index 100% rename from dots/bin/toilets.sh rename to dots/bin/obsolete/obsolete.toilets.sh diff --git a/dots/bin/obsolete/obsolete.updateLicences.sh b/dots/bin/obsolete/obsolete.updateLicences.sh new file mode 100755 index 0000000..1354380 --- /dev/null +++ b/dots/bin/obsolete/obsolete.updateLicences.sh @@ -0,0 +1,34 @@ +#!/usr/bin/bash + +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# what: update licences +# author: njs ➔ fk +# started: apr 2022 +# +# requires: n/a +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +if [ "$EUID" -eq 0 ] + then echo "error: do not run as 'root'" + exit +fi + +src_dir=/mnt/nas/cb/software/licences +trg_dir=/home/poq/.local/share/Cryptomator/mnt/cryptLocal/content/licences + +if ! [ -d "$src_dir" ] +then + echo "missing source directory:" + echo "$src_dir" + exit +fi + +if ! [ -d "$trg_dir" ] +then + echo "missing target directory:" + echo "$trg_dir" + exit +fi + +echo copying files from $src_dir to $trg_dir... +cp $src_dir/*.txt $trg_dir/ diff --git a/dots/bin/pushToCryptCloud.sh b/dots/bin/pushToCryptCloud.sh new file mode 100755 index 0000000..89f1c9a --- /dev/null +++ b/dots/bin/pushToCryptCloud.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +# klevstul :: push content from cryptLocal to cryptCloud (cryptomator vaults) :: apr 2022 + +# note: both vaults must be mounted before running this script + + +if [ "$EUID" -eq 0 ] + then echo "error: do not run as 'root'" + exit +fi + +src_dir=/home/poq/.local/share/Cryptomator/mnt/cryptLocal/content +trg_dir=/home/poq/.local/share/Cryptomator/mnt/cryptCloud/ + +if ! [ -d "$src_dir" ] +then + echo "missing source directory:" + echo "$src_dir" + echo "has something happened to the 'content/' directory?" + exit +fi + +if ! [ -d "${trg_dir}/content" ] +then + echo "missing target directory:" + echo "$trg_dir" + echo "is the cryptCloud vault unlocked?" + exit +fi + +echo copying files from $src_dir to $trg_dir... +rsync -v -r -a --delete $src_dir $trg_dir diff --git a/dots/bin/startup.sh b/dots/bin/startup.sh index 3146921..c9e5d0b 100755 --- a/dots/bin/startup.sh +++ b/dots/bin/startup.sh @@ -1,10 +1,6 @@ #!/usr/bin/env bash -# : klevstul : start miscellanous application : 25.12.28 - -# note: i was unable to automatically start these programs from startup_auto.sh, so hence i have created -# this file, for manually running it, and starting misc programs. -# ----- +# klevstul :: start miscellanous application :: 25.12.28 notify-send "<< startup.sh >>" diff --git a/dots/bin/webserver.sh b/dots/bin/webserver.sh index e7e756e..f3621cc 100755 --- a/dots/bin/webserver.sh +++ b/dots/bin/webserver.sh @@ -1,3 +1,8 @@ +#!/usr/bin/env bash + +# klevstul :: n/a + + # https://docs.python.org/3/library/http.server.html python3 -m http.server \