summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2022-10-25 22:20:37 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2022-10-25 22:20:37 +0200
commit31832d598650eb17ba24a81680039b1973e80158 (patch)
treefc4898d1d336f443ac6080a6582ecebf67f27096
parenta9dcb53f534de97c8ef7601443e41d7487e1ca17 (diff)
downloadnixos-31832d598650eb17ba24a81680039b1973e80158.tar
nixos-31832d598650eb17ba24a81680039b1973e80158.tar.gz
nixos-31832d598650eb17ba24a81680039b1973e80158.tar.bz2
nixos-31832d598650eb17ba24a81680039b1973e80158.tar.xz
nixos-31832d598650eb17ba24a81680039b1973e80158.zip
...
-rw-r--r--accounts/gkleen@sif/default.nix23
-rw-r--r--overlays/pdf-redact-tools.nix28
-rw-r--r--user-profiles/yt-dlp.nix1
3 files changed, 40 insertions, 12 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 842f7538..fc64f2f2 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -320,19 +320,18 @@ in {
320 320
321 home = { 321 home = {
322 packages = with pkgs; [ 322 packages = with pkgs; [
323 fira fira-code powerline-fonts nerdfonts pavucontrol keepassxc 323 fira fira-code powerline-fonts nerdfonts pavucontrol
324 sxiv xclip mumble pulseaudio-ctl pamixer libnotify synergy 324 keepassxc sxiv xclip mumble pulseaudio-ctl pamixer libnotify
325 xorg.xbacklight screen-message 325 synergy xorg.xbacklight screen-message wrappedYTMDesktop
326 wrappedYTMDesktop qt5ct playerctl evince 326 qt5ct playerctl evince thunderbird wrappedZulip zoom-us
327 thunderbird wrappedZulip zoom-us steam steam-run wireshark 327 steam steam-run wireshark virt-manager rclone
328 virt-manager rclone cached-nix-shell xournal xmonad worktime 328 cached-nix-shell xournal xmonad worktime fira-code-symbols
329 fira-code-symbols libreoffice xournalpp wrappedChrome 329 libreoffice xournalpp wrappedChrome nixos-shell virt-viewer
330 nixos-shell virt-viewer freerdp gnome-icon-theme 330 freerdp gnome-icon-theme paper-icon-theme sshpassSecret
331 paper-icon-theme sshpassSecret weechat helvum 331 weechat helvum wrappedElementDesktop
332 wrappedElementDesktop matrix-synapse-tools.synadm 332 matrix-synapse-tools.synadm wrappedRocketChatDesktop
333 wrappedRocketChatDesktop
334 flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs 333 flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs
335 sieve-connect 334 sieve-connect pdf-redact-tools gimp inkscape
336 ]; 335 ];
337 336
338 file = { 337 file = {
diff --git a/overlays/pdf-redact-tools.nix b/overlays/pdf-redact-tools.nix
new file mode 100644
index 00000000..0f779a26
--- /dev/null
+++ b/overlays/pdf-redact-tools.nix
@@ -0,0 +1,28 @@
1{ final, prev, ... }: {
2 pdf-redact-tools = prev.stdenv.mkDerivation {
3 pname = "pdf-redact-tools";
4 version = "0.1.2";
5
6 src = prev.fetchFromGitHub {
7 owner = "firstlookmedia";
8 repo = "pdf-redact-tools";
9 rev = "e407942fa19027718b706033d460a1dec2097094";
10 sha256 = "sha256-mnz43HLau4PQ2xYqTx67I0BD+fVe0lRxQz2uAeCsaX0=";
11 };
12
13 buildInputs = [
14 (final.python27.withPackages (ps: with ps; []))
15 final.makeWrapper
16 ];
17
18 buildPhase = "true";
19
20 installPhase = ''
21 mkdir -p $out/bin
22 install -m 0755 -t $out/bin \
23 pdf-redact-tools
24 wrapProgram $out/bin/pdf-redact-tools \
25 --prefix PATH : ${prev.lib.makeBinPath (with final; [ imagemagick ghostscriptX exiftool ])}
26 '';
27 };
28}
diff --git a/user-profiles/yt-dlp.nix b/user-profiles/yt-dlp.nix
index dcba7fe2..0af42786 100644
--- a/user-profiles/yt-dlp.nix
+++ b/user-profiles/yt-dlp.nix
@@ -15,6 +15,7 @@
15 --embed-metadata 15 --embed-metadata
16 --downloader ${pkgs.aria2}/bin/aria2c 16 --downloader ${pkgs.aria2}/bin/aria2c
17 --sponsorblock-mark all 17 --sponsorblock-mark all
18 --restrict-filenames
18 ''; 19 '';
19 }; 20 };
20} 21}