sovr/etc/nixos/configuration.nix

@@ -8,6 +8,8 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      # Include the home-manager configuration
+      <home-manager/nixos>
       inputs.sovr.nixosModules.default
     ];
 
@@ -29,6 +31,15 @@
     inputs.sovr.packages."${pkgs.system}".sovr-server
   ];
 
+  home-manager.useGlobalPkgs = true;
+  home-manager.users.eliribble = {
+    home.file.".config/nvim/after/ftplugin/html.vim".source = ./home/eliribble/config/nvim/after/ftplugin/html.vim;
+    home.file.".config/nvim/after/ftplugin/go.vim".source = ./home/eliribble/config/nvim/after/ftplugin/go.vim;
+    home.file.".config/tmux/tmux.conf".source = ./home/eliribble/config/tmux/tmux.conf;
+    home.homeDirectory = "/home/eliribble";
+    home.stateVersion = "24.11";
+    home.username = "eliribble";
+  };
   i18n.defaultLocale = "en_US.UTF-8";
 
   networking = {
@@ -63,7 +74,7 @@
 
   services.cloud-init = {
     enable = true;
-    network.enable = false;
+    network.enable = true;
   };
   services.openssh = {
     enable = true;
@@ -77,29 +88,7 @@
     sessionSecret = "secret";
   };
 
-  systemd.network = {
+  systemd.network.enable = true;
-    enable = true;
-    networks."09-wan" = {
-      address = [
-        "194.135.104.85/24"
-        "2605:e440::2:1d5/64"
-        "2605:e440::2:3e/64"
-      ];
-      dns = [
-        "8.8.8.8"
-	"8.8.4.4"
-	"2001:4860:4860::8888"
-	"2001:4860::8844"
-      ];
-      linkConfig.RequiredForOnline = "routable";
-      matchConfig.Name = "eth0";
-      routes = [
-        { Gateway = "194.135.104.1"; }
-	{ Gateway = "2605:e440::1"; }
-      ];
-    };
-  };
-
 
   # Set your time zone.
   time.timeZone = "America/Phoenix";

sovr/etc/nixos/flake.lock

@@ -1,26 +1,5 @@
 {
   "nodes": {
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1736373539,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-24.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1735264675,
@@ -55,7 +34,6 @@
     },
     "root": {
       "inputs": {
-        "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "sovr": "sovr"
       }
@@ -65,11 +43,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1735922336,
+        "lastModified": 1735827455,
-        "narHash": "sha256-pccBDqwpLTT24mwQTfLxDciSMg95FPhVy683FvUpkj4=",
+        "narHash": "sha256-BpqQu/opMGrr6xUbbFQy2bkEbUSQhbxN4X8M8DRun5I=",
         "ref": "refs/heads/main",
-        "rev": "85fc0509c232e4073896de480a4dec94bb97547c",
+        "rev": "950e618c387282e13e4ec865ae37d0e168b4469a",
-        "revCount": 64,
+        "revCount": 60,
         "type": "git",
         "url": "file:///home/eliribble/src/sovr.cloud"
       },

sovr/etc/nixos/flake.nix

@@ -3,15 +3,11 @@
 
   inputs = {
     # NixOS official package source, using the nixos-24.11 branch here
-    home-manager = {
-      url = "github:nix-community/home-manager/release-24.11";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     sovr.url = "git+file:///home/eliribble/src/sovr.cloud";
   };
 
-  outputs = { self, home-manager, nixpkgs, sovr, ... }@inputs: {
+  outputs = { self, nixpkgs, sovr, ... }@inputs: {
     nixosConfigurations.sovr = nixpkgs.lib.nixosSystem {
       specialArgs = { inherit inputs; };
       system = "x86_64-linux";
@@ -19,12 +15,6 @@
         # Import the previous configuration.nix we used,
         # so the old configuration file still takes effect
         ./configuration.nix
-	home-manager.nixosModules.home-manager
-	{
-	  home-manager.useGlobalPkgs = true;
-	  home-manager.useUserPackages = true;
-	  home-manager.users.eliribble = import ./home.nix;
-	}
       ];
     };
   };

sovr/etc/nixos/home.nix

@@ -1,10 +0,0 @@
-  { config, pkgs, ... }:
-
-  {
-    home.file.".config/nvim/after/ftplugin/html.vim".source = ./home/eliribble/config/nvim/after/ftplugin/html.vim;
-    home.file.".config/nvim/after/ftplugin/go.vim".source = ./home/eliribble/config/nvim/after/ftplugin/go.vim;
-    home.file.".config/tmux/tmux.conf".source = ./home/eliribble/config/tmux/tmux.conf;
-    home.homeDirectory = "/home/eliribble";
-    home.stateVersion = "24.11";
-    home.username = "eliribble";
-  }