From 09c0496a2a4201a67495aa4972f48209412ba117 Mon Sep 17 00:00:00 2001
From: Avery <aveeryy@protonmail.com>
Date: Thu, 6 Mar 2025 07:42:30 +0000
Subject: [PATCH] Set up GCM on mizuki

---
 flake.nix                    |  2 +-
 hosts/mizuki/development.nix | 21 ++++++++++++++++++++-
 hosts/mizuki/home.nix        |  4 ++++
 hosts/mizuki/nixos.nix       |  1 +
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index fe0c07b..fbd84f8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -94,7 +94,7 @@
               users.avery = {
                 imports = [
                   inputs.nixvim.homeManagerModules.nixvim
-                  ./common/home.nix
+                  ./hosts/mizuki/home.nix
                   ./common/zsh.nix
                   ./hosts/totsugeki/home-manager/development/nixvim
                   ./hosts/mizuki/development.nix
diff --git a/hosts/mizuki/development.nix b/hosts/mizuki/development.nix
index 78950f8..cc91bc4 100644
--- a/hosts/mizuki/development.nix
+++ b/hosts/mizuki/development.nix
@@ -1,11 +1,20 @@
 { pkgs, ... }: {
-  home.packages = with pkgs; [ xh ];
+  home.packages = with pkgs; [ xh gnupg git-credential-manager pass wslu ];
   programs = {
     git = {
       enable = true;
       extraConfig = {
         init.defaultBranch = "main";
         merge.tool = "nvim -d";
+        credential = {
+          credentialStore = "gpg";
+          helper = "${pkgs.git-credential-manager}/bin/git-credential-manager";
+          "https://git.rcia.dev".provider = "generic";
+        };
+      };
+      signing = {
+        key = "B684FD451B692E04";
+        signByDefault = true;
       };
       userEmail = "aveeryy@protonmail.com";
       userName = "Avery";
@@ -28,4 +37,14 @@
       };
     };
   };
+  services = {
+    gpg-agent = {
+      defaultCacheTtl = 3600;
+      enable = true;
+      enableSshSupport = true;
+      enableZshIntegration = true;
+      pinentryPackage = pkgs.pinentry-qt;
+    };
+  };
+
 }
diff --git a/hosts/mizuki/home.nix b/hosts/mizuki/home.nix
index f3bdee0..83738b6 100644
--- a/hosts/mizuki/home.nix
+++ b/hosts/mizuki/home.nix
@@ -7,4 +7,8 @@
     sessionVariables.EDITOR = "nvim";
   };
   programs.home-manager.enable = true;
+  programs.zsh.initExtra = ''
+    setxkbmap -layout es -variant dvorak
+    WAYLAND_DISPLAY="wayland-1"
+  '';
 }
diff --git a/hosts/mizuki/nixos.nix b/hosts/mizuki/nixos.nix
index cf23649..e781deb 100644
--- a/hosts/mizuki/nixos.nix
+++ b/hosts/mizuki/nixos.nix
@@ -1,6 +1,7 @@
 { lib, pkgs, ... }: {
 
   environment.shells = with pkgs; [ zsh ];
+  environment.systemPackages = with pkgs; [ xorg.setxkbmap ];
 
   fonts = {
     packages = with pkgs; [ inter notonoto ];