From 09a3d86503c1593d5d81a7c4463ba3f7a5f41037 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Tue, 23 Feb 2021 02:22:23 +0000
Subject: [PATCH] About to have git signing working again.

---
 config/common/default.nix    |  1 +
 config/users/kat/default.nix |  5 +-
 config/users/kat/desktop.nix | 88 ++++++++++++++++++------------------
 config/users/kat/fish.nix    | 30 ++++++++++++
 4 files changed, 80 insertions(+), 44 deletions(-)
 create mode 100644 config/users/kat/fish.nix

diff --git a/config/common/default.nix b/config/common/default.nix
index 4ba1c25b..0acc154f 100644
--- a/config/common/default.nix
+++ b/config/common/default.nix
@@ -50,6 +50,7 @@ in {
     wget
     rsync
     pv
+    pinentry-curses
     progress
     bc
     zstd
diff --git a/config/users/kat/default.nix b/config/users/kat/default.nix
index 765326d5..a278a751 100644
--- a/config/users/kat/default.nix
+++ b/config/users/kat/default.nix
@@ -45,8 +45,11 @@
 
     programs.git = {
       enable = true;
-      userName = "kat";
+      userName = "kat witch";
       userEmail = "kat@kittywit.ch";
+      signing = {
+        key = "01F50A29D4AA91175A11BDB17248991EFA8EFBEE";
+      };
     };
 
     programs.ssh = {
diff --git a/config/users/kat/desktop.nix b/config/users/kat/desktop.nix
index 4e210e9e..e0a8b355 100644
--- a/config/users/kat/desktop.nix
+++ b/config/users/kat/desktop.nix
@@ -15,51 +15,59 @@ in {
     services.xserver.displayManager.lightdm.enable = true;
     programs.light.enable = true;
     services.tumbler.enable = true;
-
-    home-manager.users.kat = {
-      home.packages = [
-        pkgs._1password
-        pkgs.bitwarden
-        pkgs.mpv
-        pkgs.element-desktop
-        pkgs.mumble
-        pkgs.obs-studio
-        pkgs.xfce.ristretto
-        pkgs.avidemux
-        pkgs.vlc
-        pkgs.ffmpeg-full
-        pkgs.thunderbird
+    
+    users.users.kat = {
+      packages = with pkgs; [
+        _1password
+        bitwarden
+        mpv
+        element-desktop
+        mumble
+        obs-studio
+        xfce.ristretto
+        avidemux
+        vlc
+        ffmpeg-full
+        thunderbird
         unstable.syncplay
         unstable.youtube-dl
         unstable.google-chrome
-        pkgs.v4l-utils
-        pkgs.transmission-gtk
-        pkgs.jdk11
-        pkgs.lm_sensors
-        pkgs.psmisc
+        v4l-utils
+        transmission-gtk
+        jdk11
+        lm_sensors
+        psmisc
         unstable.discord
-        pkgs.tdesktop
-        pkgs.dino
-        pkgs.nextcloud-client
-        pkgs.vegur
-        pkgs.nitrogen
-        pkgs.terminator
-        pkgs.pavucontrol
-        pkgs.appimage-run
-        pkgs.gparted
-        pkgs.scrot
-        pkgs.gimp-with-plugins
-        pkgs.vscode
-        pkgs.cryptsetup
-        pkgs.pcmanfm
-        pkgs.neofetch
-        pkgs.htop
+        tdesktop
+        pinentry.gtk2
+        dino
+        nextcloud-client
+        vegur
+        nitrogen
+        terminator
+        pavucontrol
+        appimage-run
+        gparted
+        scrot
+        gimp-with-plugins
+        vscode
+        cryptsetup
+        pcmanfm
+        neofetch
+        htop
       ];
+  };
+
+      programs.gnupg.agent = {
+        enable = true;
+        enableSSHSupport = true;
+        pinentryFlavor = "gtk2";
+      };
+
+    home-manager.users.kat = {
 
       services.nextcloud-client.enable = true;
 
-      programs.fish = { interactiveShellInit = "set -g fish_greeting ''"; };
-
       programs.firefox = { enable = true; };
 
       services.kdeconnect = {
@@ -83,12 +91,6 @@ in {
     services.pcscd.enable = true;
     services.udev.packages = [ pkgs.yubikey-personalization ];
 
-    programs.gnupg.agent = {
-      enable = true;
-      enableSSHSupport = true;
-      pinentryFlavor = "curses";
-    };
-
     fonts.fontconfig.enable = true;
     fonts.fonts = [ pkgs.nerdfonts pkgs.corefonts ];
 
diff --git a/config/users/kat/fish.nix b/config/users/kat/fish.nix
new file mode 100644
index 00000000..c8b0bf3d
--- /dev/null
+++ b/config/users/kat/fish.nix
@@ -0,0 +1,30 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home-manager.users.kat = {
+    programs.fish = {
+      enable = true;
+      interactiveShellInit = ''
+        ${if (lib.elem "desktop" config.meta.deploy.groups)
+                then "export SSH_AUTH_SOCK=(gpgconf --list-dirs agent-ssh-socket)"
+                else ""}
+        set -g fish_greeting ""
+      '';
+      shellAliases = { nixdirfmt = "fd --color=never .nix | xargs nixfmt"; };
+      plugins = [{
+        name = "bass";
+        src = pkgs.fetchFromGitHub {
+          owner = "edc";
+          repo = "bass";
+          rev = "d63054b24c2f63aaa3a08fb9ec9d0da4c70ab922";
+          sha256 = "0pwci5xxm8308nrb52s5nyxijk0svar8nqrdfvkk2y34z1cg319b";
+        };
+      }];
+    };
+  };
+    programs.direnv = {
+        enable = true;
+        enableFishIntegration = true;
+        enableNixDirenvIntegration = true;
+    };
+}
\ No newline at end of file