import

default.nix

@@ -16,43 +16,43 @@
             sharedModules = [ 
                 inputs.sops-nix.homeManagerModules.sops 
             ];
-            config = { config, lib, pkgs, ... }: {
+            config = lib.mkMerge [
-                imports = [
+                inputs.olympus.homes.nathan
-                    inputs.olympus.homes.nathan
+                ({ config, lib, pkgs, ... }: {
-                ];
+                    config = {
-                config = {
+                        homeconfig = {
-                    homeconfig = {
+                            graphical = false;
-                        graphical = false;
+                            minimal = true;
-                        minimal = true;
+                            host = "android";
-                        host = "android";
+                            scripts.enable = false;
-                        scripts.enable = false;
+                        };
+
+                        home.packages = with pkgs; [ nano ];
+
+                        programs.ssh.extraConfig = ''
+                            Host esotericbytes.com
+                            HostName esotericbytes.com
+                            Port 2222
+
+                            Host builder
+                            HostName esotericbytes.com
+                            Port 2222
+                            User remote-builder
+                            IdentityFile /home/nathan/.ssh/id_ed25519
+
+                            Host remote
+                            HostName esotericbytes.com
+                            Port 2222
+                            User nathan
+                            IdentityFile /home/nathan/.ssh/id_ed25519
+                        '';
+
+                        home.username = "nathan";
+
+                        home.homeDirectory = "/data/data/com.termux.nix/files/home";
                     };
-
+                })
-                    home.packages = with pkgs; [ nano ];
+            ];
-
-                    programs.ssh.extraConfig = ''
-                        Host esotericbytes.com
-                        HostName esotericbytes.com
-                        Port 2222
-
-                        Host builder
-                        HostName esotericbytes.com
-                        Port 2222
-                        User remote-builder
-                        IdentityFile /home/nathan/.ssh/id_ed25519
-                        
-                        Host remote
-                        HostName esotericbytes.com
-                        Port 2222
-                        User nathan
-                        IdentityFile /home/nathan/.ssh/id_ed25519
-                    '';
-
-                    home.username = "nathan";
-
-                    home.homeDirectory = "/data/data/com.termux.nix/files/home";
-                };
-            };
         };
 
         terminal.font = "${pkgs.fira-code}/share/fonts/truetype/FiraCode-VF.ttf";