diff --git a/home/common/ghostty.nix b/home/common/ghostty.nix index 99b7338..6f9b5ea 100644 --- a/home/common/ghostty.nix +++ b/home/common/ghostty.nix @@ -44,7 +44,10 @@ 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" ]; }; @@ -55,28 +58,28 @@ background = if config.patagia.oled.enable then "#000000" else "#14151a"; in '' - background = "${background}" - foreground = #b7bec7 - cursor-color = #e7e7b7 - selection-background = #84979f - selection-foreground = #000000 - palette = 0=#000000 - palette = 1=#ff0035 - palette = 2=#85ff00 - palette = 3=#ffc900 - palette = 4=#00a7ff - palette = 5=#cb01ff - palette = 6=#00e0ff - palette = 7=#b7bec7 - palette = 8=#444444 - palette = 9=#ff8c88 - palette = 10=#baff94 - palette = 11=#ffe090 - palette = 12=#88ccff - palette = 13=#e38dff - palette = 14=#97eeff - palette = 15=#ffffff - ''; + background = "${background}" + foreground = #b7bec7 + cursor-color = #e7e7b7 + selection-background = #84979f + selection-foreground = #000000 + palette = 0=#000000 + palette = 1=#ff0035 + palette = 2=#85ff00 + palette = 3=#ffc900 + palette = 4=#00a7ff + palette = 5=#cb01ff + palette = 6=#00e0ff + palette = 7=#b7bec7 + palette = 8=#444444 + palette = 9=#ff8c88 + palette = 10=#baff94 + palette = 11=#ffe090 + palette = 12=#88ccff + palette = 13=#e38dff + palette = 14=#97eeff + palette = 15=#ffffff + ''; xdg.configFile."ghostty/themes/PatagiaLight".text = '' background = #fefeff diff --git a/home/dln/home.nix b/home/dln/home.nix index f64681d..8288f2c 100644 --- a/home/dln/home.nix +++ b/home/dln/home.nix @@ -126,13 +126,14 @@ 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' - jj log --limit=15 -T builtin_log_comfortable + if [ -n "$1" ]; then + jj diff --tool=difft -r "$@" + else + jj log --limit=15 -T builtin_log_comfortable + fi '' "" ]; diff --git a/hosts/nemo/default.nix b/hosts/nemo/default.nix index cc1db74..3f0fa01 100644 --- a/hosts/nemo/default.nix +++ b/hosts/nemo/default.nix @@ -170,6 +170,7 @@ lm_sensors pam_rssh openconnect + tpm2-tools v4l-utils ]; @@ -177,10 +178,19 @@ 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 = [ "wheel" ]; + extraGroups = [ + "tss" + "wheel" + ]; openssh.authorizedKeys.keys = [ "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIIHMAEZx02kbHrEygyPQYStiXlrIe6EIqBCv7anIkL0pAAAABHNzaDo= dln@dinky" "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIJNOBFoU7Cdsgi4KpYRcv7EhR/8kD4DYjEZnwk6urRx7AAAABHNzaDo= dln@nemo" @@ -190,7 +200,10 @@ users.users.lsjostro = { isNormalUser = true; description = "Lars Sjöström"; - extraGroups = [ "wheel" ]; + extraGroups = [ + "tss" + "wheel" + ]; openssh.authorizedKeys.keys = [ "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBJ10mLOpInoqDaySyrxbzvcOrJfLw48Y6eWHa9501lw+hEEBXya3ib7nlvpCqEQJ8aPU5fVRqpkOW5zSimCiRbwAAAAEc3NoOg==" "sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb20AAAAIbmlzdHAyNTYAAABBBLpoKvsZDIQQLfgzJhe1jAQubBNxjydkj8UfdUPaSXqgfB02OypMOC1m5ZuJYcQIxox0I+4Z8xstFhYP6s8zKZwAAAAEc3NoOg=="