From d00100f0ba412dd8cc774457dee6ab824dcee4ee Mon Sep 17 00:00:00 2001
From: Max <max@privatevoid.net>
Date: Sun, 31 Jul 2022 15:11:14 +0200
Subject: [PATCH] new git alias: git forgor :skull:

---
 flake.lock                           |  6 ++--
 packages/nixpak/modules/gui-base.nix | 47 +++++++++++++++++++++++++++-
 users/max/home/git.nix               |  1 +
 3 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index e723f8c..ac9b8ec 100644
--- a/flake.lock
+++ b/flake.lock
@@ -479,11 +479,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1657224639,
-        "narHash": "sha256-KMu+GjI7wNZVtRbGmIWTwqlZK6ygYieH7uIG0OTtMUc=",
+        "lastModified": 1659087099,
+        "narHash": "sha256-VxWbaH8WjRp5VKUawO562rDkcknGknCR3ws6k7P9Sqw=",
         "owner": "max-privatevoid",
         "repo": "nixpak",
-        "rev": "3c49e84cd5e4c8141ee7bf9a826a7e70761e9b43",
+        "rev": "0d065d847bad75dfa2d055009bb2f07a85c47350",
         "type": "github"
       },
       "original": {
diff --git a/packages/nixpak/modules/gui-base.nix b/packages/nixpak/modules/gui-base.nix
index 86bfa32..8fe5221 100644
--- a/packages/nixpak/modules/gui-base.nix
+++ b/packages/nixpak/modules/gui-base.nix
@@ -1,5 +1,44 @@
 { config, lib, pkgs, ... }:
 
+let
+  locales = pkgs.glibcLocales.override {
+    allLocales = true;
+  };
+
+  fonts = with pkgs; [
+    cantarell-fonts
+    dejavu_fonts
+    liberation_ttf
+    gyre-fonts
+    source-sans
+    source-code-pro
+  ];
+  fontCache = pkgs.makeFontsCache {
+    inherit (pkgs) fontconfig;
+    fontDirectories = fonts;
+  };
+  fontConfigFile = pkgs.writeTextDir "etc/fonts/conf.d/00-nixpak-fonts.conf" ''
+    <?xml version='1.0'?>
+    <!DOCTYPE fontconfig SYSTEM 'urn:fontconfig:fonts.dtd'>
+    <fontconfig>
+      <!-- Font directories -->
+      ${lib.concatStringsSep "\n" (map (font: "<dir>${font}</dir>") fonts)}
+      ${lib.optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) ''
+      <!-- Pre-generated font caches -->
+      <cachedir>${fontCache}</cachedir>
+      ''}
+    </fontconfig>
+  '';
+  fc = pkgs.buildEnv {
+    name = "nixpak-font-env";
+    paths = [
+      fontConfigFile
+      pkgs.fontconfig.out
+    ];
+    pathsToLink = "/etc/fonts";
+  };
+in
+
 {
   config = {
     dbus.policies = {
@@ -12,6 +51,7 @@
       "org.a11y.Bus" = "talk";
     };
     gpu.enable = lib.mkDefault true;
+    gpu.provider = "bundle";
     bubblewrap = {
       network = lib.mkDefault false;
       bind.rw = [
@@ -23,7 +63,7 @@
         "$XDG_RUNTIME_DIR/pulse"
       ];
       bind.ro = [
-        "/etc/fonts"
+        [ "${fc}/etc/fonts" "/etc/fonts" ]
         "$XDG_RUNTIME_DIR/doc"
         "$HOME/.config/gtk-2.0"
         "$HOME/.config/gtk-3.0"
@@ -34,6 +74,11 @@
           pkgs.gnome.adwaita-icon-theme
           pkgs.shared-mime-info
         ];
+        XCURSOR_PATH = lib.concatStringsSep ":" [
+          "${pkgs.gnome.adwaita-icon-theme}/share/icons"
+          "${pkgs.gnome.adwaita-icon-theme}/share/pixmaps"
+        ];
+        LOCALE_ARCHIVE = "${locales}/lib/locale/locale-archive";
       };
     };
   };
diff --git a/users/max/home/git.nix b/users/max/home/git.nix
index 9e47f3d..1941303 100644
--- a/users/max/home/git.nix
+++ b/users/max/home/git.nix
@@ -11,6 +11,7 @@
       ac = "!git add . && git commit";
       dump = "!cd ~/Projects/dump && git clone --depth=1";
       drop = "!EDITOR='${pkgs.gnused}/bin/sed -i s/^pick/drop/g' git rebase -i";
+      forgor = "commit --amend --no-edit";
       grab = "clone --depth=1";
       graph = "log --all --decorate --graph --oneline";
       gud = ac;