sqrtminusone/dotfiles
1
0
Fork 0
mirror of https://github.com/SqrtMinusOne/dotfiles.git synced 2025-12-11 19:45:25 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(*): move some files from yadm encrypt to pass

Browse source
This commit is contained in:
Pavel Korytov 2021-07-27 18:24:49 +03:00
parent a26e5fa8ef
commit 7f50bdb82c
8 changed files with 74 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.config/guix/manifests/latex.scm
View file

@ -1,4 +1,7 @@
(specifications->manifest (specifications->manifest
'( '(
"font-microsoft-web-core-fonts"
"python-pygments"
"biber"
"texlab-bin" "texlab-bin"
"texlive")) "texlive"))

3
.config/yadm/encrypt
View file

@ -3,9 +3,6 @@
.config/filezilla/filezilla.xml .config/filezilla/filezilla.xml
Mail/thexcloud/.credentials.gmailieer.json Mail/thexcloud/.credentials.gmailieer.json
Mail/progin6304/.credentials.gmailieer.json Mail/progin6304/.credentials.gmailieer.json
.wegorc
.msmtprc
secrets/*
.emacs.d/dired-bookmarks.el .emacs.d/dired-bookmarks.el
.emacs.d/elfeed.org .emacs.d/elfeed.org
.emacs.d/prodigy.org .emacs.d/prodigy.org

BIN
.local/share/yadm/archive
View file

Binary file not shown.

20
Desktop.org
View file

@ -822,6 +822,8 @@ declare -A BLOCKS=(
# Geolocation for some modules # Geolocation for some modules
export LOC="SPB" export LOC="SPB"
export IPSTACK_API_KEY=$(pass show My_Online/APIs/ipstack | head -n 1)
pkill polybar pkill polybar
for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do
export MONITOR=$m 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 #+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) ip=$(dig +short +timeout=1 myip.opendns.com @resolver1.opendns.com 2> /dev/null)
if [[ ! -f ~/secrets/ipstack-api-key ]]; then # API_KEY="$(pass show My_Online/APIs/ipstack | head -n 1)"
echo "%{u<<get-color(name="red")>>}%{+u} ?? %{u-}" API_KEY=$IPSTACK_API_KEY
exit
fi
API_KEY="$(cat ~/secrets/ipstack-api-key)"
if [[ -z $ip || $ip == *"timed out"* ]]; then if [[ -z $ip || $ip == *"timed out"* ]]; then
echo "%{u<<get-color(name="red")>>}%{+u} ?? %{u-}" echo "%{u<<get-color(name="red")>>}%{+u} ?? %{u-}"
exit exit
@ -2090,10 +2089,13 @@ This section generates manifests for various desktop software that I'm using.
| office | gimp | | office | gimp |
| office | krita | | office | krita |
** LaTeX ** LaTeX
| Category | Guix dependency | | Category | Guix dependency |
|----------+-----------------| |----------+-------------------------------|
| latex | texlive | | latex | texlive |
| latex | texlab-bin | | latex | texlab-bin |
| latex | biber |
| latex | python-pygments |
| latex | font-microsoft-web-core-fonts |
** Dev ** Dev
| Category | Guix dependency | | Category | Guix dependency |
|----------+-----------------| |----------+-----------------|

25
Mail.org
View file

@ -4,7 +4,8 @@
#+TITLE: Mail #+TITLE: Mail
#+PROPERTY: header-args :mkdirp yes #+PROPERTY: header-args :mkdirp yes
#+PROPERTY: header-args:conf-unix :comments link #+PROPERTY: header-args:conf-unix :comments link
#+PROPERTY: header-args:bash :tangle-mode (identity #o755) :comments link :shebang "#!/usr/bin/env bash" #+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. 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. 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 * Emacs
:PROPERTIES: :PROPERTIES:
:header-args+: :tangle ~/.emacs.d/mail.el :header-args+: :tangle ~/.emacs.d/mail.el

69
README.org
View file

@ -20,39 +20,39 @@ Literate configuration files:
* Programs used * Programs used
Some of the notable programs are listed in the table below. Some of the notable programs are listed in the table below.
| Group | Program | Purpose | Status | Documented? | Notes | | Group | Program | Purpose | Status | Documented? | Notes |
|-----------+----------------+-----------------------------+-------------------+----------------+-----------------------------------------------------------| |-----------+-------------+-----------------------------+-------------------+----------------+-----------------------------------------------------------|
| console | bash | shell | launches fish :) | [[file:Console.org::*Bash][Console.org]] | | | 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://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]] | | | console | [[https://github.com/starship/starship][starship]] | prompt | *active* | [[file:Console.org::*Starship][Console.org]] | |
| console | [[https://github.com/tmux/tmux][tmux]] | terminal multiplexer | *active* | [[file:Console.org::*Tmux][Console.org]] | | | console | [[https://github.com/tmux/tmux][tmux]] | terminal multiplexer | *active* | [[file:Console.org::*Tmux][Console.org]] | |
| console | [[https://github.com/alacritty/alacritty][alacritty]] | terminal emulator | *active* | [[file:Console.org::*Alacritty][Console.org]] | | | 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://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://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.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://www.vim.org/][vim]] | text edtior | *active* | - | A minimal config to have a lightweight terminal $EDITOR |
| editor | [[https://neovim.io/][neovim]] | text edtior | archive | - | | | editor | [[https://neovim.io/][neovim]] | text edtior | archive | - | |
| documents | [[https://mg.readthedocs.io/latexmk.html][latexmk]] | LaTeX build tool | *active* | - | | | documents | [[https://mg.readthedocs.io/latexmk.html][latexmk]] | LaTeX build tool | *active* | - | |
| documents | [[https://pwmt.org/projects/zathura/][zathura]] | pdf viewer | *active* | [[file:Desktop.org::*dunst][Desktop.org]] | | | documents | [[https://pwmt.org/projects/zathura/][zathura]] | pdf viewer | *active* | [[file:Desktop.org::*dunst][Desktop.org]] | |
| desktop | [[https://github.com/dunst-project/dunst][dunst]] | notification manager | *active* | [[file:Desktop.org::*dunst][Desktop.org]] | | | desktop | [[https://github.com/dunst-project/dunst][dunst]] | notification manager | *active* | [[file:Desktop.org::*dunst][Desktop.org]] | |
| desktop | [[https://i3wm.org/][i3wm]] | tiling WM | *active* | [[file:Desktop.org::*i3wm][Desktop.org]] | | | desktop | [[https://i3wm.org/][i3wm]] | tiling WM | *active* | [[file:Desktop.org::*i3wm][Desktop.org]] | |
| desktop | [[https://github.com/jordansissel/keynav][keynav]] | control mouse with keyboard | *active* | [[file:Desktop.org::*keynav][Desktop.org]] | | | desktop | [[https://github.com/jordansissel/keynav][keynav]] | control mouse with keyboard | *active* | [[file:Desktop.org::*keynav][Desktop.org]] | |
| desktop | [[https://github.com/polybar/polybar][polybar]] | status bar | *active* | [[file:Desktop.org::*Polybar][Desktop.org]] | | | desktop | [[https://github.com/polybar/polybar][polybar]] | status bar | *active* | [[file:Desktop.org::*Polybar][Desktop.org]] | |
| desktop | [[https://github.com/davatorium/rofi][rofi]] | generic menu | *active* | [[file:Desktop.org::*Rofi][Desktop.org]] | | | desktop | [[https://github.com/davatorium/rofi][rofi]] | generic menu | *active* | [[file:Desktop.org::*Rofi][Desktop.org]] | |
| desktop | [[https://github.com/flameshot-org/flameshot][flameshot]] | screenshot | *active* | [[file:Desktop.org::Flameshot][Desktop.org]] | | | desktop | [[https://github.com/flameshot-org/flameshot][flameshot]] | screenshot | *active* | [[file:Desktop.org::Flameshot][Desktop.org]] | |
| desktop | [[https://github.com/yshui/picom][picom]] | X11 compositor | *active* | [[file:Desktop.org::*Picom][Desktop.org]] | | | desktop | [[https://github.com/yshui/picom][picom]] | X11 compositor | *active* | [[file:Desktop.org::*Picom][Desktop.org]] | |
| desktop | [[https://github.com/vivien/i3blocks][i3blocks]] | status bar | archive | - | | | desktop | [[https://github.com/vivien/i3blocks][i3blocks]] | status bar | archive | - | |
| internet | [[https://github.com/tridactyl/tridactyl][tridactyl]] | vim bindings for Firefox | *active* | - | templated with yadm | | internet | [[https://github.com/tridactyl/tridactyl][tridactyl]] | vim bindings for Firefox | *active* | - | templated with yadm |
| internet | [[https://newsboat.org/][newsboat]] | terminal RSS reader | archive | - | urls are encrypted | | internet | [[https://newsboat.org/][newsboat]] | terminal RSS reader | archive | - | urls are encrypted |
| internet | [[https://qutebrowser.org/][qutebrowser]] | browser with vim bindings | archive | - | | | internet | [[https://qutebrowser.org/][qutebrowser]] | browser with vim bindings | archive | - | |
| internet | [[https://github.com/jarun/buku][buku]] | bookmarks manager | archive | - | | | internet | [[https://github.com/jarun/buku][buku]] | bookmarks manager | archive | - | |
| internet | [[https://tabliss.io/][tabliss]] | new tab page | *active* | - | runned as server to work with tridactyl | | internet | [[https://tabliss.io/][tabliss]] | new tab page | *active* | - | runned as server to work with tridactyl |
| audio | [[https://www.musicpd.org/][mpd]] | music player daemon | *active* | - | | | audio | [[https://www.musicpd.org/][mpd]] | music player daemon | *active* | - | |
| audio | [[https://github.com/ncmpcpp/ncmpcpp][ncmpcpp]] | MPD frontend | *active* | - | | | audio | [[https://github.com/ncmpcpp/ncmpcpp][ncmpcpp]] | MPD frontend | *active* | - | |
| misc | [[https://yadm.io][yadm]] | dotfiles manager | *active* | - | | | misc | [[https://yadm.io][yadm]] | dotfiles manager | *active* | - | |
| misc | [[https://github.com/risacher/sunwait][sunwait]] | sunrise calculator | *active* | - | | | misc | [[https://github.com/risacher/sunwait][sunwait]] | sunrise calculator | *active* | - | |
| misc | [[https://github.com/vergoh/vnstat][vnstat]] | traffic stats | *active* | - | | | misc | [[https://github.com/vergoh/vnstat][vnstat]] | traffic stats | *active* | - | |
* Posts about my configuration * Posts about my configuration
- [[https://sqrtminusone.xyz/posts/2021-05-01-org-python/][Replacing Jupyter Notebook with Org Mode]] - [[https://sqrtminusone.xyz/posts/2021-05-01-org-python/][Replacing Jupyter Notebook with Org Mode]]
@ -83,9 +83,6 @@ Uses yadm's =post_alt= hook to create symlinks
.config/filezilla/filezilla.xml .config/filezilla/filezilla.xml
Mail/thexcloud/.credentials.gmailieer.json Mail/thexcloud/.credentials.gmailieer.json
Mail/progin6304/.credentials.gmailieer.json Mail/progin6304/.credentials.gmailieer.json
.wegorc
.msmtprc
secrets/*
.emacs.d/dired-bookmarks.el .emacs.d/dired-bookmarks.el
.emacs.d/elfeed.org .emacs.d/elfeed.org
.emacs.d/prodigy.org .emacs.d/prodigy.org

2
bin/polybar.sh
View file

@ -43,6 +43,8 @@ declare -A BLOCKS=(
# Geolocation for some modules # Geolocation for some modules
export LOC="SPB" export LOC="SPB"
export IPSTACK_API_KEY=$(pass show My_Online/APIs/ipstack | head -n 1)
pkill polybar pkill polybar
for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do for m in $(xrandr --query | grep " connected" | cut -d" " -f1); do
export MONITOR=$m export MONITOR=$m

7
bin/polybar/ipstack-vpn.sh
View file

@ -1,11 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# [[file:../../Desktop.org::*ipstack-vpn][ipstack-vpn:1]] # [[file:../../Desktop.org::*ipstack-vpn][ipstack-vpn:1]]
ip=$(dig +short +timeout=1 myip.opendns.com @resolver1.opendns.com 2> /dev/null) ip=$(dig +short +timeout=1 myip.opendns.com @resolver1.opendns.com 2> /dev/null)
if [[ ! -f ~/secrets/ipstack-api-key ]]; then # API_KEY="$(pass show My_Online/APIs/ipstack | head -n 1)"
echo "%{u#f07178}%{+u} ?? %{u-}" API_KEY=$IPSTACK_API_KEY
exit
fi
API_KEY="$(cat ~/secrets/ipstack-api-key)"
if [[ -z $ip || $ip == *"timed out"* ]]; then if [[ -z $ip || $ip == *"timed out"* ]]; then
echo "%{u#f07178}%{+u} ?? %{u-}" echo "%{u#f07178}%{+u} ?? %{u-}"
exit exit