Compare commits
5 commits
faf7738627
...
99ee0e4ea6
Author | SHA1 | Date | |
---|---|---|---|
99ee0e4ea6 | |||
e93f8124e5 | |||
2cebc41c3f | |||
67c5c09dd4 | |||
e6d169d828 |
6 changed files with 83 additions and 49 deletions
|
@ -23,8 +23,63 @@
|
||||||
sponsorblock
|
sponsorblock
|
||||||
modernx-zydezu
|
modernx-zydezu
|
||||||
])
|
])
|
||||||
++ lib.optionals pkgs.stdenv.hostPlatform.isLinux (with pkgs.mpvScripts; [
|
++ lib.optional pkgs.stdenv.hostPlatform.isLinux pkgs.mpvScripts.mpris;
|
||||||
mpris
|
|
||||||
]);
|
bindings = let
|
||||||
|
inherit (pkgs) anime4k;
|
||||||
|
setShader = message: files: ''no-osd change-list glsl-shaders set "${lib.concatStringsSep ":" files}"; show-text "${message}"'';
|
||||||
|
in {
|
||||||
|
"CTRL+1" = setShader "Anime4K: Mode A (Fast)" [
|
||||||
|
"${anime4k}/Anime4K_Clamp_Highlights.glsl"
|
||||||
|
"${anime4k}/Anime4K_Restore_CNN_M.glsl"
|
||||||
|
"${anime4k}/Anime4K_Upscale_CNN_x2_M.glsl"
|
||||||
|
"${anime4k}/Anime4K_AutoDownscalePre_x2.glsl"
|
||||||
|
"${anime4k}/Anime4K_AutoDownscalePre_x4.glsl"
|
||||||
|
"${anime4k}/Anime4K_Upscale_CNN_x2_S.glsl"
|
||||||
|
];
|
||||||
|
"CTRL+2" = setShader "Anime4K: Mode B (Fast)" [
|
||||||
|
"${anime4k}/Anime4K_Clamp_Highlights.glsl"
|
||||||
|
"${anime4k}/Anime4K_Restore_CNN_Soft_M.glsl"
|
||||||
|
"${anime4k}/Anime4K_Upscale_CNN_x2_M.glsl"
|
||||||
|
"${anime4k}/Anime4K_AutoDownscalePre_x2.glsl"
|
||||||
|
"${anime4k}/Anime4K_AutoDownscalePre_x4.glsl"
|
||||||
|
"${anime4k}/Anime4K_Upscale_CNN_x2_S.glsl"
|
||||||
|
];
|
||||||
|
"CTRL+3" = setShader "Anime4K: Mode C (Fast)" [
|
||||||
|
"${anime4k}/Anime4K_Clamp_Highlights.glsl"
|
||||||
|
"${anime4k}/Anime4K_Upscale_Denoise_CNN_x2_M.glsl "
|
||||||
|
"${anime4k}/Anime4K_AutoDownscalePre_x2.glsl"
|
||||||
|
"${anime4k}/Anime4K_AutoDownscalePre_x4.glsl"
|
||||||
|
"${anime4k}/Anime4K_Upscale_CNN_x2_S.glsl"
|
||||||
|
];
|
||||||
|
"CTRL+4" = setShader "Anime4K: Mode A+A (Fast)" [
|
||||||
|
"${anime4k}/Anime4K_Clamp_Highlights.glsl"
|
||||||
|
"${anime4k}/Anime4K_Restore_CNN_M.glsl"
|
||||||
|
"${anime4k}/Anime4K_Upscale_CNN_x2_M.glsl"
|
||||||
|
"${anime4k}/Anime4K_Restore_CNN_S.glsl"
|
||||||
|
"${anime4k}/Anime4K_AutoDownscalePre_x2.glsl"
|
||||||
|
"${anime4k}/Anime4K_AutoDownscalePre_x4.glsl"
|
||||||
|
"${anime4k}/Anime4K_Upscale_CNN_x2_S.glsl"
|
||||||
|
];
|
||||||
|
"CTRL+5" = setShader "Anime4K: Mode B+B (Fast)" [
|
||||||
|
"${anime4k}/Anime4K_Clamp_Highlights.glsl"
|
||||||
|
"${anime4k}/Anime4K_Restore_CNN_Soft_M.glsl"
|
||||||
|
"${anime4k}/Anime4K_Upscale_CNN_x2_M.glsl"
|
||||||
|
"${anime4k}/Anime4K_AutoDownscalePre_x2.glsl"
|
||||||
|
"${anime4k}/Anime4K_AutoDownscalePre_x4.glsl"
|
||||||
|
"${anime4k}/Anime4K_Restore_CNN_Soft_S.glsl"
|
||||||
|
"${anime4k}/Anime4K_Upscale_CNN_x2_S.glsl"
|
||||||
|
];
|
||||||
|
"CTRL+6" = setShader "Anime4K: Mode C+A (Fast)" [
|
||||||
|
"${anime4k}/Anime4K_Clamp_Highlights.glsl"
|
||||||
|
"${anime4k}/Anime4K_Upscale_Denoise_CNN_x2_M.glsl"
|
||||||
|
"${anime4k}/Anime4K_AutoDownscalePre_x2.glsl"
|
||||||
|
"${anime4k}/Anime4K_AutoDownscalePre_x4.glsl"
|
||||||
|
"${anime4k}/Anime4K_Restore_CNN_S.glsl"
|
||||||
|
"${anime4k}/Anime4K_Upscale_CNN_x2_S.glsl"
|
||||||
|
];
|
||||||
|
|
||||||
|
"CTRL+0" = ''no-osd change-list glsl-shaders clr ""; show-text "GLSL shaders cleared"'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,28 +1,27 @@
|
||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
# lsp
|
# lsp
|
||||||
nil
|
|
||||||
alejandra
|
alejandra
|
||||||
statix
|
|
||||||
deadnix
|
deadnix
|
||||||
|
nil
|
||||||
|
statix
|
||||||
|
|
||||||
# nixpkgs PRs
|
# nixpkgs PRs
|
||||||
nixfmt-rfc-style
|
|
||||||
nix-update
|
|
||||||
nix-init
|
nix-init
|
||||||
|
nix-update
|
||||||
|
nixfmt-rfc-style
|
||||||
nixpkgs-review
|
nixpkgs-review
|
||||||
|
|
||||||
# misc
|
# misc
|
||||||
nh
|
|
||||||
nix-output-monitor
|
|
||||||
nix-index
|
|
||||||
nix-tree
|
|
||||||
comma
|
|
||||||
sops
|
|
||||||
colmena
|
colmena
|
||||||
|
comma
|
||||||
|
nh
|
||||||
|
nix-index
|
||||||
|
nix-output-monitor
|
||||||
|
nix-tree
|
||||||
|
sops
|
||||||
];
|
];
|
||||||
|
|
||||||
# for `nh`
|
# nh
|
||||||
# yes, i know, weird and long path
|
home.sessionVariables.FLAKE = "/home/guanranwang/Documents/Projects/flake";
|
||||||
home.sessionVariables.FLAKE = "/home/guanranwang/Documents/Projects/git-repos/github.com/Guanran928/flake";
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,18 +1,5 @@
|
||||||
(default) {
|
(default) {
|
||||||
encode zstd gzip
|
encode zstd gzip
|
||||||
|
|
||||||
header {
|
|
||||||
# https://observatory.mozilla.org/analyze/ny4.dev
|
|
||||||
# https://infosec.mozilla.org/guidelines/web_security
|
|
||||||
# https://caddyserver.com/docs/caddyfile/directives/header#examples
|
|
||||||
|
|
||||||
?Content-Security-Policy "default-src https: blob: 'unsafe-eval' 'unsafe-inline'; object-src 'none'"
|
|
||||||
?Permissions-Policy interest-Hpcohort=()
|
|
||||||
?Strict-Transport-Security max-age=31536000;
|
|
||||||
?X-Content-Type-Options nosniff
|
|
||||||
?X-Frame-Options DENY
|
|
||||||
}
|
|
||||||
|
|
||||||
handle_path /robots.txt {
|
handle_path /robots.txt {
|
||||||
file_server * {
|
file_server * {
|
||||||
root /var/www/robots/robots.txt
|
root /var/www/robots/robots.txt
|
||||||
|
|
|
@ -8,19 +8,6 @@
|
||||||
|
|
||||||
(default) {
|
(default) {
|
||||||
encode zstd gzip
|
encode zstd gzip
|
||||||
|
|
||||||
header {
|
|
||||||
# https://observatory.mozilla.org/analyze/ny4.dev
|
|
||||||
# https://infosec.mozilla.org/guidelines/web_security
|
|
||||||
# https://caddyserver.com/docs/caddyfile/directives/header#examples
|
|
||||||
|
|
||||||
?Content-Security-Policy "default-src https: blob: 'unsafe-eval' 'unsafe-inline'; object-src 'none'"
|
|
||||||
?Permissions-Policy interest-Hpcohort=()
|
|
||||||
?Strict-Transport-Security max-age=31536000;
|
|
||||||
?X-Content-Type-Options nosniff
|
|
||||||
?X-Frame-Options DENY
|
|
||||||
}
|
|
||||||
|
|
||||||
handle_path /robots.txt {
|
handle_path /robots.txt {
|
||||||
file_server * {
|
file_server * {
|
||||||
root /var/www/robots/robots.txt
|
root /var/www/robots/robots.txt
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
"searx/environment" = {
|
"searx/environment" = {
|
||||||
restartUnits = ["searx.service"];
|
restartUnits = ["searx.service"];
|
||||||
};
|
};
|
||||||
"miniflux/credentials" = {
|
"miniflux/environment" = {
|
||||||
restartUnits = ["miniflux.service"];
|
restartUnits = ["miniflux.service"];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -69,10 +69,10 @@
|
||||||
element-web-unwrapped = pkgs.element-web-unwrapped.overrideAttrs (oldAttrs: {
|
element-web-unwrapped = pkgs.element-web-unwrapped.overrideAttrs (oldAttrs: {
|
||||||
version = "1.11.70";
|
version = "1.11.70";
|
||||||
src = oldAttrs.src.overrideAttrs {
|
src = oldAttrs.src.overrideAttrs {
|
||||||
outputHash = "sha256-kx6xQIuYSXkkBTYb+fZLL3cuHFcNj7RkC60o6Fyp8LI=";
|
outputHash = "sha256-UzSqChCa94LqaQpMzwQGPX3G2xxOpP3jp5OvR1iBzRs=";
|
||||||
};
|
};
|
||||||
offlineCache = oldAttrs.offlineCache.overrideAttrs {
|
offlineCache = oldAttrs.offlineCache.overrideAttrs {
|
||||||
outputHash = "sha256-q/KbpU/haBhXZbGBITLYSywCluwN6ZZarVLmzB9tDN8=";
|
outputHash = "sha256-M4FTUtx7vpZIEdu/NM98/zIDGyPOtfocrj29/qChyyQ=";
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -285,10 +285,16 @@
|
||||||
|
|
||||||
services.miniflux = {
|
services.miniflux = {
|
||||||
enable = true;
|
enable = true;
|
||||||
adminCredentialsFile = config.sops.secrets."miniflux/credentials".path;
|
adminCredentialsFile = config.sops.secrets."miniflux/environment".path;
|
||||||
config = {
|
config = {
|
||||||
LISTEN_ADDR = "127.0.0.1:9300";
|
LISTEN_ADDR = "127.0.0.1:9300";
|
||||||
BASE_URL = "https://rss.ny4.dev";
|
BASE_URL = "https://rss.ny4.dev";
|
||||||
|
|
||||||
|
OAUTH2_PROVIDER = "oidc";
|
||||||
|
OAUTH2_CLIENT_ID = "miniflux";
|
||||||
|
# OAUTH2_CLIENT_SECRET = "replace_me"; # EnvironmentFile
|
||||||
|
OAUTH2_REDIRECT_URL = "https://rss.ny4.dev/oauth2/oidc/callback";
|
||||||
|
OAUTH2_OIDC_DISCOVERY_ENDPOINT = "https://id.ny4.dev/realms/ny4";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ searx:
|
||||||
pixivfe:
|
pixivfe:
|
||||||
environment: ENC[AES256_GCM,data:/Q/rShBXlXkWOOP+7OhKtKTSrp2zNizMaAOyKfWbKgJMHTjNfmMtRuGKRez9KXM5MDIMIF9iJSQ=,iv:whIAkaWiZcZT4HfmJw4qA+fbQ9zHFp+kTuHxQDE3XoU=,tag:FroLTMtNwGlvZw3osftj3A==,type:str]
|
environment: ENC[AES256_GCM,data:/Q/rShBXlXkWOOP+7OhKtKTSrp2zNizMaAOyKfWbKgJMHTjNfmMtRuGKRez9KXM5MDIMIF9iJSQ=,iv:whIAkaWiZcZT4HfmJw4qA+fbQ9zHFp+kTuHxQDE3XoU=,tag:FroLTMtNwGlvZw3osftj3A==,type:str]
|
||||||
miniflux:
|
miniflux:
|
||||||
credentials: ENC[AES256_GCM,data:vYd964LCV4NCZxbuIhdXznsl7n6jMPIFjWvo0tTTm4V3la93MN4DYLUPy4U=,iv:gqBCf7uqigTxdLs8oSd/KkNb56luUDrtrAOxxUuJgUE=,tag:LzniGyWeZxHrpQAaEOQP8A==,type:str]
|
environment: ENC[AES256_GCM,data:eT1rVeXbDANk/+9xmxmTHvMNofyplNGvVFgTj4lFQlJSHTi+br1qfg0tddf5aCtE8cNGt0fNm63qguI2Df/+KWENhb0vCpjRG7zryfBhEwMP5jkVgDnaHYolS1z3OmhlEpE=,iv:tWAUCtlk8wDGWGmn7j00QOVwjPYDkTPDGpyxd1pP6ig=,tag:gLNdzK9GZ/m5mWL5YNrzyQ==,type:str]
|
||||||
sops:
|
sops:
|
||||||
kms: []
|
kms: []
|
||||||
gcp_kms: []
|
gcp_kms: []
|
||||||
|
@ -30,8 +30,8 @@ sops:
|
||||||
R1ZMMG1jWnljNWl5Nk5MU3RCMlFPYjgKL1ScxzF0D1R18H+oe6dlxUGlL9myHEr3
|
R1ZMMG1jWnljNWl5Nk5MU3RCMlFPYjgKL1ScxzF0D1R18H+oe6dlxUGlL9myHEr3
|
||||||
3HBPoapKCSQ/cT7Xma4bsWD1AVJIf1Ak+MeCs9ItGwKAcnd9JYZ9KA==
|
3HBPoapKCSQ/cT7Xma4bsWD1AVJIf1Ak+MeCs9ItGwKAcnd9JYZ9KA==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2024-07-10T17:25:33Z"
|
lastmodified: "2024-07-18T09:46:47Z"
|
||||||
mac: ENC[AES256_GCM,data:R8V7uckbpDjzukq7W0Tjj3yYCTynU4Ih0C8HiKIf1RQjS0XscJ/3dU5fhalJuODdBNi3aAar0qiX4MJsNexanQxltjJGj01pcHNrM1KUnOPoxmYR8oK64fecQDp8sWahXWfqFFurCsVg1ZHTJM1tMNgbjGDIcTSxZcto/1N3Zwc=,iv:eQge+cAxipyd7kFY7elVATHsymg/JFh9CCYItkkPn0I=,tag:LBR9nNW6RqekGqnLxfyB9w==,type:str]
|
mac: ENC[AES256_GCM,data:EJsQO/XsF8SpyEP8s9u1DXQkSsqodknF9ibl94/kOOIutx9ML+L0ltYA3+/eW17K9Mwvy6CyojKiQLiYgL2RLJd1zxZKedmp+l3klu1im8Wocwh073nemHIR1J6H5hoE6y36tDCXRrMDbWIfMjvlp6FlhFsI/n3Na1iCDall6mA=,iv:O9Y0j5G3sE67Bfz0MhcPYYpU71cGgtIdde8a1WQiigs=,tag:eNIvBVu7LPnC5s2f3MzptQ==,type:str]
|
||||||
pgp: []
|
pgp: []
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.9.0
|
version: 3.9.0
|
||||||
|
|
Loading…
Reference in a new issue