From f6e341bdbbec0d05a5c20baf79cd1704f6fa3df2 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 20 Oct 2024 15:17:35 +0200 Subject: ... --- accounts/gkleen@sif/default.nix | 4 ++-- accounts/gkleen@sif/hyprland.nix | 4 ++++ overlays/worktime/worktime/__main__.py | 8 +------- user-profiles/yt-dlp.nix | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index 8cee684f..5bdd1651 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix @@ -164,7 +164,7 @@ in { edit-server mediawiki editorconfig typescript-mode markdown-mode nftables-mode rustic lsp-mode lsp-ui direnv company projectile tomorrow-night-paradise-theme - treesit-grammars.with-all-grammars magit-delta + treesit-grammars.with-all-grammars magit-delta scad-mode ]; overrides = self: super: { tomorrow-night-paradise-theme = super.trivialBuild { @@ -707,7 +707,7 @@ in { matrix-synapse-tools.synadm flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs sieve-connect gimp inkscape udiskie glab nitrokey-app - pynitrokey gtklock wlrctl + pynitrokey gtklock wlrctl remmina openscad ]; file = { diff --git a/accounts/gkleen@sif/hyprland.nix b/accounts/gkleen@sif/hyprland.nix index c5043e87..3216f307 100644 --- a/accounts/gkleen@sif/hyprland.nix +++ b/accounts/gkleen@sif/hyprland.nix @@ -192,6 +192,10 @@ in { export PATH="${lib.makeBinPath (with pkgs; [ wl-clipboard-rs socat ])}:$PATH" socat STDIO UNIX-CONNECT:"$XDG_RUNTIME_DIR"/yt-dlp.sock <<<$'{ "urls": ["'"$(wl-paste)"$'"] }' ''}" + "$mainMod ALT, L, exec, ${pkgs.writeShellScript "mpv" '' + export PATH="${lib.makeBinPath (with pkgs; [ wl-clipboard-rs ])}:$PATH" + exec mpv "$(wl-paste)" + ''}" ", Print, exec, ${pkgs.writeShellScript "screenshot" '' export PATH="${lib.makeBinPath (with pkgs; [ grim slurp wl-clipboard-rs coreutils ])}:$PATH" diff --git a/overlays/worktime/worktime/__main__.py b/overlays/worktime/worktime/__main__.py index c2c1829c..362c8da4 100755 --- a/overlays/worktime/worktime/__main__.py +++ b/overlays/worktime/worktime/__main__.py @@ -829,13 +829,7 @@ def main(): classification_parser.set_defaults(cmd = partial(classification, classification_name=classification_name)) args = parser.parse_args() - args.cmd( - **{ - k: v - for k, v in vars(args).items() - if k in signature(args.cmd).parameters.keys() - } - ) + args.cmd(**vars(args)) if __name__ == "__main__": sys.exit(main()) diff --git a/user-profiles/yt-dlp.nix b/user-profiles/yt-dlp.nix index e6c28c60..0f0b2204 100644 --- a/user-profiles/yt-dlp.nix +++ b/user-profiles/yt-dlp.nix @@ -7,8 +7,8 @@ cookies-from-browser = "firefox::none"; mark-watched = true; format = lib.concatStringsSep "/" [ - "bestvideo*[width<=3840][height<=2160][fps<=60]+bestaudio" - "best[width<=3840][height<=2160][fps<=60]" + "bestvideo*[width<=2560][height<=1440][fps<=60]+bestaudio" + "best[width<=2560][height<=1440][fps<=60]" "bestvideo*+bestaudio" "best" ]; -- cgit v1.2.3