Merge branch 'forgejo'

modules/hosts/john-p14s/configuration.nix

@@ -41,6 +41,7 @@
         busybox
         dig
         samba
+        my-neovim
       ];
 
       security.pam.services.swaylock = {};
@@ -123,6 +124,7 @@
           home.packages = with pkgs; [
             bash
             discord
+            my-neovim
           ];
           ssh.matchSets = {
             appdaemon = true;

modules/services/ssh.nix

@@ -127,6 +127,10 @@ in
 
         matchBlocks = lib.mkMerge [
           {
+            "john-pc-ubuntu" = {
+              hostname = "192.168.1.85";
+            };
+
             "*" = lib.mkMerge [
               {
                 user = "john";