test

new line

common/base.nix

@@ -16,9 +16,10 @@
 
     ./locales/paris.nix
 
+    ./programs/git.nix
     ./programs/neovim.nix
     ./programs/zsh.nix
-    ./programs/git.nix
+    ./programs/ssh.nix
 
     ./services/sshd.nix
   ];

common/programs/ssh.nix

@@ -0,0 +1,11 @@
+let
+  sshKeys = import ../../crypto/ssh-keys.nix;
+in {
+  programs.ssh = {
+    knownHosts = {
+      "enry".publicKey = sshKeys.host.enry;
+      "phoenix".publicKey = sshKeys.host.phoenix;
+      "new-new-phoenix".publicKey = sshKeys.host.new-new-phoenix;
+    };
+  };
+}

common/programs/zsh.nix

@@ -9,7 +9,6 @@
       ll = "ls -al";
       done = "curl -d 'Done' ntfy.sh/tasiaiso_done";
       rebuild = "sudo nixos-rebuild switch -flake -I nixos-config=/home/tasia/Desktop/nixos-config"; # .#hostname
-      "git ap" = "git add -p";
     };
 
     ohMyZsh = {

common/services/sshd.nix

@@ -37,7 +37,7 @@
       AllowTcpForwarding no
 
       # wip
-      AllowTcpForwarding yes
+      # AllowTcpForwarding yes
       X11Forwarding no
       AllowAgentForwarding no
       AllowStreamLocalForwarding no

crypto/ssh-keys.nix

@@ -14,7 +14,3 @@ rec {
     new-new-phoenix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFXu/iFf6yhi6A0f6Lvp+wyltMHq1YgxZan5OdCKP9gE root@new-new-phoenix";
   };
 }
-
-programs.ssh.knownHosts = {
-  "new-new-phoenix".publicKey = sshKeys.new-new-phoenix.host;
-};

dotfiles/.gitconfig

@@ -4,3 +4,6 @@
 	format = ssh
 [commit]
 	gpgsign = true
+[alias]
+    st = status
+    ap = add -p

dotfiles/.shellrc

@@ -0,0 +1,10 @@
+export XDG_DATA_HOME="$HOME/.local/share"
+
+if [[ -n $SSH_CONNECTION ]] ; then
+    curl \
+        -H "Title: New SSH session" \
+        -H "Priority: urgent" \
+        -H "Tags: urgent" \
+        -d "$(cat /etc/hostname ): ssh session ($SSH_CONNECTION)" \
+        ntfy.sh/tasiaiso_alerts &> /dev/null
+fi

hosts/new-new-phoenix/configuration.nix

@@ -88,8 +88,8 @@ in {
 
     osu-lazer-bin
 
-    inputs.nixos-conf-editor.packages.${system}.nixos-conf-editor
-    inputs.nix-software-center.packages.${system}.nix-software-center
+    # inputs.nixos-conf-editor.packages.${system}.nixos-conf-editor
+    # inputs.nix-software-center.packages.${system}.nix-software-center
   ];
 
   services.blueman.enable = true;