7 files changed, 1 insertions, 151 deletions
diff --git a/users/fcuny/default.nix b/users/fcuny/default.nix
index cf70f50..67238db 100644
--- a/users/fcuny/default.nix
+++ b/users/fcuny/default.nix
@@ -1,8 +1,7 @@
 { config, lib, pkgs, isDesktop, isTrusted, ... }:
 
 {
-  imports = [ ./cli ./devel ] ++ (if isDesktop then [ ./desktop ] else [ ])
-    ++ (if isTrusted then [ ./trusted ] else [ ]);
+  imports = [ ./cli ./devel ] ++ (if isDesktop then [ ./desktop ] else [ ]);
 
   programs.home-manager.enable = true;
 
diff --git a/users/fcuny/trusted/default.nix b/users/fcuny/trusted/default.nix
deleted file mode 100644
index 575d3e6..0000000
--- a/users/fcuny/trusted/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [
-    ./email.nix
-    ./git.nix
-    ./pass.nix
-    ./pgp.nix
-  ];
-}
diff --git a/users/fcuny/trusted/email.nix b/users/fcuny/trusted/email.nix
deleted file mode 100644
index 3bb6bd2..0000000
--- a/users/fcuny/trusted/email.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ pkgs, config, lib, ... }:
-
-{
-  accounts.email = {
-    maildirBasePath = "${config.home.homeDirectory}/.mail";
-    accounts = {
-      Fastmail = rec {
-        primary = true;
-        address = "franck@fcuny.net";
-        userName = address;
-        realName = "Franck Cuny";
-        aliases = [ "franck.cuny@gmail.com" ];
-        passwordCommand = "pass email/imap.fastmail.com";
-        imap.host = "imap.fastmail.com";
-        mbsync = {
-          enable = true;
-          create = "maildir";
-          expunge = "both";
-          extraConfig.channel.CopyArrivalDate = "yes";
-        };
-        notmuch.enable = true;
-      };
-    };
-  };
-
-  programs.mbsync.enable = true;
-
-  programs.afew = {
-    enable = true;
-    extraConfig = ''
-      [SpamFilter]
-      [KillThreadsFilter]
-      [ArchiveSentMailsFilter]
-      [InboxFilter]
-    '';
-  };
-
-  programs.notmuch = {
-    enable = true;
-    maildir.synchronizeFlags = true;
-    new.tags = [ "unread" "inbox" ];
-    new.ignore = [ "Trash" ];
-    search.excludeTags = [ "spam" "deleted" ];
-    hooks = {
-      postNew = "${config.home.profileDirectory}/bin/afew -v --tag --new";
-    };
-  };
-
-  systemd.user.services.mbsync = {
-    Unit = { Description = "mbsync synchronization"; };
-    Service = {
-      Type = "oneshot";
-      Environment = [
-        "PASSWORD_STORE_DIR=${config.programs.password-store.settings.PASSWORD_STORE_DIR}"
-        "NOTMUCH_CONFIG=${config.xdg.configHome}/notmuch/notmuchrc"
-      ];
-      ExecStart = "${pkgs.isync}/bin/mbsync -a";
-      ExecStartPost = "${pkgs.notmuch}/bin/notmuch new --quiet";
-    };
-  };
-
-  systemd.user.timers.mbsync = {
-    Unit = { Description = "mbsync synchronization"; };
-    Timer = {
-      OnBootSec = "30";
-      OnUnitActiveSec = "5m";
-    };
-    Install = { WantedBy = [ "timers.target" ]; };
-  };
-}
diff --git a/users/fcuny/trusted/git-pass-mapping.ini b/users/fcuny/trusted/git-pass-mapping.ini
deleted file mode 100644
index 5c5177b..0000000
--- a/users/fcuny/trusted/git-pass-mapping.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[DEFAULT]
-line_username=1
-skip_username=10
-
-[github.com/*]
-target=git/github.com
-
-[git.fcuny.net*]
-target=git/git.fcuny.net
diff --git a/users/fcuny/trusted/git.nix b/users/fcuny/trusted/git.nix
deleted file mode 100644
index 52607a3..0000000
--- a/users/fcuny/trusted/git.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  programs.git = {
-    signing = {
-      signByDefault = true;
-      key = "23348B57F01D4234B5CFBA0923208AC01EB6EEA1";
-    };
-  };
-}
diff --git a/users/fcuny/trusted/pass.nix b/users/fcuny/trusted/pass.nix
deleted file mode 100644
index a552318..0000000
--- a/users/fcuny/trusted/pass.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ pkgs, config, ... }:
-
-{
-  programs.password-store = {
-    enable = true;
-    settings = {
-      PASSWORD_STORE_DIR = "${config.xdg.dataHome}/password-store";
-      PASSWORD_STORE_GENERATED_LENGTH = "30";
-      PASSWORD_STORE_CHARACTER_SET = "a-zA-Z0-9~!@#$%^&*()-_=+[]{};:,.<>?";
-      PASSWORD_STORE_KEY = config.programs.gpg.settings.default-key;
-    };
-  };
-
-  programs.git = {
-    signing = {
-      key = config.programs.gpg.settings.default-key;
-      signByDefault = true;
-    };
-    extraConfig = {
-      credential = {
-        helper = "${pkgs.gitAndTools.pass-git-helper}/bin/pass-git-helper";
-        useHttpPath = true;
-      };
-    };
-  };
-
-  xdg.configFile."pass-git-helper/git-pass-mapping.ini" = {
-    source = ./git-pass-mapping.ini;
-  };
-
-  services.password-store-sync.enable = true;
-
-  # Ensure the password store things are in the systemd session
-  systemd.user.sessionVariables = config.programs.password-store.settings;
-}
diff --git a/users/fcuny/trusted/pgp.nix b/users/fcuny/trusted/pgp.nix
deleted file mode 100644
index 79ed7dd..0000000
--- a/users/fcuny/trusted/pgp.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  services.gpg-agent = {
-    enable = true;
-    enableSshSupport = true;
-    pinentryFlavor = "gnome3";
-  };
-
-  programs.gpg = {
-    enable = true;
-    settings = {
-      default-key = "23348B57F01D4234B5CFBA0923208AC01EB6EEA1";
-    };
-  };
-}
-