Compare commits

..

8 Commits

6 changed files with 26 additions and 9 deletions

View File

@@ -41,7 +41,7 @@
swapDevices = [ swapDevices = [
{ {
device = "/.swapfile"; device = "/.swapfile";
size = 4 * 1024; size = 24 * 1024;
} }
]; ];

View File

@@ -26,6 +26,14 @@
ispell ispell
libtool libtool
vscode-langservers-extracted vscode-langservers-extracted
(pkgs.stdenvNoCC.mkDerivation {
name = "epdfinfo";
phases = "installPhase";
installPhase = ''
mkdir -p $out/bin
ln -s $(${pkgs.findutils}/bin/find ${pkgs.emacsPackages.pdf-tools}/ -name epdfinfo) $out/bin/
'';
})
]; ];
default-shell-pkgs = with pkgs; [ default-shell-pkgs = with pkgs; [
bash-language-server bash-language-server

View File

@@ -98,9 +98,8 @@
:desc "File Symbols" "c s" #'consult-lsp-file-symbols :desc "File Symbols" "c s" #'consult-lsp-file-symbols
:desc "All Symbols" "c S" #'consult-lsp-symbols) :desc "All Symbols" "c S" #'consult-lsp-symbols)
(use-package! direnv (use-package envrc
:config :hook (after-init . envrc-global-mode))
(direnv-mode))
(after! markdown-mode (after! markdown-mode
(setq markdown-split-window-direction 'right) (setq markdown-split-window-direction 'right)

View File

@@ -76,7 +76,13 @@
:branch "fix-polymode-compatibility") :branch "fix-polymode-compatibility")
:pin "2ff01b4adbb6302798fc84464d1e420e337113fd") :pin "2ff01b4adbb6302798fc84464d1e420e337113fd")
(package! direnv) (package! envrc
:recipe (:host github
:repo "Grimpper/envrc"
:branch "support-async-execution"
)
:pin "71f67971bc5eb2974ae2f738512c8f09f0822527")
(package! pdf-tools) (package! pdf-tools)
(package! eww) (package! eww)
(package! pandoc-mode) (package! pandoc-mode)

View File

@@ -35,7 +35,7 @@ in {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
description = '' description = ''
Enable Darktable for raw processing. Enable raw processing programs.
''; '';
}; };
video-editing-light = lib.mkOption { video-editing-light = lib.mkOption {
@@ -71,16 +71,18 @@ in {
hugin hugin
rawtherapee rawtherapee
unstable.darktable unstable.darktable
unstable.rapidraw
] ]
++ lib.optionals cfg.video-editing-light [ ++ lib.optionals cfg.video-editing-light [
ffmpeg
losslesscut-bin
avidemux-wayland-fix avidemux-wayland-fix
ffmpeg
hive.bulk-transcode
losslesscut-bin
] ]
++ lib.optionals cfg.video-editing-heavy [ ++ lib.optionals cfg.video-editing-heavy [
davinci-resolve davinci-resolve
hive.bulk-transcode
kdePackages.kdenlive kdePackages.kdenlive
obs-studio
] ]
++ lib.optional cfg.daws bitwig-studio-latest; ++ lib.optional cfg.daws bitwig-studio-latest;
}; };

View File

@@ -3,6 +3,7 @@
declare -rA presets=( declare -rA presets=(
[davinci-resolve]="-c:v dnxhd -profile:v dnxhr_hq -pix_fmt yuv422p -c:a pcm_s16le" [davinci-resolve]="-c:v dnxhd -profile:v dnxhr_hq -pix_fmt yuv422p -c:a pcm_s16le"
[instagram]="-vf scale='if(gte(iw/ih,1),1920,-1)':'if(gte(iw/ih,1),-1,1920)':flags=lanczos -r 30 -c:v libx264 -profile:v high -level 4.1 -pix_fmt yuv420p -preset slow -crf 18 -bf 2 -g 15 -keyint_min 15 -x264-params \"open-gop=0:cabac=1:b-pyramid=none\" -movflags +faststart -c:a aac -b:a 96k" [instagram]="-vf scale='if(gte(iw/ih,1),1920,-1)':'if(gte(iw/ih,1),-1,1920)':flags=lanczos -r 30 -c:v libx264 -profile:v high -level 4.1 -pix_fmt yuv420p -preset slow -crf 18 -bf 2 -g 15 -keyint_min 15 -x264-params \"open-gop=0:cabac=1:b-pyramid=none\" -movflags +faststart -c:a aac -b:a 96k"
[insta-4k]="-r 30 -c:v libx264 -profile:v high -level 4.1 -pix_fmt yuv420p -preset slow -crf 18 -bf 2 -g 15 -keyint_min 15 -x264-params \"open-gop=0:cabac=1:b-pyramid=none\" -movflags +faststart -c:a aac -b:a 96k"
[storage-hevc]="-c:v libx265 -preset slower -crf 18 -pix_fmt yuv420p10le -x265-params aq-mode=3:aq-strength=1.0:psy-rd=1.8:psy-rdoq=1.0 -c:a copy" [storage-hevc]="-c:v libx265 -preset slower -crf 18 -pix_fmt yuv420p10le -x265-params aq-mode=3:aq-strength=1.0:psy-rd=1.8:psy-rdoq=1.0 -c:a copy"
[storage-av1]="-c:v libsvtav1 -preset 6 -crf 28 -pix_fmt yuv420p -g 240 -svtav1-params tune=0:aq-mode=2 -c:a copy" [storage-av1]="-c:v libsvtav1 -preset 6 -crf 28 -pix_fmt yuv420p -g 240 -svtav1-params tune=0:aq-mode=2 -c:a copy"
[storage-av1-1080p]="-vf scale='if(gte(iw/ih,1),1920,-1)':'if(gte(iw/ih,1),-1,1920)' -c:v libsvtav1 -preset 6 -crf 28 -pix_fmt yuv420p -g 240 -svtav1-params tune=0:aq-mode=2 -c:a copy" [storage-av1-1080p]="-vf scale='if(gte(iw/ih,1),1920,-1)':'if(gte(iw/ih,1),-1,1920)' -c:v libsvtav1 -preset 6 -crf 28 -pix_fmt yuv420p -g 240 -svtav1-params tune=0:aq-mode=2 -c:a copy"
@@ -15,6 +16,7 @@ declare -rA presets=(
declare -rA containers=( declare -rA containers=(
[davinci-resolve]="mov" [davinci-resolve]="mov"
[instagram]="mp4" [instagram]="mp4"
[insta-4k]="mp4"
[storage-hevc]="mkv" [storage-hevc]="mkv"
[storage-av1]="mkv" [storage-av1]="mkv"
[storage-av1-1080p]="mkv" [storage-av1-1080p]="mkv"