work on agenix

9 files changed, 36 insertions, 6 deletions

diff --git a/hosts/jupiter/config.nix b/hosts/jupiter/config.nix
index 9e3eff2..9747720 100644
--- a/hosts/jupiter/config.nix
+++ b/hosts/jupiter/config.nix
@@ -52,6 +52,7 @@
         enable = true;
         networkmanager.enable = true;
         tailscale.enable = true;
+        sshd.enable = true;
       };
 
       audio = {
diff --git a/hosts/jupiter/nixos.nix b/hosts/jupiter/nixos.nix
index 86d5a6e..f318195 100644
--- a/hosts/jupiter/nixos.nix
+++ b/hosts/jupiter/nixos.nix
@@ -7,7 +7,6 @@
     inputs.disko.nixosModules.disko
     ./disks.nix
 
-    ./minecraft.nix
     ./samba.nix
 
     inputs.nixos-facter-modules.nixosModules.facter
@@ -19,7 +18,6 @@
   systemd.network.wait-online.enable = false; # fix for weird wifi issue
 
   # music stuff
-  services.pipewire.jack.enable = true;
   environment.systemPackages = with pkgs; [vital helvum bambu-studio];
 
   fonts.packages = [pkgs.nerd-fonts.iosevka];
diff --git a/modules/desktop/nixos/gnome.nix b/modules/desktop/nixos/gnome.nix
index c88a809..216f312 100644
--- a/modules/desktop/nixos/gnome.nix
+++ b/modules/desktop/nixos/gnome.nix
@@ -59,7 +59,7 @@ in
       gnome-software
     ];
 
-    hjem.users."${config.collinux.user.name}".packages = with pkgs.gnomeExtensions; [blur-my-shell dash-to-dock];
+    hjem.users."${config.collinux.user.name}".packages = with pkgs.gnomeExtensions; [blur-my-shell dash-to-dock] ++ [pkgs.wl-clipboard];
 
     programs.dconf = {
       enable = true;
diff --git a/modules/services/nixos/default.nix b/modules/services/nixos/default.nix
index d177b88..9c95180 100644
--- a/modules/services/nixos/default.nix
+++ b/modules/services/nixos/default.nix
@@ -5,5 +5,6 @@
     ./bluetooth.nix
     ./tailscale.nix
     ./selfhost
+    ./ssh.nix
   ];
 }
diff --git a/modules/services/nixos/ssh.nix b/modules/services/nixos/ssh.nix
new file mode 100644
index 0000000..6db41bf
--- /dev/null
+++ b/modules/services/nixos/ssh.nix
@@ -0,0 +1,17 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.collinux.services.networking.sshd;
+in
+  lib.mkIf cfg.enable {
+    services.openssh = {
+      enable = true;
+      settings = {
+        PermitRootLogin = "no";
+        PasswordAuthentication = false;
+      };
+    };
+  }
diff --git a/modules/services/nixos/tailscale.nix b/modules/services/nixos/tailscale.nix
index 7b6cf08..f60e48e 100644
--- a/modules/services/nixos/tailscale.nix
+++ b/modules/services/nixos/tailscale.nix
@@ -10,6 +10,7 @@ in
     services.tailscale = {
       enable = true;
       useRoutingFeatures = "both";
+      extraSetFlags = ["--ssh=true"];
     };
     networking.firewall = {
       checkReversePath = "loose";
diff --git a/secrets/collin-jupiter-passwd.age b/secrets/collin-jupiter-passwd.age
new file mode 100644
index 0000000..2ce36a9
--- /dev/null
+++ b/secrets/collin-jupiter-passwd.age
@@ -0,0 +1,11 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IHEzZUV5dyBRR0pM
+UzBhY2ptL1l5UjFTK2RWREhxdjZHMlBCbGNTUWtHblpWd0g3QWhvCnFLb2t2RHhC
+SDI2eHdFY1V5cjcyNjBuVzVtZVdZYmF3UEtOQUxEdk1oMVkKLT4gc3NoLWVkMjU1
+MTkgWjh6aWtnIDUzT011SUZvTWJCWm1LYmlybG1acmprVXdmQmVTM0doSWdva1Jv
+RTdKbW8KRE0wUUJOZEt1WEQwYkVtVXgyYzBOdGJsMHI0akxZc28ySkd5UXk3V3Zz
+VQotLS0gY0xFRDVrQ0ZFbHVUaVNwajBWSVI4YUI3aVR4WUJsRU5zYTBEMWEyKzVh
+WQptqU95IRsooJtCtVgzTZfjp7yZFet841kzAqLzV9vn0LZyQxgjJfta4/fpAGCK
+REnUB9iQ13vugXLjiLFmtUF1wKP/OR9HxsPOg0nBvrdI7T7IH/Zifcmnh8QKxRQK
+TD5g/tmj2Y9P9I7h
+-----END AGE ENCRYPTED FILE-----
diff --git a/secrets/default.nix b/secrets/default.nix
index 5b6bf15..25dee35 100644
--- a/secrets/default.nix
+++ b/secrets/default.nix
@@ -1,6 +1,6 @@
 {
   age.secrets = {
-    "collin@mercury-passwd".file = ./${"collin-mercury-passwd.age"};
-    "collin@jupiter-passwd".file = ./${"./collin-mercury-passwd.age"};
+    "collin@mercury-passwd".file = ./collin-mercury-passwd.age;
+    "collin@jupiter-passwd".file = ./collin-jupiter-passwd.age;
   };
 }
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index bb32868..7d2119d 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -3,13 +3,14 @@ let
   user_jupiter = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGK8U+m6/9g7/AduxQcawJrA2V3lSEUrF7j/oJwPow3q";
 
   system_mercury = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIQtMAgPdWwrOzlZT/lEIRQZ+ajhafG9AEJCrF2/bsmN";
+  system_jupiter = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFTSXbRaBDe09gkREhYrRVis+CtxpHOcDoIRdUAAO/Js";
 in {
   "collin-mercury-passwd.age" = {
     publicKeys = [user_mercury system_mercury];
     armor = true;
   };
   "collin-jupiter-passwd.age" = {
-    publicKeys = [user_jupiter];
+    publicKeys = [user_jupiter system_jupiter];
     armor = true;
   };
 }