diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2024-10-20 15:17:35 +0200 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2024-10-20 15:17:35 +0200 |
commit | f6e341bdbbec0d05a5c20baf79cd1704f6fa3df2 (patch) | |
tree | a6c40d81604a32ccacfa0a9df0616e547b077da2 | |
parent | 53bdb0113d8cd362dc4551296980fe13fe0a5afb (diff) | |
download | nixos-f6e341bdbbec0d05a5c20baf79cd1704f6fa3df2.tar nixos-f6e341bdbbec0d05a5c20baf79cd1704f6fa3df2.tar.gz nixos-f6e341bdbbec0d05a5c20baf79cd1704f6fa3df2.tar.bz2 nixos-f6e341bdbbec0d05a5c20baf79cd1704f6fa3df2.tar.xz nixos-f6e341bdbbec0d05a5c20baf79cd1704f6fa3df2.zip |
...
-rw-r--r-- | accounts/gkleen@sif/default.nix | 4 | ||||
-rw-r--r-- | accounts/gkleen@sif/hyprland.nix | 4 | ||||
-rwxr-xr-x | overlays/worktime/worktime/__main__.py | 8 | ||||
-rw-r--r-- | 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 { | |||
164 | edit-server mediawiki editorconfig typescript-mode | 164 | edit-server mediawiki editorconfig typescript-mode |
165 | markdown-mode nftables-mode rustic lsp-mode lsp-ui | 165 | markdown-mode nftables-mode rustic lsp-mode lsp-ui |
166 | direnv company projectile tomorrow-night-paradise-theme | 166 | direnv company projectile tomorrow-night-paradise-theme |
167 | treesit-grammars.with-all-grammars magit-delta | 167 | treesit-grammars.with-all-grammars magit-delta scad-mode |
168 | ]; | 168 | ]; |
169 | overrides = self: super: { | 169 | overrides = self: super: { |
170 | tomorrow-night-paradise-theme = super.trivialBuild { | 170 | tomorrow-night-paradise-theme = super.trivialBuild { |
@@ -707,7 +707,7 @@ in { | |||
707 | matrix-synapse-tools.synadm | 707 | matrix-synapse-tools.synadm |
708 | flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs | 708 | flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs |
709 | sieve-connect gimp inkscape udiskie glab nitrokey-app | 709 | sieve-connect gimp inkscape udiskie glab nitrokey-app |
710 | pynitrokey gtklock wlrctl | 710 | pynitrokey gtklock wlrctl remmina openscad |
711 | ]; | 711 | ]; |
712 | 712 | ||
713 | file = { | 713 | 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 { | |||
192 | export PATH="${lib.makeBinPath (with pkgs; [ wl-clipboard-rs socat ])}:$PATH" | 192 | export PATH="${lib.makeBinPath (with pkgs; [ wl-clipboard-rs socat ])}:$PATH" |
193 | socat STDIO UNIX-CONNECT:"$XDG_RUNTIME_DIR"/yt-dlp.sock <<<$'{ "urls": ["'"$(wl-paste)"$'"] }' | 193 | socat STDIO UNIX-CONNECT:"$XDG_RUNTIME_DIR"/yt-dlp.sock <<<$'{ "urls": ["'"$(wl-paste)"$'"] }' |
194 | ''}" | 194 | ''}" |
195 | "$mainMod ALT, L, exec, ${pkgs.writeShellScript "mpv" '' | ||
196 | export PATH="${lib.makeBinPath (with pkgs; [ wl-clipboard-rs ])}:$PATH" | ||
197 | exec mpv "$(wl-paste)" | ||
198 | ''}" | ||
195 | 199 | ||
196 | ", Print, exec, ${pkgs.writeShellScript "screenshot" '' | 200 | ", Print, exec, ${pkgs.writeShellScript "screenshot" '' |
197 | export PATH="${lib.makeBinPath (with pkgs; [ grim slurp wl-clipboard-rs coreutils ])}:$PATH" | 201 | 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(): | |||
829 | classification_parser.set_defaults(cmd = partial(classification, classification_name=classification_name)) | 829 | classification_parser.set_defaults(cmd = partial(classification, classification_name=classification_name)) |
830 | args = parser.parse_args() | 830 | args = parser.parse_args() |
831 | 831 | ||
832 | args.cmd( | 832 | args.cmd(**vars(args)) |
833 | **{ | ||
834 | k: v | ||
835 | for k, v in vars(args).items() | ||
836 | if k in signature(args.cmd).parameters.keys() | ||
837 | } | ||
838 | ) | ||
839 | 833 | ||
840 | if __name__ == "__main__": | 834 | if __name__ == "__main__": |
841 | sys.exit(main()) | 835 | 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 @@ | |||
7 | cookies-from-browser = "firefox::none"; | 7 | cookies-from-browser = "firefox::none"; |
8 | mark-watched = true; | 8 | mark-watched = true; |
9 | format = lib.concatStringsSep "/" [ | 9 | format = lib.concatStringsSep "/" [ |
10 | "bestvideo*[width<=3840][height<=2160][fps<=60]+bestaudio" | 10 | "bestvideo*[width<=2560][height<=1440][fps<=60]+bestaudio" |
11 | "best[width<=3840][height<=2160][fps<=60]" | 11 | "best[width<=2560][height<=1440][fps<=60]" |
12 | "bestvideo*+bestaudio" | 12 | "bestvideo*+bestaudio" |
13 | "best" | 13 | "best" |
14 | ]; | 14 | ]; |