From 00cb1bbe74a2cac5dacb45ca804a06820e83d5e1 Mon Sep 17 00:00:00 2001
From: stitchy <stitchy@stitchy.moe>
Date: Tue, 30 Jul 2024 14:25:55 +0000
Subject: [PATCH] Fixing fonts, gpg-agent, clipboard, and other misc

---
 config/hypr/exec-start.conf   |  2 +-
 config/hypr/portal.sh         |  8 --------
 config/zshrc                  |  1 -
 hosts/lappy/default.nix       |  6 +++---
 packages/default.nix          | 17 +++++++++++++++++
 users/stitchynyan/default.nix |  3 ++-
 users/stitchynyan/home.nix    | 19 ++++++++++++++++++-
 7 files changed, 41 insertions(+), 15 deletions(-)
 delete mode 100755 config/hypr/portal.sh

diff --git a/config/hypr/exec-start.conf b/config/hypr/exec-start.conf
index deb3872..8d88c82 100644
--- a/config/hypr/exec-start.conf
+++ b/config/hypr/exec-start.conf
@@ -9,4 +9,4 @@ exec-once=${XDG_CONFIG_HOME:-~/.config}/dunst/scripts/low-battery.sh
 exec-once=fcitx5
 #exec-once=~/.config/hypr/portal.sh
 exec-once=systemctl --user import-environment DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once=wl-paste -p --watch wl-copy -pc
+exec-once=wl-paste -t text --watch clipman store --no-persist
diff --git a/config/hypr/portal.sh b/config/hypr/portal.sh
deleted file mode 100755
index 8f692bf..0000000
--- a/config/hypr/portal.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-sleep 1
-killall xdg-desktop-portal-hyprland
-killall xdg-desktop-portal-wlr
-killall xdg-desktop-portal
-/usr/lib/xdg-desktop-portal-hyprland &
-sleep 2
-/usr/lib/xdg-desktop-portal &
diff --git a/config/zshrc b/config/zshrc
index 268730a..08c0894 100755
--- a/config/zshrc
+++ b/config/zshrc
@@ -96,7 +96,6 @@ export QT_QPA_PLATFORMTHEME=qt5ct
 #export GDK_DEBUG=1
 export MBSYNCRC=${XDG_CONFIG_HOME:-~/.config}/mbsync/config
 export PASSWORD_STORE_DIR=${XDG_CONFIG_HOME:-~/.config}/password_store
-export GNUPGHOME=${XDG_DATA_HOME-~/.config}/gnupg
 export NOTMUCH_CONFIG=${XDG_CONFIG_HOME-~/.config}/notmuch/config
 export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
 export KDEHOME="$XDG_CONFIG_HOME"/kde
diff --git a/hosts/lappy/default.nix b/hosts/lappy/default.nix
index 1a30eab..90012f2 100644
--- a/hosts/lappy/default.nix
+++ b/hosts/lappy/default.nix
@@ -35,13 +35,13 @@
     "kernel.yama.ptrace_scope=0"
   ];
 
+  virtualisation.docker.enable = true;
   virtualisation.libvirtd.enable = true;
   hardware.bluetooth.enable = true;
   hardware.bluetooth.settings.General.Experimental = true;
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
+    enable32Bit= true;
     extraPackages = lib.attrVals [
       "intel-compute-runtime"
       "intel-media-driver"
diff --git a/packages/default.nix b/packages/default.nix
index da87046..6c9563c 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -19,6 +19,7 @@ let
     "dracula-theme"
     "wl-clipboard"
     "brightnessctl"
+    "clipman"
     "powertop"
     "easyeffects"
     "mutt-wizard"
@@ -66,6 +67,7 @@ in
       "p7zip"
       "pinentry"
       "neofetch"
+      "unzip"
       "wget"
       "zoxide"
     ] pkgs)
@@ -123,5 +125,20 @@ in
       "nerdfonts"
       "ipafont"
     ] pkgs;
+
+    fonts.fontconfig.defaultFonts = {
+      monospace = [
+        "Noto Sans Mono"
+        "IPAGothic"
+      ];
+      sansSerif = [
+        "Noto Sans"
+        "IPAPGothic"
+      ];
+      serif = [
+        "Noto Serif"
+        "IPAPMincho"
+      ];
+    };
   };
 }
diff --git a/users/stitchynyan/default.nix b/users/stitchynyan/default.nix
index 6ccc920..7dacc17 100644
--- a/users/stitchynyan/default.nix
+++ b/users/stitchynyan/default.nix
@@ -53,7 +53,8 @@
   };
 
   i18n.inputMethod = {
-    enabled = "fcitx5";
+    enable = true;
+    type = "fcitx5";
     fcitx5.addons = [
       pkgs.fcitx5-mozc
     ];
diff --git a/users/stitchynyan/home.nix b/users/stitchynyan/home.nix
index 9424baa..f639964 100644
--- a/users/stitchynyan/home.nix
+++ b/users/stitchynyan/home.nix
@@ -54,7 +54,7 @@ in
       #steamvr?
       procps
       usbutils
-      (python311.withPackages (lib.attrVals ["sympy" "matplotlib"]))
+      (python311.withPackages (lib.attrVals [ "matplotlib" "python-lsp-server" "sympy"]))
       (octaveFull.withPackages (lib.attrVals ["symbolic"]))
     ]
     ++ (lib.optionals (nixosConfig.stitchyconf.form == "handheld") handheldPkgs)
@@ -118,6 +118,23 @@ in
       };
     };
 
+    programs.gpg = {
+      homedir = "${config.xdg.dataHome}/gnupg";
+    };
+
+    services = {
+      gpg-agent = {
+        enable = true;
+        enableSshSupport = true;
+        defaultCacheTtl = 34560000;
+        maxCacheTtl = 34560000;
+        extraConfig = ''
+          allow-preset-passphrase
+          pinentry-program /run/current-system/sw/bin/pinentry
+        '';
+      };
+    };
+
     systemd.user.timers = {
       mailsync = {
         Unit.Description = "Syncs email";