From 4c24695a277141f5b4ecc51abdc3c42db8fb027d Mon Sep 17 00:00:00 2001
From: Nikolaos Karaolidis <nick@karaolidis.com>
Date: Wed, 19 Jun 2024 19:31:44 +0300
Subject: [PATCH] Fix audio and gpg bugs

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
---
 hosts/{eirene => common}/configs/pipewire/default.nix | 0
 hosts/common/default.nix                              | 2 ++
 hosts/eirene/default.nix                              | 1 -
 users/common/configs/gpg-agent/default.nix            | 6 ++----
 users/common/default.nix                              | 7 ++++---
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename hosts/{eirene => common}/configs/pipewire/default.nix (100%)

diff --git a/hosts/eirene/configs/pipewire/default.nix b/hosts/common/configs/pipewire/default.nix
similarity index 100%
rename from hosts/eirene/configs/pipewire/default.nix
rename to hosts/common/configs/pipewire/default.nix
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index 9b834ef..1454154 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -4,6 +4,7 @@
   imports = [
     inputs.impermanence.nixosModules.impermanence
     inputs.sops-nix.nixosModules.sops
+    ./configs/pipewire
     ./configs/zsh
     ./configs/neovim
     ./configs/tmux
@@ -27,6 +28,7 @@
       postDeviceCommands = lib.mkAfter (builtins.readFile ./scripts/impermanence.sh);
     };
 
+    kernelPackages = pkgs.linuxPackages_latest;
     supportedFilesystems = [ "btrfs" "ntfs" ];
     kernelParams = [ "loglevel=3" "quiet" ];
     consoleLogLevel = 0;
diff --git a/hosts/eirene/default.nix b/hosts/eirene/default.nix
index 655df01..fd346d3 100644
--- a/hosts/eirene/default.nix
+++ b/hosts/eirene/default.nix
@@ -4,7 +4,6 @@
   imports = [
     ../common
     ../../users/nick
-    ./configs/pipewire
   ];
 
   time.timeZone = "Europe/Athens";
diff --git a/users/common/configs/gpg-agent/default.nix b/users/common/configs/gpg-agent/default.nix
index 99b1759..99c4d82 100644
--- a/users/common/configs/gpg-agent/default.nix
+++ b/users/common/configs/gpg-agent/default.nix
@@ -10,7 +10,8 @@
   systemd.user.services.gpg-agent-import = {
     Unit = {
       Description = "Auto-import GPG keys";
-      After = [ "gpg-agent.socket" "sops-nix.service" ];
+      Requires = [ "sops-nix.service" "gpg-agent.socket" ];
+      After = [ "sops-nix.service" "gpg-agent.socket" ];
     };
 
     Service = {
@@ -18,9 +19,6 @@
       ExecStart = pkgs.writeScript "import-gpg-keys" ''
         #!${pkgs.runtimeShell}
 
-        find "$HOME"/.gnupg -type f -exec chmod 600 {} \;
-        find "$HOME"/.gnupg -type d -exec chmod 700 {} \;
-
         for keyfile in "$HOME"/.config/sops-nix/secrets/gpg-agent/*.key; do
           passfile="''${keyfile%.key}.pass"
 
diff --git a/users/common/default.nix b/users/common/default.nix
index a3acb8c..7201716 100644
--- a/users/common/default.nix
+++ b/users/common/default.nix
@@ -43,6 +43,7 @@ in
         packages = with pkgs; [
           rofi-wayland
           swww
+          pavucontrol
         ];
 
         stateVersion = "24.05";
@@ -101,7 +102,7 @@ in
     ) normalUsers;
   };
 
-  systemd.tmpfiles.rules = [ "d /persist/home/ 0755 root root -" ] ++ lib.attrsets.mapAttrsToList (user: config:
-    "d /persist${config.home} 0700 ${user} users -"
-  ) normalUsers;
+  systemd.tmpfiles.rules = [ "d /persist/home/ 0755 root root -" ] ++ 
+    lib.attrsets.mapAttrsToList ( user: config: "d /persist${config.home} 0700 ${user} users -" ) normalUsers ++ 
+    lib.attrsets.mapAttrsToList ( user: config: "d ${config.home}/.gnupg 0700 ${user} users -" ) normalUsers;
 }