Compare commits
5 commits
912cde0be4
...
2c9d24f06a
Author | SHA1 | Date | |
---|---|---|---|
2c9d24f06a | |||
160f89b423 | |||
541d625c8e | |||
afda7622de | |||
d3c61ac0df |
7 changed files with 50 additions and 24 deletions
|
@ -17,10 +17,10 @@
|
||||||
|
|
||||||
# will probably lower this later but the max allowed is actually 4GB
|
# will probably lower this later but the max allowed is actually 4GB
|
||||||
# this is NOT stored in memory and can only be viewed with scrollback_pager
|
# this is NOT stored in memory and can only be viewed with scrollback_pager
|
||||||
"scrollback_pager_history_size" = "1024";
|
"scrollback_pager_history_size" = "10"; # in MB
|
||||||
# see https://github.com/sharkdp/bat/issues/1077#issuecomment-652785399
|
# see https://github.com/sharkdp/bat/issues/1077#issuecomment-652785399
|
||||||
"scrollback_pager" = "bat --pager='less -FR +G'";
|
"scrollback_pager" = "bat --pager='less -FR +G'";
|
||||||
"scrollback_lines" = 20000;
|
# "scrollback_lines" = 20000;
|
||||||
};
|
};
|
||||||
keybindings = {
|
keybindings = {
|
||||||
# kitty_mod is ctrl+shift by default
|
# kitty_mod is ctrl+shift by default
|
||||||
|
@ -58,18 +58,29 @@
|
||||||
"kitty_mod+alt+p" = "move_tab_backward";
|
"kitty_mod+alt+p" = "move_tab_backward";
|
||||||
"kitty_mod+q" = "close_tab";
|
"kitty_mod+q" = "close_tab";
|
||||||
"kitty_mod+t" = "new_tab_with_cwd";
|
"kitty_mod+t" = "new_tab_with_cwd";
|
||||||
"ctrl+f2" = "detach_tab";
|
|
||||||
|
|
||||||
# hints
|
# hints
|
||||||
# > basically means the preceding key is a prefix (think tmux)
|
# > basically means the preceding key is a prefix (think tmux)
|
||||||
"kitty_mod+o>o" = "open_url_with_hints";
|
"kitty_mod+o>o" = "open_url_with_hints";
|
||||||
"kitty_mod+o>p" = "kitten hints --type path --program -";
|
# `--program @` means copy to clipboard
|
||||||
"kitty_mod+o>n" = "kitten hints --type line --program -";
|
"kitty_mod+o>u" = "kitten hints --type url --program @";
|
||||||
"kitty_mod+o>w" = "kitten hints --type word --program -";
|
"kitty_mod+o>p" = "kitten hints --type path --program @";
|
||||||
"kitty_mod+o>h" = "kitten hints --type hash --program -";
|
"kitty_mod+o>n" = "kitten hints --type line --program @";
|
||||||
|
"kitty_mod+o>w" = "kitten hints --type word --program @";
|
||||||
|
"kitty_mod+o>h" = "kitten hints --type hash --program @";
|
||||||
"kitty_mod+o>l" = "kitten hints --type linenum";
|
"kitty_mod+o>l" = "kitten hints --type linenum";
|
||||||
|
|
||||||
|
# scrolling
|
||||||
|
"kitty_mod+u" = "scroll_page_up";
|
||||||
|
"kitty_mod+d" = "scroll_page_down";
|
||||||
|
"kitty_mod+a" = "scroll_home";
|
||||||
|
"kitty_mod+e" = "scroll_end";
|
||||||
|
"kitty_mod+z" = "scroll_to_prompt -1"; # scroll to previous shell prompt
|
||||||
|
"kitty_mod+x" = "scroll_to_prompt 1"; # scroll to next shell prompt
|
||||||
|
"kitty_mod+y" = "show_scrollback"; # browse scrollback buffer in pager
|
||||||
|
"kitty_mod+g" = "show_last_command_output"; # browse output of last command in pager
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# programs.zsh.shellAliases."ssh" = "kitten ssh"; # doesn't seem to work with bitwarden ssh agent :(
|
programs.zsh.shellAliases."ssh" = "kitten ssh";
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
replication_factor = 1;
|
replication_factor = 1;
|
||||||
db_engine = "lmdb";
|
db_engine = "lmdb";
|
||||||
disable_scrub = true;
|
disable_scrub = true;
|
||||||
block_size = "128M";
|
block_size = "16M";
|
||||||
compression_level = "none";
|
compression_level = 3;
|
||||||
};
|
};
|
||||||
environmentFile = config.sops.secrets."garage/env".path;
|
environmentFile = config.sops.secrets."garage/env".path;
|
||||||
logLevel = "warn";
|
logLevel = "warn";
|
||||||
|
|
|
@ -42,6 +42,7 @@
|
||||||
|
|
||||||
services.caddy.virtualHosts."grafana.cy7.sh".extraConfig = ''
|
services.caddy.virtualHosts."grafana.cy7.sh".extraConfig = ''
|
||||||
import common
|
import common
|
||||||
|
import authelia
|
||||||
reverse_proxy localhost:8088
|
reverse_proxy localhost:8088
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,9 +11,10 @@
|
||||||
dialect = "postgresql";
|
dialect = "postgresql";
|
||||||
};
|
};
|
||||||
port = 8085;
|
port = 8085;
|
||||||
domain = "pad.cything.io";
|
domain = "pad.cy7.sh";
|
||||||
allowEmailRegister = false;
|
allowEmailRegister = false;
|
||||||
protocolUseSSL = true;
|
protocolUseSSL = true;
|
||||||
|
imageuploadtype = "minio";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -14,18 +14,19 @@ let
|
||||||
--config ${config.sops.secrets."rclone/config".path} \
|
--config ${config.sops.secrets."rclone/config".path} \
|
||||||
--allow-other \
|
--allow-other \
|
||||||
--cache-dir /var/cache/rclone \
|
--cache-dir /var/cache/rclone \
|
||||||
--transfers 32 \
|
--transfers 64 \
|
||||||
--vfs-cache-mode full \
|
--vfs-cache-mode full \
|
||||||
--vfs-cache-min-free-space 5G \
|
--vfs-cache-min-free-space 5G \
|
||||||
--dir-cache-time 30d \
|
--dir-cache-time 30d \
|
||||||
--no-checksum \
|
--no-checksum \
|
||||||
--no-modtime \
|
--no-modtime \
|
||||||
--vfs-fast-fingerprint \
|
--vfs-fast-fingerprint \
|
||||||
--vfs-read-chunk-size 16M \
|
--vfs-read-chunk-size 8M \
|
||||||
--vfs-read-chunk-streams 16 \
|
--vfs-read-chunk-streams 16 \
|
||||||
--sftp-concurrency 64 \
|
--sftp-concurrency 128 \
|
||||||
--sftp-chunk-size 255k \
|
--sftp-chunk-size 255k \
|
||||||
--buffer-size 0 \
|
--buffer-size 0 \
|
||||||
|
--write-back-cache \
|
||||||
${remote} ${mount}
|
${remote} ${mount}
|
||||||
'';
|
'';
|
||||||
ExecStop = "${lib.getExe' pkgs.fuse "fusermount"} -zu ${mount}";
|
ExecStop = "${lib.getExe' pkgs.fuse "fusermount"} -zu ${mount}";
|
||||||
|
|
|
@ -77,6 +77,23 @@ in
|
||||||
userinfo_signed_response_alg = "none";
|
userinfo_signed_response_alg = "none";
|
||||||
token_endpoint_auth_method = "client_secret_basic";
|
token_endpoint_auth_method = "client_secret_basic";
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
client_id = "hedgedoc";
|
||||||
|
client_name = "HedgeDoc";
|
||||||
|
client_secret = "$argon2id$v=19$m=65536,t=3,p=4$MFSXW3gjIZf0M3e8s8RJCg$6KWwksJe2vdUebPEdYc0Zy88fzGcHPrbStcqkiXl+Hg";
|
||||||
|
public = false;
|
||||||
|
authorization_policy = "two_factor";
|
||||||
|
redirect_uris = [
|
||||||
|
"https://pad.cy7.sh/auth/oauth2/callback"
|
||||||
|
];
|
||||||
|
scopes = [ "openid" "profile" "email" ];
|
||||||
|
userinfo_signed_response_alg = "none";
|
||||||
|
grant_types = [ "refresh_token" "authorization_code" ];
|
||||||
|
response_types = [ "code" ];
|
||||||
|
response_modes = [ "form_post" "query" "fragment" ];
|
||||||
|
audience = [];
|
||||||
|
token_endpoint_auth_method = "client_secret_post";
|
||||||
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
secrets = {
|
secrets = {
|
||||||
|
|
|
@ -1,10 +1,6 @@
|
||||||
hedgedoc:
|
hedgedoc:
|
||||||
env: ENC[AES256_GCM,data:15rWiIYWyIJ0Hxl5I8m+EBV+FkNDT/OHlLK9shVS46UE7SQtuIh45N5hvwgs0rg9E9Tawu+lyE2aozWNh6HSDUZ1h4FYrB+JHwIetGkOqXSLHfXi,iv:v9ohLTtlxw3fsRoJJoOY5VYxVsxUyDEsQHRjcGKg/GY=,tag:Wncm1reqNblnVhRTYjU3Pg==,type:str]
|
env: ENC[AES256_GCM,data:XClDoB4GH+gdOO2d2MQZUvjY1Y70/hlGbPlULBMNL+xv8OLUQCIpA8XBV8pLKdSbSimrzyXhIAIbCGGS4Q1NoWcoH99G4+pXRvHyOo7MyUs8wqXJc/mQ+e1SEXji3cwdiQUxrbov6w6e6fEYg4VhsHs/zJXLeS2M3jdYAlYy3jeJ5WcbPO9zlkz6h21fO5FOKzzaPXgnZGxj4JiZUivHLzSsQ+4TN3bgSdb+2048uQAn9RnLFKeROVE9Z8DzAIIPbE6KxWwYr2fFCdlegFA3taLJ+FwoCCaSoLDOrd78SDzcHmSpLJfD3ZRCFExE9xogLXx7kZNX6uPtncxN1W5iemW9F7aEyZmkv0POUlldyLSyhTk8Z6jzQkgbymIp/STHdcg4GvWvz8KZ+Yd+tBjkNlTCXuc0S/JGuyjf6we8yuYWnRkfMwQ4GNIjsIHQYSMjpLviNZfKrPk8T0DijtmZnb4Zdw5eg4KLjMS3DfJAeR7c3LnOOIwgzcwTBDFsQunnxpZTT6eZSFbyktVEBH6CaXTWONzOH2Ff1mn/Tbzg7RHo/CaOXDqeJ6B5GejK5ahmeko1SYp+qsX/qdf75lNbJieUcPtfkVwrcHK187HbPSZkf6DYDNvpDcuPD1kQqq2OUb5lHKohbN8iGnwzFlPF4w60jGOzwry8CbctZtynFB6LdK4NTPsiGv9OqU+y5rqm24GjaHljTawbMwYt5kWmLYMtVwcWkXJdFdRUu4hfmMmNUYExpx5CBCjiXZTnElTivmGw3NPdncIsfjo8gOliM/ZidmZxrn5a5+RzLfYslQecp50ek/9UIRPB9P4UyLqgl3rYwh4BadVyIro5mRQBz3nnvEj1kwIeSVwC60Ysv/Uel4zfULKV0vAE+7x2Ogs1s/4N3wYuCns/+UOnS2DNnnjpSHF75Z/GktD9Ni1MJYeOpLU559gbGzKen+6ndy2oXQw8fdFC7ZlwkzRO5YKmrOpwVaVUC4vIYWJO4lFCgajJEpqGhRgPjHE8xFcPu1/kCyYFWVUC/9CAYFFqzpOhczLiS08CqCR9F9XktX3tgHqcJkz473B6xsAIeS2TCgMtRozLwi8OBwiDUZZYAVSmt+h1Dlq09cvjfhXfPQCHVh5jajlPNuXsNXtfVlz45i1DYo7ccyE+Svn2eMs5smkCXt66aFOMujURvkzTZqXYK3loaQPck2DXlN6nFCXlig==,iv:eUa/yfdrxj9+GBqyp03s/7q67fAgr6Z39sT4iqb/38Q=,tag:Je9lq7BLB4NJGDTWAKRgIQ==,type:str]
|
||||||
sops:
|
sops:
|
||||||
kms: []
|
|
||||||
gcp_kms: []
|
|
||||||
azure_kv: []
|
|
||||||
hc_vault: []
|
|
||||||
age:
|
age:
|
||||||
- recipient: age1eg6sxflw6l44fp20sl068sampwd95fm0mnh4ssegrhtktgm50ptqcuspyn
|
- recipient: age1eg6sxflw6l44fp20sl068sampwd95fm0mnh4ssegrhtktgm50ptqcuspyn
|
||||||
enc: |
|
enc: |
|
||||||
|
@ -24,8 +20,7 @@ sops:
|
||||||
enlDZEI2NElkZkI3UmRyQUZqQWE5ZmcK2JlwNzVJNhGjyniIg9UY5tjgUKttkT3e
|
enlDZEI2NElkZkI3UmRyQUZqQWE5ZmcK2JlwNzVJNhGjyniIg9UY5tjgUKttkT3e
|
||||||
9C/xag3dQCiqzX1O3o5tdhYnxXw+VxVf+qTFyyuftg5iQPZNuvX6mA==
|
9C/xag3dQCiqzX1O3o5tdhYnxXw+VxVf+qTFyyuftg5iQPZNuvX6mA==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2024-12-17T03:25:54Z"
|
lastmodified: "2025-04-04T16:46:41Z"
|
||||||
mac: ENC[AES256_GCM,data:1cxiK/HhqYzatT2PhZxjvtizII2QMHqbbyOujUtx4cT8x488j2wecu6hOfSkuHbQ43AxA8kDH1NAruPCSdCpj3PytMR+np+R/5WuRcK+OF/FCnWvWvvHqgDnBs/wYjllnR6HyWBlhrROpINxu9ch4fzN0Def3I7O+wJgpojnPiU=,iv:PKPykPv9zSHj9+HXnrg1v8Ty78te66D9ZH6c1V7Qlh4=,tag:JQk68u6p317r3Df+hv16+g==,type:str]
|
mac: ENC[AES256_GCM,data:X7wtnmauh/tRbYCSPNtr/38CVyhIezYQKwcysna+3d31QatbAfTSkAMAWcSG+brpvAW14UfhwRiaCPoSjkS5eSkwd99S0CBI50yCjUFh43Uum3TBJhAnc6bzQkJHGXRk7duxkQJvEeDDZT4ph+/UoZ2xGu5LCjpLenDqldeHgCg=,iv:jMVBz0gPoW/J8NvkSGMjx28nXpX8mpWBrvXyCgi7F1U=,tag:mTj/2mwVjy3wYIsHnbMXDw==,type:str]
|
||||||
pgp: []
|
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.9.2
|
version: 3.10.1
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue