fine we'll just do it the right way

3 files changed, 21 insertions, 19 deletions

diff --git a/hosts/mercury/hjem.nix b/hosts/mercury/hjem.nix
index e203477..72026c5 100644
--- a/hosts/mercury/hjem.nix
+++ b/hosts/mercury/hjem.nix
@@ -4,26 +4,23 @@
   ...
 }: {
   packages = with pkgs; [
-    # GUI apps
     tor-browser # don't ask
+
     obsidian
     kdePackages.kleopatra
-    mpv
-    musescore
     anki
+    musescore
 
+    mpv
     bluetuith
 
     kew # music player
 
-    (prismlauncher.override {
-      jdks = [pkgs.jdk17_headless];
-    })
+    prismlauncher
 
     vital
 
     captive-browser # https://words.filippo.io/captive-browser
-
     inputs.glide-browser.packages."x86_64-linux".default
   ];
 
diff --git a/hosts/mercury/nixos.nix b/hosts/mercury/nixos.nix
index dcdd8c6..8052bb1 100644
--- a/hosts/mercury/nixos.nix
+++ b/hosts/mercury/nixos.nix
@@ -12,6 +12,8 @@
     inputs.lanzaboote.nixosModules.lanzaboote
   ];
 
+  facter.reportPath = ./facter.json;
+
   services.syncthing = {
     enable = true;
     user = "collin";
@@ -20,12 +22,17 @@
 
   services.printing.enable = true;
 
-  facter.reportPath = ./facter.json;
-
   environment.defaultPackages = lib.mkForce []; # im not a noob
 
-  networking.firewall = {
-    allowedUDPPorts = [445];
-    allowedTCPPorts = [8000];
-  };
+  # programs.firefox.policies.Preferences.ExtensionSettings = {
+
+  # };
+
+  programs.ssh.extraConfig = ''
+    Host ganymede
+      HostName 70.130.121.193
+      User collin
+      IdentityFile /home/collin/.ssh/id_ed25519
+      LocalForward 8015 127.0.0.1:8015
+  '';
 }
diff --git a/modules/services/nixos/ssh.nix b/modules/services/nixos/ssh.nix
index 6c1b2fc..1826a5e 100644
--- a/modules/services/nixos/ssh.nix
+++ b/modules/services/nixos/ssh.nix
@@ -32,16 +32,14 @@ in {
         "jupiter".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPB7feUHl5qoD5zF9AMOV2meViA+wZYdVvbVjPkggZf8";
         "ganymede".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINlr+53UmlGVP1blkdNl6NFqn1w2umFJyjH1EVUPKIy9";
       };
+    };
 
-      authorizedKeysFiles = [
-        "/etc/ssh/authorized_keys.d/locals"
+    users.users.${config.collinux.user.name}.openssh = {
+      authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAvxtKW0rmRBi8J67gLrLv8Zv338AcmZ3P20DePiUfnX mercury"
       ];
     };
 
-    environment.etc."ssh/authorized_keys.d/locals".text = ''
-      ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAvxtKW0rmRBi8J67gLrLv8Zv338AcmZ3P20DePiUfnX mercury
-    '';
-
     systemd.services."openssh" = lib.mkIf config.collinux.services.networking.networkd.enable {
       after = lib.mkAfter ["network-online.target"];
       wants = lib.mkAfter ["network-online.target"];