From f052c148ea05486d3a1411a2bcefbfeabd59483f Mon Sep 17 00:00:00 2001
From: Dmitriy Kholkin <alukard.develop@gmail.com>
Date: Sat, 20 Nov 2021 04:46:14 +0300
Subject: [PATCH] fix secrets

---
 modules/secrets.nix                |  2 +-
 profiles/applications/himalaya.nix | 14 ++++----------
 profiles/applications/mpv.nix      |  6 +++++-
 profiles/applications/spotify.nix  |  7 +------
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/modules/secrets.nix b/modules/secrets.nix
index b58638e..b127762 100644
--- a/modules/secrets.nix
+++ b/modules/secrets.nix
@@ -155,7 +155,7 @@ in {
           while inotifywait "$PASSWORD_STORE_DIR" -r -e move -e close_write -e create -e delete --exclude .git; do
             sleep 0.1
             pass git add --all
-            pass git commit -m "$(date +%F)_$(date+%T)"
+            pass git commit -m "change"
             pass git pull --rebase
             pass git push
           done
diff --git a/profiles/applications/himalaya.nix b/profiles/applications/himalaya.nix
index 320442e..09988f3 100644
--- a/profiles/applications/himalaya.nix
+++ b/profiles/applications/himalaya.nix
@@ -1,13 +1,7 @@
 { config, pkgs, inputs, lib, system, ... }: {
-  secrets.email = {
-    owner = "alukard:users";
-    services = [ ];
-    encrypted = "${config.environment.sessionVariables.PASSWORD_STORE_DIR}/email/ataraxiadev@ataraxiadev.com.gpg";
-  };
 
   home-manager.users.alukard = {
     home.packages = [ pkgs.himalaya ];
-    # home.packages = [ inputs.himalaya.defaultPackage.${pkgs.system} ];
 
     xdg.configFile."himalaya/config.toml".text = ''
       downloads-dir="/home/alukard/Downloads/mail"
@@ -16,13 +10,13 @@
       [ataraxiadev]
       default=true
       email="ataraxiadev@ataraxiadev.com"
-      imap-host="ataraxiadev.com"
+      imap-host="mail.ataraxiadev.com"
       imap-login="ataraxiadev@ataraxiadev.com"
-      imap-passwd-cmd="pass show /var/secrets/email"
+      imap-passwd-cmd="pass show email/ataraxiadev@ataraxiadev.com"
       imap-port=993
-      smtp-host="ataraxiadev.com"
+      smtp-host="mail.ataraxiadev.com"
       smtp-login="ataraxiadev@ataraxiadev.com"
-      smtp-passwd-cmd="pass show /var/secrets/email"
+      smtp-passwd-cmd="pass show email/ataraxiadev@ataraxiadev.com"
       smtp-port=465
     '';
   };
diff --git a/profiles/applications/mpv.nix b/profiles/applications/mpv.nix
index e54d5e5..ed64b0d 100644
--- a/profiles/applications/mpv.nix
+++ b/profiles/applications/mpv.nix
@@ -16,8 +16,12 @@
   };
   home-manager.users.alukard.home.file.".config/youtube-dl/config" = {
     text = ''
-      --cookie=/home/alukard/.config/yt-cookie
+      --cookie=/var/secrets/yt-cookie
       --mark-watched
     '';
   };
+
+  secrets.yt-cookie = {
+    owner = "alukard";
+  };
 }
\ No newline at end of file
diff --git a/profiles/applications/spotify.nix b/profiles/applications/spotify.nix
index 95e4699..317c936 100644
--- a/profiles/applications/spotify.nix
+++ b/profiles/applications/spotify.nix
@@ -55,18 +55,13 @@ in {
       };
     })
     {
-      secrets.spotify = {
-        owner = "alukard";
-        services = [ "spotifyd" ];
-      };
-
       services.spotifyd-user = {
         # enable = true;
         package = (pkgs.spotifyd.override { withALSA = false; withPulseAudio = true; withPortAudio = false; withMpris = true; });
         settings = {
           global = {
             username = "alukard.files@gmail.com";
-            password_cmd = "pass spotify";
+            password_cmd = "pass show spotify";
             backend = "pulseaudio";
             volume_controller = "softvol";
             device_name = "${config.device}";