From 59723f33102d8be604d19ef60b13678a102ab218 Mon Sep 17 00:00:00 2001
From: Grigory Shipunov
Date: Thu, 1 Jun 2023 20:33:05 +0200
Subject: Update to 23.05

---
 modules/emacs.nix          |  4 ++--
 modules/server/default.nix |  8 ++++++++
 modules/server/ssh.nix     | 13 +++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 modules/server/default.nix
 create mode 100644 modules/server/ssh.nix

(limited to 'modules')

diff --git a/modules/emacs.nix b/modules/emacs.nix
index 67aa4b6..74113dd 100644
--- a/modules/emacs.nix
+++ b/modules/emacs.nix
@@ -12,7 +12,7 @@
   services.emacs = {
     install = true;
     enable = false;
-    package = with pkgs; ((emacsPackagesFor (emacsPgtk.overrideAttrs (old: {
+    package = with pkgs; ((emacsPackagesFor (emacs-pgtk.overrideAttrs (old: {
       passthru = old.passthru // {
         treeSitter = true;
       };
@@ -23,7 +23,7 @@
       vterm
       pdf-tools
     ]));
-    defaultEditor = lib.mkDefault false;
+    defaultEditor = lib.mkDefault true;
   };
 
 }
diff --git a/modules/server/default.nix b/modules/server/default.nix
new file mode 100644
index 0000000..28292d8
--- /dev/null
+++ b/modules/server/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+{
+  imports = [
+    ./ssh.nix
+  ];
+
+  networking.firewall.enable = true;
+}
diff --git a/modules/server/ssh.nix b/modules/server/ssh.nix
new file mode 100644
index 0000000..27c5420
--- /dev/null
+++ b/modules/server/ssh.nix
@@ -0,0 +1,13 @@
+{ ... }:
+{
+  programs.mosh.enable = true;
+  services.openssh = {
+    enable = true;
+    settings.PermitRootLogin = "prohibit-password";
+  };
+
+  networking.firewall.allowedTCPPorts = [ 22 ];
+  users.users.root.openssh.authorizedKeys.keys = [
+    "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDP6xE2ey0C8XXfvniiiHiqXsCC277jKI9RXEA+s2LQLUI5zl7v350i3Oa8H3NCcPj39lfMreqE6ncxcOhqYyzahPrrMkOqgbPAoRvq8H3ophLK+56O3xdHoKwLBwRD1yoGACjqG4UTiTrmnN2ateENgYcnTEY1e4vDw1qMj1drUXCsZ/6mkBBmHJiFfCaR4yCMt1r4gGi/dAC7ifnBP3oSyV/lJEwPxYYkGlbOBIvX/7Ar98pJS6xYPB3jHs9gwyNNON63d0fNYrwBojXPPCnGGaRZNOkBTzex3zZYp12ThINQ2xl8tRp9D8qpZ7vrLjhTD6AXkOBRzmDj+NsCeEaeTuWajqUM93iKncYUI+JxR1t7q8gA2pBMFzLesMXnx7R+5Kw7QDtSJM7a4GMIfsocPwf64BH6rzxEz68rXFE3P+J77PPM9CuaYw90JXHo3z220zYw2nMQ/1qjATVZw/hiVrLmQMVfmFJIufnGjTBs2sy3IoNyzvYm/oDeNNg1cdSV9gyyRKZhK08fxjXN5GSf9vZkfZa9tHtqaZ99HI40GQBHUVx1K2/NQJY8TVTSA+v16SFnJK8BIbmp/WFCuvDcMkgLIbqiYtDASe7P2mKIib86uOENT+P820egeLiTQ06kFw/gfUa8t69d5qEcjiQZ+lxCeYIs/E9KrEXHvRUWew== cardno:16 811 348"
+  ];
+}
-- 
cgit v1.3.1