3 files changed, 27 insertions, 9 deletions
diff --git a/modules/by-name/gi/git/module.nix b/modules/by-name/gi/git/module.nix
index 28e61ecb..a91aa365 100644
--- a/modules/by-name/gi/git/module.nix
+++ b/modules/by-name/gi/git/module.nix
@@ -74,9 +74,8 @@ in {
             defaultBranch = cfg.defaultBranchName;
           };
           user = {
-            name = "Benedikt Peetz";
-            email = "benedikt.peetz@b-peetz.de";
-            # signingKey = "[is down below]";
+            name = "Soispha Peetz";
+            email = "soispha@b-peetz.de";
           };
           help = {
             autocorrect = 5;
@@ -130,7 +129,7 @@ in {
 
         signing = {
           key = "8321ED3A8DB999A51F3BF80FF2682914EA42DE26";
-          signByDefault = true;
+          signByDefault = false;
         };
       };
     };
diff --git a/modules/by-name/gp/gpg/module.nix b/modules/by-name/gp/gpg/module.nix
index 9be4cada..afe3ee1b 100644
--- a/modules/by-name/gp/gpg/module.nix
+++ b/modules/by-name/gp/gpg/module.nix
@@ -102,8 +102,7 @@ in {
           maxCacheTtlSsh = 60 * 50;
 
           pinentry = {
-            package = pkgs.pinentry-curses;
-            # package = pkgs.pinentry-tty;
+            package = pkgs.pinentry-qt;
           };
 
           enableSshSupport = true;
diff --git a/pkgs/by-name/ro/rollup/src/main.rs b/pkgs/by-name/ro/rollup/src/main.rs
index 08f18648..29746e07 100644
--- a/pkgs/by-name/ro/rollup/src/main.rs
+++ b/pkgs/by-name/ro/rollup/src/main.rs
@@ -144,18 +144,38 @@ fn main() -> Result<()> {
                 return Ok(());
             };
             let patch_files = {
+                let iter = fs::read_dir(&patches_directory)?;
+                let mut output = vec![None; iter.count()];
+
                 let iter = fs::read_dir(patches_directory)?;
-                let mut output = vec![];
                 for entry in iter {
                     let entry = entry?;
                     if !entry.file_type()?.is_file() {
                         unreachable!("Should not be able to get non-files in patches directory");
                     }
-                    output.push(entry.path());
+                    let path = entry.path();
+                    let idx: usize = {
+                        let mut file_name = path
+                            .file_name()
+                            .expect("Should all have a filename")
+                            .to_str()
+                            .expect("Should be valid utf8")
+                            .chars();
+                        let number = file_name.clone().take(4).collect::<String>();
+                        assert_eq!(file_name.nth(4), Some('-'));
+
+                        number.parse().expect("Should parse as usize number")
+                    };
+                    output[idx - 1] = Some(path);
                 }
+                output.sort();
                 output
             };
-            apply_patches(patch_files, to, debug_parse)?;
+            apply_patches(
+                patch_files.into_iter().map(|s| s.unwrap()).collect(),
+                to,
+                debug_parse,
+            )?;
         }
     }