From 7d089187d842ea410dd2d1883c75c10b9c3c0d20 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Thu, 21 May 2020 17:32:21 +0200
Subject: [PATCH] Settle on env solution

---
 home/default.nix               | 11 -----------
 home/desktop/default.nix       | 18 +++++++++---------
 home/desktop/ssh-agent.nix     | 16 ----------------
 home/laptop.nix                |  2 --
 hosts/apollo/configuration.nix |  8 +-------
 pkgs/default.nix               | 14 +-------------
 6 files changed, 11 insertions(+), 58 deletions(-)
 delete mode 100644 home/desktop/ssh-agent.nix

diff --git a/home/default.nix b/home/default.nix
index f86668c2..6c70bba5 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -126,9 +126,6 @@ in {
     };
   };
 
-  systemd.user.sessionVariables = config.home.sessionVariables;
-  programs.zsh.sessionVariables =  config.home.sessionVariables;
-  pam.sessionVariables = config.home.sessionVariables;
   home = {
     packages = builtins.attrValues my-pkgs.home-pkgs;
     sessionVariables = {
@@ -148,13 +145,5 @@ in {
 
   systemd.user = { startServices = true; };
 
-  services = {
-    gpg-agent = {
-      enable = true;
-      defaultCacheTtl = 31536000; # 1year
-      maxCacheTtl = 31536000; # 1year
-    };
-  };
-
   xdg.enable = true;
 }
diff --git a/home/desktop/default.nix b/home/desktop/default.nix
index 3793c615..5808db0d 100644
--- a/home/desktop/default.nix
+++ b/home/desktop/default.nix
@@ -1,19 +1,19 @@
 { pkgs, lib, config, ... }:
 let
-  inherit (import ../../pkgs) desktop-pkgs my-ssh-add;
+  inherit (import ../../pkgs) desktop-pkgs;
   inherit (import ../../lib) colors;
 in {
-  imports =
-    [ ./ssh-agent.nix ./sleep-nag.nix ./kitty.nix ./wallpaper.nix ./gnome.nix ];
+  imports = [ ./sleep-nag.nix ./kitty.nix ./wallpaper.nix ./gnome.nix ];
   m-0.colors = colors;
   home = {
     packages = builtins.attrValues desktop-pkgs;
-    file.".zprofile".text = ''
-      . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
-    '';
-    file.".zlogin".text = ''
-      . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
-    '';
+    file = {
+      ".zprofile".text = ''
+        . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
+      '';
+      ".gnupg/gpg-agent.conf".text =
+        "pinentry-program ${pkgs.pinentry.gnome3}/bin/pinentry";
+    };
   };
   gtk = {
     enable = true;
diff --git a/home/desktop/ssh-agent.nix b/home/desktop/ssh-agent.nix
deleted file mode 100644
index 5b2db23d..00000000
--- a/home/desktop/ssh-agent.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ pkgs, config, lib, ... }: {
-
-  xsession.initExtra = let
-    cat-pw = pkgs.writeShellScriptBin "cat-ssh-pw" ''
-      pass eu/m-0/${config.m-0.hostName}.m-0.eu/ssh-key
-    '';
-    start-agent = pkgs.writeShellScriptBin "start-ssh-agent" ''
-      ${pkgs.psmisc}/bin/killall -q ssh-agent
-      eval `${pkgs.openssh}/bin/ssh-agent -s`
-      systemctl --user set-environment SSH_AUTH_SOCK="$SSH_AUTH_SOCK"
-      systemctl --user set-environment SSH_AGENT_PID="$SSH_AGENT_PID"
-      SSH_ASKPASS=${cat-pw}/bin/cat-ssh-pw ${pkgs.openssh}/bin/ssh-add & < /dev/null
-    '';
-    in ". ${start-agent}/bin/start-ssh-agent";
-
-}
diff --git a/home/laptop.nix b/home/laptop.nix
index 8ea479ff..f33189c8 100644
--- a/home/laptop.nix
+++ b/home/laptop.nix
@@ -1,10 +1,8 @@
 { pkgs, lib, ... }:
 let
   inherit (import ../lib) unfreePkgs writeHaskellScript;
-  inherit (import ../pkgs) my-ssh-add;
   modes = pkgs.lib.attrNames (import ./modes.nix).apollo;
   autostart-script = pkgs.writeShellScriptBin "home-manager-autostart" ''
-    ${my-ssh-add}/bin/my-ssh-add
     ${pkgs.xorg.xrdb}/bin/xrdb ${builtins.toFile "Xresources" "Xft.dpi: 96"}
   '';
   configPath = "/home/maralorn/git/config";
diff --git a/hosts/apollo/configuration.nix b/hosts/apollo/configuration.nix
index 3479d7df..e4345681 100644
--- a/hosts/apollo/configuration.nix
+++ b/hosts/apollo/configuration.nix
@@ -78,13 +78,7 @@ in {
     gnome3.chrome-gnome-shell.enable = true;
     xserver = {
       enable = true;
-      displayManager.gdm = {
-        autoLogin = {
-          enable = true;
-          user = "maralorn";
-        };
-        enable = true;
-      };
+      displayManager.gdm.enable = true;
       desktopManager.gnome3.enable = true;
     };
   };
diff --git a/pkgs/default.nix b/pkgs/default.nix
index cecdccbc..c271b49f 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -2,18 +2,6 @@ let
   my-lib = import ../lib;
   inherit (my-lib) pkgs unstable sources writeHaskellScript unBreak colors;
 in rec {
-  start-ssh-agent = pkgs.writeShellScriptBin "start-ssh-agent" ''
-    ${pkgs.psmisc}/bin/killall -q ssh-agent
-    eval `${pkgs.openssh}/bin/ssh-agent -s`
-    systemctl --user set-environment SSH_AUTH_SOCK="$SSH_AUTH_SOCK"
-    systemctl --user set-environment SSH_AGENT_PID="$SSH_AGENT_PID"
-  '';
-  cat-pw = pkgs.writeShellScriptBin "cat-ssh-pw" ''
-    pass eu/m-0/$(hostname).m-0.eu/ssh-key
-  '';
-  my-ssh-add = pkgs.writeShellScriptBin "my-ssh-add" ''
-    SSH_ASKPASS=${cat-pw}/bin/cat-ssh-pw ${pkgs.openssh}/bin/ssh-add < /dev/null
-  '';
   obelisk = (import sources.obelisk { }).command;
   nix-direnv = sources.nix-direnv + "/direnvrc";
   neovim = unstable.neovim.override {
@@ -50,7 +38,7 @@ in rec {
     '';
   };
   desktop-pkgs = {
-    inherit (pkgs) lm_sensors xwayland dmenu xdg_utils libnotify;
+    inherit (pkgs) lm_sensors xwayland dmenu xdg_utils libnotify pinentry;
     inherit (pkgs.gnomeExtensions) appindicator system-monitor;
     inherit (pkgs.gnome3)
       dconf dconf-editor gnome-tweaks gnome-shell-extensions adwaita-icon-theme