diff options
Diffstat (limited to '')
| -rw-r--r-- | hm/soispha/conf/git/default.nix | 18 | ||||
| -rw-r--r-- | hm/soispha/conf/mail/accounts/benedikt.nix | 48 | ||||
| -rw-r--r-- | hm/soispha/conf/mail/accounts/soispha.nix | 49 | ||||
| -rw-r--r-- | hm/soispha/conf/mail/default.nix | 55 | ||||
| -rw-r--r-- | hm/soispha/conf/mail/non_public_accounts.nix | bin | 1018 -> 0 bytes | |||
| -rw-r--r-- | hm/soispha/conf/taskwarrior/default.nix | 5 | ||||
| -rw-r--r-- | hm/soispha/conf/taskwarrior/taskd/user_id.nix | bin | 84 -> 0 bytes |
7 files changed, 108 insertions, 67 deletions
diff --git a/hm/soispha/conf/git/default.nix b/hm/soispha/conf/git/default.nix index 491b3648..0593df77 100644 --- a/hm/soispha/conf/git/default.nix +++ b/hm/soispha/conf/git/default.nix @@ -107,8 +107,9 @@ in { defaultBranch = "prime"; }; user = { - email = "soispha@vhack.eu"; - name = "Soispha"; + name = "Benedikt Peetz"; + email = "benedikt.peetz@b-peetz.de"; + # signingKey = "9A254A935C25B0419EAE495014D2BC012F572AD7!"; }; help = { autocorrect = 5; @@ -159,17 +160,6 @@ in { }; }; }; - includes = [ - { - condition = "gitdir:~/school/"; - contents = { - user = { - inherit (nixosConfig.soispha.secret.me) name email; - signingKey = nixosConfig.soispha.secret.me.gpgKey; - }; - }; - } - ]; delta = { enable = true; options = { @@ -184,7 +174,7 @@ in { }; }; signing = { - key = "9606FC749FCE16360723D4ADA5E94010C3A642AD!"; + key = "9A254A935C25B0419EAE495014D2BC012F572AD7!"; signByDefault = true; }; }; diff --git a/hm/soispha/conf/mail/accounts/benedikt.nix b/hm/soispha/conf/mail/accounts/benedikt.nix new file mode 100644 index 00000000..87ede61b --- /dev/null +++ b/hm/soispha/conf/mail/accounts/benedikt.nix @@ -0,0 +1,48 @@ +{pkgs}: { + address = "benedikt.peetz@b-peetz.de"; + userName = "benedikt.peetz@b-peetz.de"; + realName = "Benedikt Peetz"; + primary = true; + passwordCommand = "${pkgs.libsecret}/bin/secret-tool lookup account benedikt.peetz@b-peetz.de"; + aliases = [ + "@b-peetz.de" + ]; + folders = {}; + gpg = { + encryptByDefault = true; + key = "9A254A935C25B0419EAE495014D2BC012F572AD7"; + signByDefault = true; + }; + signature = { + # TODO: + }; + neomutt = { + enable = true; + }; + mbsync = { + enable = true; + create = "both"; + }; + # himalaya = { + # enable = true; + # backend = "imap"; + # sender = "smtp"; + # settings = { + # # TODO: + # }; + # }; + smtp = { + host = "server1.vhack.eu"; + port = 465; + }; + imap = { + host = "server1.vhack.eu"; + port = 993; + }; + jmap = { + # TODO: + }; + maildir = { + path = "bpeetz"; + }; +} diff --git a/hm/soispha/conf/mail/accounts/soispha.nix b/hm/soispha/conf/mail/accounts/soispha.nix new file mode 100644 index 00000000..012e84d6 --- /dev/null +++ b/hm/soispha/conf/mail/accounts/soispha.nix @@ -0,0 +1,49 @@ +{pkgs}: { + address = "soispha@vhack.eu"; + userName = "soispha@vhack.eu"; + realName = "Soispha"; + primary = false; + passwordCommand = "${pkgs.libsecret}/bin/secret-tool lookup account soispha@vhack.eu"; + aliases = [ + "admin@vhack.eu" + ]; + folders = { + }; + gpg = { + encryptByDefault = true; + key = "9606FC749FCE16360723D4ADA5E94010C3A642AD"; + signByDefault = true; + }; + signature = { + # TODO: + }; + neomutt = { + enable = true; + }; + mbsync = { + enable = true; + create = "both"; + }; + # himalaya = { + # enable = true; + # backend = "imap"; + # sender = "smtp"; + # settings = { + # # TODO: + # }; + # }; + smtp = { + host = "server1.vhack.eu"; + port = 465; + }; + imap = { + host = "server1.vhack.eu"; + port = 993; + }; + jmap = { + # TODO: + }; + maildir = { + path = "soispha"; + }; +} diff --git a/hm/soispha/conf/mail/default.nix b/hm/soispha/conf/mail/default.nix index 7ca65e1a..0ecbe40a 100644 --- a/hm/soispha/conf/mail/default.nix +++ b/hm/soispha/conf/mail/default.nix @@ -1,61 +1,12 @@ { config, pkgs, - lib, ... }: let - non_public_accounts = import ./non_public_accounts.nix {inherit pkgs;}; - accounts = lib.recursiveUpdate {inherit soispha;} non_public_accounts; + benedikt = import ./accounts/benedikt.nix {inherit pkgs;}; + soispha = import ./accounts/soispha.nix {inherit pkgs;}; - soispha = { - address = "soispha@vhack.eu"; - userName = "soispha@vhack.eu"; - realName = "Soispha"; - primary = true; - passwordCommand = "${pkgs.libsecret}/bin/secret-tool lookup account soispha@vhack.eu"; - aliases = [ - "admin@vhack.eu" - ]; - folders = { - }; - gpg = { - encryptByDefault = true; - key = "9606FC749FCE16360723D4ADA5E94010C3A642AD"; - signByDefault = true; - }; - signature = { - # TODO: - }; - neomutt = { - enable = true; - }; - mbsync = { - enable = true; - create = "both"; - }; - # himalaya = { - # enable = true; - # backend = "imap"; - # sender = "smtp"; - # settings = { - # # TODO: - # }; - # }; - smtp = { - host = "server1.vhack.eu"; - port = 465; - }; - imap = { - host = "server1.vhack.eu"; - port = 993; - }; - jmap = { - # TODO: - }; - maildir = { - path = "soispha"; - }; - }; + accounts = {inherit soispha benedikt;}; in { accounts.email = { maildirBasePath = "${config.xdg.dataHome}/maildir"; diff --git a/hm/soispha/conf/mail/non_public_accounts.nix b/hm/soispha/conf/mail/non_public_accounts.nix deleted file mode 100644 index 7ab1bbc6..00000000 --- a/hm/soispha/conf/mail/non_public_accounts.nix +++ /dev/null Binary files differdiff --git a/hm/soispha/conf/taskwarrior/default.nix b/hm/soispha/conf/taskwarrior/default.nix index 3bd7c03d..d7aec156 100644 --- a/hm/soispha/conf/taskwarrior/default.nix +++ b/hm/soispha/conf/taskwarrior/default.nix @@ -74,6 +74,10 @@ in { enable = true; colorTheme = ./nord.theme; + extraConfig = '' + # This include just contains my taskd user credentials + include ${nixosConfig.age.secrets.taskserverCredentials.path} + ''; config = { news.version = "2.6.0"; complete.all.tags = true; @@ -115,7 +119,6 @@ nixosConfig.age.secrets.taskserverPrivate.path; certificate = nixosConfig.age.secrets.taskserverPublic.path; - credentials = import ./taskd/user_id.nix {}; }; }; }; diff --git a/hm/soispha/conf/taskwarrior/taskd/user_id.nix b/hm/soispha/conf/taskwarrior/taskd/user_id.nix deleted file mode 100644 index 06c6543a..00000000 --- a/hm/soispha/conf/taskwarrior/taskd/user_id.nix +++ /dev/null Binary files differ |