summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2021-06-08 22:40:34 +0200
committerlassulus <lassulus@lassul.us>2021-06-08 22:40:34 +0200
commit23d5fe712f69365999c3f4b92a2c4af41fc12b2d (patch)
tree38ad1d0a004da127d7dbcb7483ca0fd4962e3eec
parent0b5c89dae9242e1817ae6add75253018f9ac644d (diff)
parentb5753d89f75fdd270c9922b3452806db200d1546 (diff)
Merge remote-tracking branch 'ni/master'
-rw-r--r--krebs/5pkgs/haskell/flameshot-once.nix4
-rw-r--r--krebs/5pkgs/simple/flameshot-once/profile.nix4
2 files changed, 5 insertions, 3 deletions
diff --git a/krebs/5pkgs/haskell/flameshot-once.nix b/krebs/5pkgs/haskell/flameshot-once.nix
index 737722875..c8007ce9e 100644
--- a/krebs/5pkgs/haskell/flameshot-once.nix
+++ b/krebs/5pkgs/haskell/flameshot-once.nix
@@ -6,8 +6,8 @@ mkDerivation {
version = "1.4.0";
src = fetchgit {
url = "https://cgit.krebsco.de/flameshot-once";
- sha256 = "03g6sxgp6hcmbww5lzbs5llssgii1w469i5pz14x94542l06cmkq";
- rev = "5f0ba1cf326d215bd5c50ad74c634e92c785ae46";
+ sha256 = "13szgsiwn29aixm5xvs1m7128y5km5xss0ry5ii5y068rc2vysw8";
+ rev = "4475893c2081b3d9db4b7a54d0ce38d0914a17bf";
fetchSubmodules = true;
};
isLibrary = false;
diff --git a/krebs/5pkgs/simple/flameshot-once/profile.nix b/krebs/5pkgs/simple/flameshot-once/profile.nix
index 5aed99597..d70e2be1a 100644
--- a/krebs/5pkgs/simple/flameshot-once/profile.nix
+++ b/krebs/5pkgs/simple/flameshot-once/profile.nix
@@ -157,7 +157,7 @@ let
"QList<${t}>${le.x4 0}${le.x4 (length xs)}${concatMapStrings le.x4 xs}";
XDG_CONFIG_HOME = pkgs.write "flameshot-config" {
- "/Dharkael/flameshot.ini".text = ''
+ "/flameshot/flameshot.ini".text = ''
[General]
buttons=@Variant(\0\0\0\x7f\0\0\0\v${toQList "int" cfg.buttons})
disabledTrayIcon=${toJSON cfg.disabledTrayIcon}
@@ -166,6 +166,8 @@ let
savePath=${toJSON cfg.savePath}
showDesktopNotification=${toJSON cfg.showDesktopNotification}
showHelp=${toJSON cfg.showHelp}
+ [Shortcuts]
+ TYPE_COPY=Return
'';
};