Compare commits

..

No commits in common. "8447df4bd7bc64046577fabf74ade425e40b3375" and "069ad76e60c98ef1ba310f59d257360ffb4ecf72" have entirely different histories.

8 changed files with 37 additions and 32 deletions

View file

@ -20,10 +20,31 @@
"browser.search.separatePrivateDefault" = false; "browser.search.separatePrivateDefault" = false;
"browser.search.separatePrivateDefault.ui.enabled" = true; "browser.search.separatePrivateDefault.ui.enabled" = true;
"browser.startup.homepage" = "http://dashboard.internal.flake.sh/"; "browser.startup.homepage" = "http://dashboard.internal.flake.sh/";
"network.trr.mode" = 5; "network.trr.mode" = 3;
"network.trr.uri" = "https://dns.quad9.net/dns-query";
"dom.security.https_first" = true; "dom.security.https_first" = true;
"dom.security.https_only_mode" = true; "dom.security.https_only_mode" = true;
"dom.security.https_only_mode_ever_enabled" = true; "dom.security.https_only_mode_ever_enabled" = true;
"network.trr.excluded-domains" = ''
,
pve.internal.flake.sh,
pbs.internal.flake.sh,
truenas.internal.flake.sh,
udm.internal.flake.sh,
dashboard.internal.flake.sh,
stash.internal.flake.sh,
synology.internal.flake.sh,
wallos.internal.flake.sh,
jellyfin.internal.flake.sh,
jellyseerr.internal.flake.sh,
sonarr.internal.flake.sh,
radarr.internal.flake.sh,
readarr.internal.flake.sh,
lidarr.internal.flake.sh,
bazarr.internal.flake.sh,
whisparr.internal.flake.sh,
prowlarr.internal.flake.sh
'';
}; };
extraConfig = builtins.readFile ./user.js/betterfox.js; extraConfig = builtins.readFile ./user.js/betterfox.js;
search = { search = {
@ -98,7 +119,6 @@
#utility #utility
new-tab-override new-tab-override
libredirect libredirect
kagi-search
#misc #misc
tokyo-night-v2 tokyo-night-v2

View file

@ -9,7 +9,7 @@ alias la = eza -alughH --git --icons
alias calc = eva alias calc = eva
alias c = clear alias c = clear
alias f = yazi alias f = yazi
alias cat = bat --pager=never --plain alias cat = bat
alias rm = rm -i alias rm = rm -i
alias cp = cp -i alias cp = cp -i
alias mv = mv -i alias mv = mv -i

View file

@ -9,7 +9,7 @@ local config = {
name = "NVIDIA GeForce GTX 1070 Ti", name = "NVIDIA GeForce GTX 1070 Ti",
}, },
enable_wayland = false, enable_wayland = false,
font = wezterm.font("JetBrainsMono NF Medium"), font = wezterm.font("Monaspace Krypton"),
font_size = 12.0, font_size = 12.0,
window_background_opacity = 0.6, window_background_opacity = 0.6,
text_background_opacity = 1.0, text_background_opacity = 1.0,

View file

@ -33,6 +33,7 @@
}; };
}; };
blocking = { blocking = {
blockType = "nxDomain";
loading = { loading = {
strategy = "fast"; strategy = "fast";
concurrency = 8; concurrency = 8;
@ -76,20 +77,11 @@
"https://big.oisd.nl/domainswild" "https://big.oisd.nl/domainswild"
]; ];
}; };
whiteLists = let whiteLists = {
customWhitelist = pkgs.writeText "misc.txt" '' default = [
ax.phobos.apple.com.edgesuite.net
amp-api-edge.apps.apple.com
(\.|^)dscx\.akamaiedge\.net$
(\.|^)wac\.phicdn\.net$
*.flake.sh
'';
in {
ads = [
"https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/whitelist.txt" "https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/whitelist.txt"
"https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/optional-list.txt" "https://raw.githubusercontent.com/anudeepND/whitelist/master/domains/optional-list.txt"
]; ];
misc = [customWhitelist];
}; };
clientGroupsBlock = { clientGroupsBlock = {
default = [ default = [

View file

@ -1,19 +1,12 @@
{ {
pkgs, pkgs,
config, config,
lib,
... ...
}: { }: {
sops.secrets.paperless-pwd = { sops.secrets.paperless-pwd = {
owner = "paperless"; owner = "paperless";
group = "paperless"; group = "paperless";
}; };
systemd.services = {
paperless-task-queue.serviceConfig = {PrivateNetwork = false;};
paperless-scheduler.serviceConfig = {PrivateNetwork = lib.mkForce false;};
};
services.paperless = let services.paperless = let
dataDir = "/var/lib/paperless-ngx"; dataDir = "/var/lib/paperless-ngx";
in { in {
@ -27,8 +20,7 @@
consumptionDir = "${dataDir}/consume"; consumptionDir = "${dataDir}/consume";
settings = { settings = {
PAPERLESS_ADMIN_USER = "notoh"; PAPERLESS_ADMIN_USER = "notoh";
PAPERLESS_REDIS = "redis://:paperless-ngx@192.168.1.211:6382"; PAPERLESS_REDIS = "redis://:paperless-ngx@100.94.214.100:6382";
PAPERLESS_EMAIL_TASK_CRON = "*/5 * * * *";
}; };
}; };
} }

View file

@ -4,8 +4,10 @@
fontDir.enable = true; fontDir.enable = true;
packages = with pkgs; [ packages = with pkgs; [
corefonts corefonts
nerdfonts monaspace
jost
jetbrains-mono jetbrains-mono
nerdfonts
noto-fonts noto-fonts
noto-fonts-cjk noto-fonts-cjk
twitter-color-emoji twitter-color-emoji
@ -18,7 +20,7 @@
enable = true; enable = true;
allowBitmaps = true; allowBitmaps = true;
defaultFonts = { defaultFonts = {
monospace = ["JetBrainsMono NF SemiBold" "Twitter Color Emoji"]; monospace = ["JetBrainsMono Nerd Font" "Twitter Color Emoji"];
serif = ["Noto Serif" "Twitter Color Emoji"]; serif = ["Noto Serif" "Twitter Color Emoji"];
sansSerif = ["Noto Sans" "Twitter Color Emoji"]; sansSerif = ["Noto Sans" "Twitter Color Emoji"];
emoji = ["Twitter Color Emoji"]; emoji = ["Twitter Color Emoji"];

View file

@ -5,7 +5,6 @@ restic-yuki: ENC[AES256_GCM,data:fvGrVXKQ5cLXVfgb1nCWhxV9yuRG6FdyE2WvB1rlOyA=,iv
restic-arashi: ENC[AES256_GCM,data:L2GuxUCfbUlWg9un3h6cSp9UAtA5auYiQiIIS0TvWRE=,iv:XJZBGrNurnLDmZyQaePaRUu6ahjqgwUap/vP9bPKHmE=,tag:Dk2Ior6IDt9HbM2IRwKe+A==,type:str] restic-arashi: ENC[AES256_GCM,data:L2GuxUCfbUlWg9un3h6cSp9UAtA5auYiQiIIS0TvWRE=,iv:XJZBGrNurnLDmZyQaePaRUu6ahjqgwUap/vP9bPKHmE=,tag:Dk2Ior6IDt9HbM2IRwKe+A==,type:str]
restic-kariru: ENC[AES256_GCM,data:ghG6DnPdt6j1A6qZdmcaG5HGDGSHiAU7CJAiA7GLoAU=,iv:+6/vu7lPYPbVndSlrv9yLlOTGM9dzP+7lkIqBodQMWw=,tag:70yx7peJSmE6H8rtrloiaw==,type:str] restic-kariru: ENC[AES256_GCM,data:ghG6DnPdt6j1A6qZdmcaG5HGDGSHiAU7CJAiA7GLoAU=,iv:+6/vu7lPYPbVndSlrv9yLlOTGM9dzP+7lkIqBodQMWw=,tag:70yx7peJSmE6H8rtrloiaw==,type:str]
restic-ame: ENC[AES256_GCM,data:NO91+uNkkmBaQNFoeLeytYQPb+Sm0l9eg2tseGveQN0=,iv:QdIB7QLq1CGfIn+BwP/RR2m4Zc0PwDT+ourCROk2KdM=,tag:8I0oH/9/4HTd8vxS4+105Q==,type:str] restic-ame: ENC[AES256_GCM,data:NO91+uNkkmBaQNFoeLeytYQPb+Sm0l9eg2tseGveQN0=,iv:QdIB7QLq1CGfIn+BwP/RR2m4Zc0PwDT+ourCROk2KdM=,tag:8I0oH/9/4HTd8vxS4+105Q==,type:str]
restic-osu: ENC[AES256_GCM,data:0bb72Wq0FyFgClYzPo9O5IfZ9/7oWl3QDONU8yijs1Q=,iv:1X2IgwLyMETlkLKTWA/cGofplH4YRgc+PhXbIMP7gTY=,tag:wov3PolwQN3ZMGXuLLheNA==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
@ -21,8 +20,8 @@ sops:
NmQ4UythUU03bWMvRmZMaVJGM1FkMU0Km33/zUXSLWuEQqxIFklI0JToLXARlV3m NmQ4UythUU03bWMvRmZMaVJGM1FkMU0Km33/zUXSLWuEQqxIFklI0JToLXARlV3m
EB18XYH+m/9VoYy2sN5dMoUdSflPqjGgxAPxuX5TU+F7MAsVkpdOVg== EB18XYH+m/9VoYy2sN5dMoUdSflPqjGgxAPxuX5TU+F7MAsVkpdOVg==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-02-03T15:30:07Z" lastmodified: "2024-01-15T07:24:41Z"
mac: ENC[AES256_GCM,data:enaMzp3+xNgyZkOHq2wtvgEFU60TYt76667AyA+Fznyt8hnErbIr1g9KzAGBvaxSixPrCTN0GVRWsSGu3RNXjJxyQWdR9QBqGbCQ5PAAMz1U39f9OM/xfNDkwoJdZcHW3HOZkCf7bgORrhkOk+f9nhbeAnKMAexAVpHtgTyZVsQ=,iv:JS27uYA5IPbVyP8TO2SYyUj2Z6NTXC4On/REJHvthc0=,tag:EFO+GYlAgaztg+HBEvCXyA==,type:str] mac: ENC[AES256_GCM,data:T5CkzLghyOjRLCVa1oceGNp5XH33qQMqDJQllfxak8t2jAIXVxlWh8M5xGZQyMPwiSYYah7WhYic+prq5anjcrieYZEkHEQh6a8k+12TNbi/gFjDNwy9HJo44PxBlSsxNvbTAbGpCAAxulV4HwXpvAcnHFtkOxwKxOvmZvwzrrE=,iv:upqd5XFA0FPOLJX3pN1eXQ2oJq8nrFbN1t6/QfpXt6s=,tag:9EnJpYKzYVMZJdAYzNrYYg==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.8.1 version: 3.8.1

View file

@ -13,7 +13,7 @@ woodpecker-agent-secret: ENC[AES256_GCM,data:DQoIOciEqDcaUYTTYFeIocmUUFB+ASstMA0
miniflux: ENC[AES256_GCM,data:H5YA60nFQkUVBhLrNjQY7E5hhBPjjQEqQ6PJB5ZNj1KNKtUSWt+rzFt+Hce5JrNmmj7aZjmj9upuzPjRFdva/T9ZyRHm,iv:Ju6bElSOsj62L+5ANKEmE866sCy9IOP5V9P020tl9bU=,tag:ntDj4d+2fGOE443tPZj80Q==,type:str] miniflux: ENC[AES256_GCM,data:H5YA60nFQkUVBhLrNjQY7E5hhBPjjQEqQ6PJB5ZNj1KNKtUSWt+rzFt+Hce5JrNmmj7aZjmj9upuzPjRFdva/T9ZyRHm,iv:Ju6bElSOsj62L+5ANKEmE866sCy9IOP5V9P020tl9bU=,tag:ntDj4d+2fGOE443tPZj80Q==,type:str]
anki-pwd: ENC[AES256_GCM,data:g3HNzilSVAsRkqOPdQHr0MZZkwOKz4gdDDBvhRZbD1w=,iv:49UNCpA6WLPKp2Y85Vpdgk/Eu47NyLGxXWDl5Qmkn8Y=,tag:n7hEcd908mkQbOr73qlYSw==,type:str] anki-pwd: ENC[AES256_GCM,data:g3HNzilSVAsRkqOPdQHr0MZZkwOKz4gdDDBvhRZbD1w=,iv:49UNCpA6WLPKp2Y85Vpdgk/Eu47NyLGxXWDl5Qmkn8Y=,tag:n7hEcd908mkQbOr73qlYSw==,type:str]
paperless-pwd: ENC[AES256_GCM,data:Ylb5Bojq0YFsVWbKkeMQXLXuyoUDdKWkY7OcFcrzdlNa,iv:bpgJx46branHQTJUOoYfIOsguLrjjxoYFk069YMkyAE=,tag:d0kdILLVFT3fR2gw52qGEA==,type:str] paperless-pwd: ENC[AES256_GCM,data:Ylb5Bojq0YFsVWbKkeMQXLXuyoUDdKWkY7OcFcrzdlNa,iv:bpgJx46branHQTJUOoYfIOsguLrjjxoYFk069YMkyAE=,tag:d0kdILLVFT3fR2gw52qGEA==,type:str]
vaultwarden-env: ENC[AES256_GCM,data:db5b1dqvHs86t1exBaymKU3bLh4JYy4oHwgU5kjrsaybe+FzvevepngPIuXBvB1gduqaeiUP6iwaRNDMJG1NVEr7Wz3+IpMvLlcSnIPSWpjEXtuo1b5Bh4fSpl+TEAaTHK21jNWoaKJoQLE6CabTUed1lR1S7L+UdEII6CbY+4VnF4BH63viPEaG7Od3M/tbRtTlRWoLZuCydEo3cnbcfx37A1MpKDJEdFbqUwZ79oyV7Q==,iv:gfJwMfCMrJYzeKOeaSnvYH2pgiLMAD9o255U6+oaPp0=,tag:a1IV56uhTPTLj62SAkzlSw==,type:str] vaultwarden-env: ENC[AES256_GCM,data:+Et1Pu6QwqQrDmaE25TRGt6NZ63oez+TKRyedvDqyANxq0UcRCwWKHM43W0PYiQ08+sAUmNCNoEVvDb1UvpTyMQGI4E4s2uUrIe3R+6gaG1ycU3uoAv2tZ4beRcKPjUIW19T7hgPg624kAtPQ/exWmUrCKjMvi+SwKKoNGo3vmZs5FzF,iv:Hp1nzU5xxFkyS9/jtc9QDfHSKGJst89yYbO33Phf3+0=,tag:/53rTxygB61qzKgHaVs+jg==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
@ -29,8 +29,8 @@ sops:
YWNQcURKMSs2U0pOa3E0cTdCZ3RnalkKGayA7DBUQS+kn+6OYVBc6oTunF0qeZdt YWNQcURKMSs2U0pOa3E0cTdCZ3RnalkKGayA7DBUQS+kn+6OYVBc6oTunF0qeZdt
5b9DLHgh0HRWFm09XGSOog8K315d93Wzblw1My1/dXeEQX/ryinqUQ== 5b9DLHgh0HRWFm09XGSOog8K315d93Wzblw1My1/dXeEQX/ryinqUQ==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2024-02-02T17:39:19Z" lastmodified: "2024-02-02T17:22:41Z"
mac: ENC[AES256_GCM,data:k81uu9ZKkVVrsRMHdXl5sXg9F5mGgqUi41U/1bzgw6A53lqOcKq80YjUnqPM5wKuQQPiGmt6/07GLX3y6ht1lJjHfoCLi75gfhcuoelmEAB3vJY2OC8zPzrwXgdEl6jdRM++5nov38Xq/d/C5qVpZP1aFHpaGZJMyvR+XVRes7I=,iv:CFuXQzDYbaUaQfYEygwBBU/BSYGmLmAi4TeLOy1qW50=,tag:G5tF5qTqy/CZXWfb4M8DMg==,type:str] mac: ENC[AES256_GCM,data:ypjXfV0H2m8t163u188s6CC9oWAe1stEnnTx75IXZglbxCkFsi4ovB0A06JUtdrZW0VfuXPZOOZBLLr4Ecx8ZQZzoe1FD2ikaofNwqpSgI0ULuKSY4ydJFmYqQ+g9fhLjHnciJv3CU/fWMMK3zGRpgrBrJWWmlN6mtQ4OAysUF0=,iv:5EyWnZLTN68jppYMOMGWMj0Yal3NEb1XctllhL/LBEs=,tag:c6ot+r7kVjCVg9whc4nT9g==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.8.1 version: 3.8.1