Browse Source

more mail, ssh, and graphical changes

rework-profiles
parent
commit
79a6faf4ec
15 changed files with 37 additions and 9 deletions
  1. +0
    -1
      .gitattributes
  2. +8
    -0
      README.md
  3. +3
    -0
      common/graphical.nix
  4. +2
    -2
      common/headfull.nix
  5. +1
    -0
      common/users.nix
  6. +1
    -1
      common/xdg.nix
  7. BIN
      dotfiles/gnupg/key.gpg
  8. BIN
      dotfiles/gnupg/trust.txt
  9. +2
    -2
      dotfiles/mail/mutt/accounts/1-govanify.muttrc
  10. +3
    -3
      dotfiles/sway/config
  11. +13
    -0
      dotfiles/sway/status-desktop.sh
  12. +4
    -0
      machines/xanadu/default.nix
  13. BIN
      machines/xanadu/wallpaper.png
  14. BIN
      secrets/authorized_keys
  15. BIN
      secrets/passwords.nix

+ 0
- 1
.gitattributes View File

@ -1,4 +1,3 @@
secrets/* filter=git-crypt diff=git-crypt
dotfiles/mail/msmtp/* filter=git-crypt diff=git-crypt
dotfiles/mail/mbsync/* filter=git-crypt diff=git-crypt
dotfiles/gnupg/* filter=git-crypt diff=git-crypt

+ 8
- 0
README.md View File

@ -9,6 +9,14 @@ Currently the machines populated by this configuration are:
Features in need of development are:
mail:
- make your replies appear in threads
- make gpg less shobby(auto gather from sks, check why keyid does not work when encrypting
xdg:
- ssh, mozc, dbus override, nixpkgs PR
* redirect IPv6 through tor
* weechat-matrix and vim-prosession !!!
* switch to pass in dotfiles


+ 3
- 0
common/graphical.nix View File

@ -68,10 +68,13 @@
# execs sway because sway obviously never returns
environment.interactiveShellInit = ''
if [ ! -f ~/.config/gnupg/trustdb.gpg ] && [[ $(tty) = /dev/tty1 ]]; then
# let's just put the entire first time setup here
find ~/.config/gnupg -type f -exec chmod 600 {} \;
find ~/.config/gnupg -type d -exec chmod 700 {} \;
gpg --import ~/.config/gnupg/key.gpg
gpg --import-ownertrust ~/.config/gnupg/trust.txt
mkdir -p ~/.local/share/mail/ &> /dev/null
mkdir -p ~/.cache/mutt/ &> /dev/null
fi
if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
exec sway


+ 2
- 2
common/headfull.nix View File

@ -44,8 +44,8 @@
# this adds 2 files on top of the gpg install handled by the system, but this
# is a single user system so nobody cares
home-manager.users.govanify = {
home.file.".config/gnupg/key.gpg".source = ./../dotfiles/gnupg/key.gpg;
home.file.".config/gnupg/trust.txt".source = ./../dotfiles/gnupg/trust.txt;
home.file.".config/gnupg/key.gpg".source = ./../secrets/gnupg/key.gpg;
home.file.".config/gnupg/trust.txt".source = ./../secrets/gnupg/trust.txt;
};


+ 1
- 0
common/users.nix View File

@ -13,6 +13,7 @@
};
home-manager.users.govanify = {
home.file.".config/ssh/authorized_keys".source = ./../secrets/authorized_keys;
programs.git = {
enable = true;
userName = "gauvain@govanify.com";


+ 1
- 1
common/xdg.nix View File

@ -54,7 +54,7 @@
'';
# TODO: after all that ssh STILL tries to create the ~/.ssh folder. We need to
# execute the following command in override postdownload of ssh
# execute the following command in override postpatch of ssh
# sed -i 's/\.ssh/\.config\/ssh/' *pathnames.h
}

BIN
dotfiles/gnupg/key.gpg View File


BIN
dotfiles/gnupg/trust.txt View File


+ 2
- 2
dotfiles/mail/mutt/accounts/1-govanify.muttrc View File

@ -5,8 +5,8 @@ set from = "gauvain@govanify.com"
set sendmail = "msmtp -a govanify"
alias me Gauvain Roussel-Tarbouriech <gauvain@govanify.com>
set folder = "/home/govanify/.local/share/mail/govanify"
set header_cache = /home/govanify/.cache/mutt/govanify/headers
set message_cachedir = /home/govanify/.cache/mutt/govanify/bodies
set header_cache = /home/govanify/.cache/mutt/govanify-headers
set message_cachedir = /home/govanify/.cache/mutt/govanify-bodies
set mbox_type = Maildir
bind index,pager gg noop


+ 3
- 3
dotfiles/sway/config View File

@ -13,14 +13,14 @@ set $left h
set $down j
set $up k
set $right l
set $lock "swaylock -i ~/Pictures/D3I8elHUwAAQZjD.jpg -l -F --indicator-radius 100 --indicator-thickness 7 --ring-color bb00cc --key-hl-color 880033"
set $lock "swaylock -i ~/Pictures/wallpaper.png -l -F --indicator-radius 100 --indicator-thickness 7 --ring-color bb00cc --key-hl-color 880033"
exec swayidle -w \
timeout 300 'swaylock -i ~/Pictures/D3I8elHUwAAQZjD.jpg -l -F --indicator-radius 100 --indicator-thickness 7 --ring-color bb00cc --key-hl-color 880033' \
timeout 300 'swaylock -i ~/Pictures/wallpaper.png -l -F --indicator-radius 100 --indicator-thickness 7 --ring-color bb00cc --key-hl-color 880033' \
timeout 600 'swaymsg "output * dpms off"' \
resume 'swaymsg "output * dpms on"' \
before-sleep 'swaylock -i ~/Pictures/D3I8elHUwAAQZjD.jpg -l -F --indicator-radius 100 --indicator-thickness 7 --ring-color bb00cc --key-hl-color 880033'
before-sleep 'swaylock -i ~/Pictures/wallpaper.png -l -F --indicator-radius 100 --indicator-thickness 7 --ring-color bb00cc --key-hl-color 880033'
### Output configuration
#


+ 13
- 0
dotfiles/sway/status-desktop.sh View File

@ -0,0 +1,13 @@
#!/bin/sh
# The Sway configuration file in ~/.config/sway/config calls this script.
# You should see changes to the status bar after saving this script.
# If not, do "killall swaybar" and $mod+Shift+c to reload the configuration.
# The abbreviated weekday (e.g., "Sat"), followed by the ISO-formatted date
# like 2018-10-06 and the time (e.g., 14:01)
date_formatted=$(date "+%a %F %H:%M")
mail=$(cat ~/.local/share/mail/unread-govanify)
# Emojis and characters for the status bar
# ⚡ \|
echo "mail: $mail | $date_formatted"

+ 4
- 0
machines/xanadu/default.nix View File

@ -73,4 +73,8 @@
inputNic = "wlp1s0";
};
home-manager.users.govanify = {
home.file."Pictures/wallpaper.png".source = ./wallpaper.png;
};
}

BIN
machines/xanadu/wallpaper.png View File

Before After
Width: 2048  |  Height: 1152  |  Size: 3.0 MiB

BIN
secrets/authorized_keys View File


BIN
secrets/passwords.nix View File


Loading…
Cancel
Save