flake.nix

@@ -5,14 +5,12 @@
     sops-nix.url = "github:Mic92/sops-nix";
   };
   outputs = { self, nixpkgs, sops-nix }@inputs: {
+  
   nixosConfigurations = {
     "forgejo" = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
 	modules = [
-          # Import the configuration.nix here, so that the
+          ./hosts/forgenite/default.nix
-          # old configuration file can still take effect.
-          # Note: configuration.nix itself is also a Nixpkgs Module,
-          ./configuration.nix
           sops-nix.nixosModules.sops
         ];
 	specialArgs = { 

hosts/forgenite/default.nix

@@ -1,14 +1,12 @@
-{ config, pkgs, lib, inputs, ... }: with lib.meta; {
+{ config, pkgs, lib, inputs, ... }: {
   imports =
     [
+      ./../../services/forgejo.nix
+      ./../../users/lyn
       ./hardware-configuration.nix
     ];
-
-  # will this work?
-  users.lyn.enable = true;
-  services.forgejo.enable = true;
   # Write path for borgbackup repos for backup.nix
-  _module.args.borgrepolistfile = ./borgrepos;
+  #_module.args.borgrepolistfile = ./borgrepos;
 
   # Enable Flakes and the new command-line tool
   nix.settings.experimental-features = [ "nix-command" "flakes" ];

users/lyn/default.nix

@@ -1,8 +1,11 @@
-{lib, config, ...}:{
+{lib,pkgs, config, ...}:{
+    imports = [
+	./ssh.nix
+    ];
     users.users.lyn = {   
     isNormalUser = true;
    	extraGroups = [ "wheel"];
 	  packages = with pkgs; [
     ];
-}
+    };
 }

users/lyn/ssh.nix

@@ -1,3 +1,3 @@
-{lib, config, ...}: lib.mkLocalModule ./. "Lyn SSH user config" {
+{lib, config, ...}: {
     users.users.lyn.openssh.authorizedKeys.keys = ["ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC7NUaBJOYgMnT2uUUUSB7gKaqqbgxXDghBkRqSGuZrAZzZYHlHH7nM6Re7+yOYMSoJGLaB4iaUDLSBBnyA6pLI= nixos_gitea@secretive.MacBook-Pro-(2).local"];
 }