Compare commits

...

3 commits

Author SHA1 Message Date
1b367e2322
nemo: add tpm2 tooling + perms 2025-01-16 16:38:52 +01:00
cc9fc76545
jj: fancier status 2025-01-15 20:04:18 +01:00
dcc102f9bf
ghostty: keymap c-m + friends 2025-01-15 20:02:41 +01:00
3 changed files with 45 additions and 28 deletions

View file

@ -44,7 +44,10 @@
keybind = [ keybind = [
"alt+shift+c=copy_to_clipboard" "alt+shift+c=copy_to_clipboard"
"alt+shift+v=paste_from_clipboard" "alt+shift+v=paste_from_clipboard"
"ctrl+i=text:\\x09"
"ctrl+m=text:\\x0D"
"ctrl+tab=goto_split:previous" "ctrl+tab=goto_split:previous"
"ctrl+[=text:\\x1B"
"super+enter=toggle_fullscreen" "super+enter=toggle_fullscreen"
]; ];
}; };

View file

@ -126,13 +126,14 @@ in
'' ''
#!/usr/bin/env bash #!/usr/bin/env bash
set -eo pipefail set -eo pipefail
if [ -n "$1" ]; then
exec jj show --stat --tool=difft "$@"
fi
printf '\e[38;5;240m\u2504%.0s\e[0m' $(seq 1 $(tput cols)) '\n' printf '\e[38;5;240m\u2504%.0s\e[0m' $(seq 1 $(tput cols)) '\n'
jj show --stat jj show --stat
printf '\e[38;5;240m\u2504%.0s\e[0m' $(seq 1 $(tput cols)) '\n' printf '\e[38;5;240m\u2504%.0s\e[0m' $(seq 1 $(tput cols)) '\n'
if [ -n "$1" ]; then
jj diff --tool=difft -r "$@"
else
jj log --limit=15 -T builtin_log_comfortable jj log --limit=15 -T builtin_log_comfortable
fi
'' ''
"" ""
]; ];

View file

@ -170,6 +170,7 @@
lm_sensors lm_sensors
pam_rssh pam_rssh
openconnect openconnect
tpm2-tools
v4l-utils v4l-utils
]; ];
@ -177,10 +178,19 @@
OTEL_EXPORTER_OTLP_ENDPOINT = "https://otel.aarn.patagia.net"; OTEL_EXPORTER_OTLP_ENDPOINT = "https://otel.aarn.patagia.net";
}; };
security.tpm2 = {
enable = true;
pkcs11.enable = true;
tctiEnvironment.enable = true;
};
users.users.dln = { users.users.dln = {
isNormalUser = true; isNormalUser = true;
description = "Daniel Lundin"; description = "Daniel Lundin";
extraGroups = [ "wheel" ]; extraGroups = [
"tss"
"wheel"
];
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIIHMAEZx02kbHrEygyPQYStiXlrIe6EIqBCv7anIkL0pAAAABHNzaDo= dln@dinky" "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIIHMAEZx02kbHrEygyPQYStiXlrIe6EIqBCv7anIkL0pAAAABHNzaDo= dln@dinky"
"sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIJNOBFoU7Cdsgi4KpYRcv7EhR/8kD4DYjEZnwk6urRx7AAAABHNzaDo= dln@nemo" "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIJNOBFoU7Cdsgi4KpYRcv7EhR/8kD4DYjEZnwk6urRx7AAAABHNzaDo= dln@nemo"
@ -190,7 +200,10 @@
users.users.lsjostro = { users.users.lsjostro = {
isNormalUser = true; isNormalUser = true;
description = "Lars Sjöström"; description = "Lars Sjöström";
extraGroups = [ "wheel" ]; extraGroups = [
"tss"
"wheel"
];
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBJ10mLOpInoqDaySyrxbzvcOrJfLw48Y6eWHa9501lw+hEEBXya3ib7nlvpCqEQJ8aPU5fVRqpkOW5zSimCiRbwAAAAEc3NoOg==" "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBJ10mLOpInoqDaySyrxbzvcOrJfLw48Y6eWHa9501lw+hEEBXya3ib7nlvpCqEQJ8aPU5fVRqpkOW5zSimCiRbwAAAAEc3NoOg=="
"sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBLpoKvsZDIQQLfgzJhe1jAQubBNxjydkj8UfdUPaSXqgfB02OypMOC1m5ZuJYcQIxox0I+4Z8xstFhYP6s8zKZwAAAAEc3NoOg==" "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBLpoKvsZDIQQLfgzJhe1jAQubBNxjydkj8UfdUPaSXqgfB02OypMOC1m5ZuJYcQIxox0I+4Z8xstFhYP6s8zKZwAAAAEc3NoOg=="