diff options
Diffstat (limited to 'home')
| -rwxr-xr-x | home/helix.nix | 11 | ||||
| -rw-r--r-- | home/linux.nix | 6 | ||||
| -rwxr-xr-x | home/shell.nix | 22 | ||||
| -rw-r--r-- | home/ssh.nix | 20 |
4 files changed, 42 insertions, 17 deletions
diff --git a/home/helix.nix b/home/helix.nix index fca1c32..9ba92c3 100755 --- a/home/helix.nix +++ b/home/helix.nix @@ -31,8 +31,8 @@ in programs.helix = { enable = true; - package = pkgs.steelix; - extraPackages = [ pkgs.steel ]; + package = pkgs.helix; + # extraPackages = [ pkgs.steel ]; defaultEditor = false; settings = { theme = "grace_rose_pine"; @@ -45,7 +45,7 @@ in select = "underline"; }; default-yank-register = "+"; - clipboard-provider = if (import ../host.nix).name == "turing" then "pasteboard" else "termcode"; + clipboard-provider = if (import ../hosts.nix).name == "turing" then "pasteboard" else "termcode"; cursorline = true; cursorcolumn = true; continue-comments = false; @@ -171,6 +171,11 @@ in tinymist = { command = "${pkgs.tinymist}/bin/tinymist"; config.tinymist.formatterMode = "typstyle"; + typstExtraArgs = [ + "--features" + "bundle,html" + "site.typ" + ]; }; rust-analyzer = { diff --git a/home/linux.nix b/home/linux.nix new file mode 100644 index 0000000..7cd14a0 --- /dev/null +++ b/home/linux.nix @@ -0,0 +1,6 @@ +{ pkgs, home, ... }: +{ + home.packages = with pkgs; [ + ghostty + ]; +} diff --git a/home/shell.nix b/home/shell.nix index d3f9ccd..d374157 100755 --- a/home/shell.nix +++ b/home/shell.nix @@ -37,17 +37,17 @@ in (import "${tpbSrc}/default.nix" { inherit pkgs; }).overrideAttrs - (_: { - unpackPhase = '' - mkdir source - tar --no-same-owner --no-same-permissions --no-overwrite-dir --mode=0755 \ - -C "$src" -cf - . \ - | tar --no-same-owner --no-same-permissions --no-overwrite-dir --mode=0755 \ - -C source -xf - - chmod -R u+w source - sourceRoot=source - ''; - }) + (_: { + unpackPhase = '' + mkdir source + tar --no-same-owner --no-same-permissions --no-overwrite-dir --mode=0755 \ + -C "$src" -cf - . \ + | tar --no-same-owner --no-same-permissions --no-overwrite-dir --mode=0755 \ + -C source -xf - + chmod -R u+w source + sourceRoot=source + ''; + }) ) ]; diff --git a/home/ssh.nix b/home/ssh.nix index f0e75c7..ddcce96 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -8,10 +8,24 @@ ... }: -{ - home.file.".ssh/authorized_keys".text = '' - cert-authority,principals="${lib.concatStringsSep "," principals}" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEuc4HCdyEMu4uiYhlokSXmu+68hkm7j6CqVwjDkCeSj grace.pink +let + authorizedKeys = '' + cert-authority,principals="t:rebuild,${lib.concatStringsSep "," principals}" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEuc4HCdyEMu4uiYhlokSXmu+68hkm7j6CqVwjDkCeSj grace.pink sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIA6Eq2yVsZrCH8so7f3ygH0UWp6WkOxbhLNFC9QewKwoAAAABHNzaDo= grace.pink ${lib.concatStringsSep "\n" extraKeys} ''; +in +{ + home.activation.authorizedKeys = lib.hm.dag.entryAfter [ "writeBoundary" ] '' + run mkdir -p "$HOME/.ssh" + run chmod 700 "$HOME/.ssh" + + if [[ -z "''${DRY_RUN:-}" ]]; then + cat > "$HOME/.ssh/authorized_keys" <<'EOF' + ${authorizedKeys} + EOF + + chmod 600 "$HOME/.ssh/authorized_keys" + fi + ''; } |