mirror of
https://github.com/SqrtMinusOne/dotfiles.git
synced 2025-12-11 19:45:25 +03:00
feat(*): move some files from yadm encrypt to pass
This commit is contained in:
parent
a26e5fa8ef
commit
7f50bdb82c
8 changed files with 74 additions and 55 deletions
|
|
@ -1,4 +1,7 @@
|
|||
(specifications->manifest
|
||||
'(
|
||||
"font-microsoft-web-core-fonts"
|
||||
"python-pygments"
|
||||
"biber"
|
||||
"texlab-bin"
|
||||
"texlive"))
|
||||
|
|
|
|||
|
|
@ -3,9 +3,6 @@
|
|||
.config/filezilla/filezilla.xml
|
||||
Mail/thexcloud/.credentials.gmailieer.json
|
||||
Mail/progin6304/.credentials.gmailieer.json
|
||||
.wegorc
|
||||
.msmtprc
|
||||
secrets/*
|
||||
.emacs.d/dired-bookmarks.el
|
||||
.emacs.d/elfeed.org
|
||||
.emacs.d/prodigy.org
|
||||
|
|
|
|||
Binary file not shown.
14
Desktop.org
14
Desktop.org
|
|
@ -822,6 +822,8 @@ declare -A BLOCKS=(
|
|||
# Geolocation for some modules
|
||||
export LOC="SPB"
|
||||
|
||||
export IPSTACK_API_KEY=$(pass show My_Online/APIs/ipstack | head -n 1)
|
||||
|
||||
pkill polybar
|
||||
for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do
|
||||
export MONITOR=$m
|
||||
|
|
@ -945,11 +947,8 @@ A module to get a country of the current IP and openvpn status. Uses [[https://i
|
|||
|
||||
#+begin_src bash :tangle ./bin/polybar/ipstack-vpn.sh :noweb yes
|
||||
ip=$(dig +short +timeout=1 myip.opendns.com @resolver1.opendns.com 2> /dev/null)
|
||||
if [[ ! -f ~/secrets/ipstack-api-key ]]; then
|
||||
echo "%{u<<get-color(name="red")>>}%{+u} ?? %{u-}"
|
||||
exit
|
||||
fi
|
||||
API_KEY="$(cat ~/secrets/ipstack-api-key)"
|
||||
# API_KEY="$(pass show My_Online/APIs/ipstack | head -n 1)"
|
||||
API_KEY=$IPSTACK_API_KEY
|
||||
if [[ -z $ip || $ip == *"timed out"* ]]; then
|
||||
echo "%{u<<get-color(name="red")>>}%{+u} ?? %{u-}"
|
||||
exit
|
||||
|
|
@ -2091,9 +2090,12 @@ This section generates manifests for various desktop software that I'm using.
|
|||
| office | krita |
|
||||
** LaTeX
|
||||
| Category | Guix dependency |
|
||||
|----------+-----------------|
|
||||
|----------+-------------------------------|
|
||||
| latex | texlive |
|
||||
| latex | texlab-bin |
|
||||
| latex | biber |
|
||||
| latex | python-pygments |
|
||||
| latex | font-microsoft-web-core-fonts |
|
||||
** Dev
|
||||
| Category | Guix dependency |
|
||||
|----------+-----------------|
|
||||
|
|
|
|||
23
Mail.org
23
Mail.org
|
|
@ -4,6 +4,7 @@
|
|||
#+TITLE: Mail
|
||||
#+PROPERTY: header-args :mkdirp yes
|
||||
#+PROPERTY: header-args:conf-unix :comments link
|
||||
#+PROPERTY: header-args:conf-space :comments link
|
||||
#+PROPERTY: header-args:bash :tangle-mode (identity #o755) :comments link :shebang "#!/usr/bin/env bash"
|
||||
|
||||
My email configuration with [[https://notmuchmail.org/][notmuch]] + [[https://github.com/gauteh/lieer][lieer]] + [[https://marlam.de/msmtp/][msmtp]]. My problem with any particular mail setup was that I use Gmail labels quite extensively, and handling these over IMAP is rather awkward. Hence this choice of software.
|
||||
|
|
@ -165,7 +166,27 @@ The script is ran via GNU Mcron every 5 minutes.
|
|||
|
||||
Sending emails can be done with MSMTP. It automatially chooses the email address and server based on the contents of the message, which is handy if there are multiple mailboxes to be managed.
|
||||
|
||||
As I haven't encrypted my passwords properly yet, I encrypt the entire configuration file.
|
||||
#+begin_src conf-space :tangle ~/.msmtprc
|
||||
defaults
|
||||
auth on
|
||||
tls on
|
||||
tls_trust_file /etc/ssl/certs/ca-certificates.crt
|
||||
logfile ~/.msmtp.log
|
||||
|
||||
account main
|
||||
host smtp.gmail.com
|
||||
port 587
|
||||
from thexcloud@gmail.com
|
||||
user thexcloud@gmail.com
|
||||
passwordeval "pass show My_Online/APIs/google-main-app-password | head -n 1"
|
||||
|
||||
account progin
|
||||
host smtp.gmail.com
|
||||
port 587
|
||||
from progin6304@gmail.com
|
||||
user progin6304@gmail.com
|
||||
passwordeval "pass show My_Online/ETU/progin6304@gmail.com | head -n 1"
|
||||
#+end_src
|
||||
* Emacs
|
||||
:PROPERTIES:
|
||||
:header-args+: :tangle ~/.emacs.d/mail.el
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ Literate configuration files:
|
|||
Some of the notable programs are listed in the table below.
|
||||
|
||||
| Group | Program | Purpose | Status | Documented? | Notes |
|
||||
|-----------+----------------+-----------------------------+-------------------+----------------+-----------------------------------------------------------|
|
||||
|-----------+-------------+-----------------------------+-------------------+----------------+-----------------------------------------------------------|
|
||||
| console | bash | shell | launches fish :) | [[file:Console.org::*Bash][Console.org]] | |
|
||||
| console | [[https://fishshell.com/][fish]] | shell | *active* | [[file:Console.org::*Fish][Console.org]] | |
|
||||
| console | [[https://github.com/starship/starship][starship]] | prompt | *active* | [[file:Console.org::*Starship][Console.org]] | |
|
||||
|
|
@ -29,7 +29,7 @@ Some of the notable programs are listed in the table below.
|
|||
| console | [[https://github.com/alacritty/alacritty][alacritty]] | terminal emulator | *active* | [[file:Console.org::*Alacritty][Console.org]] | |
|
||||
| mail | [[https://notmuchmail.org/][notmuch]] | mail indexer | *active* | [[file:Mail.org][Mail.org,]] [[https://sqrtminusone.xyz/posts/2021-02-27-gmail/][post]] | |
|
||||
| mail | [[https://github.com/gauteh/lieer][lieer]] | gmail API client | *active* | [[file:Mail.org][Mail.org]], [[https://sqrtminusone.xyz/posts/2021-02-27-gmail/][post]] | credentials are encrypted |
|
||||
| mail | [[https://marlam.de/msmtp/][msmtp]] | SMTP client | *active* | [[file:Mail.org][Mail.org]] | encrypted |
|
||||
| mail | [[https://marlam.de/msmtp/][msmtp]] | SMTP client | *active* | [[file:Mail.org][Mail.org]] | |
|
||||
| editor | [[https://www.gnu.org/software/emacs/][emacs]] | everything | *active* | [[file:Emacs.org][Emacs.org]] | GitHub renders .org files without labels and =tangle: no= |
|
||||
| editor | [[https://www.vim.org/][vim]] | text edtior | *active* | - | A minimal config to have a lightweight terminal $EDITOR |
|
||||
| editor | [[https://neovim.io/][neovim]] | text edtior | archive | - | |
|
||||
|
|
@ -83,9 +83,6 @@ Uses yadm's =post_alt= hook to create symlinks
|
|||
.config/filezilla/filezilla.xml
|
||||
Mail/thexcloud/.credentials.gmailieer.json
|
||||
Mail/progin6304/.credentials.gmailieer.json
|
||||
.wegorc
|
||||
.msmtprc
|
||||
secrets/*
|
||||
.emacs.d/dired-bookmarks.el
|
||||
.emacs.d/elfeed.org
|
||||
.emacs.d/prodigy.org
|
||||
|
|
|
|||
|
|
@ -43,6 +43,8 @@ declare -A BLOCKS=(
|
|||
# Geolocation for some modules
|
||||
export LOC="SPB"
|
||||
|
||||
export IPSTACK_API_KEY=$(pass show My_Online/APIs/ipstack | head -n 1)
|
||||
|
||||
pkill polybar
|
||||
for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do
|
||||
export MONITOR=$m
|
||||
|
|
|
|||
|
|
@ -1,11 +1,8 @@
|
|||
#!/usr/bin/env bash
|
||||
# [[file:../../Desktop.org::*ipstack-vpn][ipstack-vpn:1]]
|
||||
ip=$(dig +short +timeout=1 myip.opendns.com @resolver1.opendns.com 2> /dev/null)
|
||||
if [[ ! -f ~/secrets/ipstack-api-key ]]; then
|
||||
echo "%{u#f07178}%{+u} ?? %{u-}"
|
||||
exit
|
||||
fi
|
||||
API_KEY="$(cat ~/secrets/ipstack-api-key)"
|
||||
# API_KEY="$(pass show My_Online/APIs/ipstack | head -n 1)"
|
||||
API_KEY=$IPSTACK_API_KEY
|
||||
if [[ -z $ip || $ip == *"timed out"* ]]; then
|
||||
echo "%{u#f07178}%{+u} ?? %{u-}"
|
||||
exit
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue