From 0161b4985804721cde43ccc51e1d7092fc70c19d Mon Sep 17 00:00:00 2001
From: Trevor Vallender <trevor@tsvallender.co.uk>
Date: Mon, 28 Aug 2023 13:49:29 +0100
Subject: [PATCH] Fix duplicated settings

---
 system/shared/shared-configuration.nix |  3 +--
 users/tsv/aerc/accounts.conf           | 18 -----------------
 users/tsv/aerc/aerc.conf               | 28 --------------------------
 users/tsv/gnupg/gpg-agent.conf         |  6 ------
 users/tsv/home.nix                     |  2 --
 5 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 users/tsv/aerc/accounts.conf
 delete mode 100644 users/tsv/aerc/aerc.conf
 delete mode 100644 users/tsv/gnupg/gpg-agent.conf

diff --git a/system/shared/shared-configuration.nix b/system/shared/shared-configuration.nix
index eb3f002..5881884 100644
--- a/system/shared/shared-configuration.nix
+++ b/system/shared/shared-configuration.nix
@@ -37,13 +37,12 @@
     ];
   };
 
-  nix.settings.trusted-users = [ "root" "tsv" ];
-
   nix = {
     extraOptions = "experimental-features = nix-command flakes";
     package = pkgs.nixFlakes;
     settings = {
       auto-optimise-store = true;
+      trusted-users = [ "root" "tsv" ];
     };
     gc = {
       automatic = true;
diff --git a/users/tsv/aerc/accounts.conf b/users/tsv/aerc/accounts.conf
deleted file mode 100644
index 5e4bf3c..0000000
--- a/users/tsv/aerc/accounts.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-[Personal]
-source   = imaps://trevor%40tsvallender.co.uk@mail.tsvallender.co.uk
-outgoing = smtps+plain://trevor%40tsvallender.co.uk@mail.tsvallender.co.uk
-default  = INBOX
-from     = Trevor Vallender <trevor@tsvallender.co.uk>
-copy-to  = Sent
-source-cred-cmd = bw get password 3138af18-75b2-4985-90ed-adfd00b18e95
-outgoing-cred-cmd = bw get password 3138af18-75b2-4985-90ed-adfd00b18e95
-
-[Foxsoft]
-source   = imaps://trevor%40foxsoft.co.uk@imap.gmail.com
-outgoing = smtps+plain://trevor%40foxsoft.co.uk@smtp.gmail.com
-default  = INBOX
-from     = Trevor Vallender <trevor@foxsoft.co.uk>
-copy-to  = Sent
-source-cred-cmd = bw get password bf0f7425-341e-4195-a17d-afca00b4dd86
-outgoing-cred-cmd = bw get password bf0f7425-341e-4195-a17d-afca00b4dd86
-
diff --git a/users/tsv/aerc/aerc.conf b/users/tsv/aerc/aerc.conf
deleted file mode 100644
index 8d9b7a4..0000000
--- a/users/tsv/aerc/aerc.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-
-[general]
-default-save-path=~/downloads
-unsafe-accounts-conf=true
-
-[ui]
-mouse-enabled=true
-
-icon-unencrypted=
-icon-encrypted=✔
-icon-signed=✔
-icon-signed-encrypted=✔
-icon-unknown=✘
-icon-invalid=⚠
-
-threading-enabled=true
-
-[viewer]
-pager=w3m -T text/html
-alternatives=text/html,text/plain
-
-[filters]
-text/plain=colorize
-text/html=colorize
-text/calendar=calendar
-message/delivery-status=colorize
-message/rfc822=colorize
-
diff --git a/users/tsv/gnupg/gpg-agent.conf b/users/tsv/gnupg/gpg-agent.conf
deleted file mode 100644
index 3164e70..0000000
--- a/users/tsv/gnupg/gpg-agent.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-debug-pinentry
-debug ipc
-verbose
-enable-ssh-support
-pinentry-program /run/current-system/sw/bin/pinentry-curses
-
diff --git a/users/tsv/home.nix b/users/tsv/home.nix
index e4c349a..7193a34 100644
--- a/users/tsv/home.nix
+++ b/users/tsv/home.nix
@@ -71,8 +71,6 @@
   xdg.configFile."nvim/lua/tsv/remap.lua".source = ./nvim/lua/tsv/remap.lua;
   xdg.configFile."kitty/kitty.conf".source = ./kitty/kitty.conf;
   xdg.configFile."kitty/gruvbox_dark_soft.conf".source = ./kitty/gruvbox_dark_soft.conf;
-  xdg.configFile."aerc/aerc.conf".source = ./aerc/aerc.conf;
-  xdg.configFile."aerc/accounts.conf".source = ./aerc/accounts.conf;
   xdg.configFile."hypr/hyprland.conf".source = ./hyprland/hyprland.conf;
   xdg.configFile."hypr/hyprpaper.conf".source = ./hyprland/hyprpaper.conf;
   xdg.configFile."waybar/config".source = ./waybar/config;