Compare commits

..

No commits in common. "1b367e232261a0b5c2fcc952992a4923583c3133" and "6b1a4b5d043a126996001f1a4b41cefded4b184e" have entirely different histories.

3 changed files with 28 additions and 45 deletions

View file

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

View file

@ -126,14 +126,13 @@ in
''
#!/usr/bin/env bash
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'
jj show --stat
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
fi
''
""
];

View file

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