reorg

flake.nix

@@ -1,27 +1,10 @@
 {
   description = "Panoptes flake config";
 
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    vscode-server.url = "github:nix-community/nixos-vscode-server";
-  };
-
-  outputs = {
-    self,
-    nixpkgs,
-    nixpkgs-stable,
-    home-manager,
-    ...
-  } @ inputs:
+  outputs = { self, ... }@args:
   let
-    stateVersion = "24.11";
     inherit (self) outputs;
-    nixosSystem = inputs.nixpkgs.lib.nixosSystem;
+    nixosSystem = args.nixpkgs.lib.nixosSystem;
     
     userSettings = rec {
       username = "panoptes";
@@ -32,54 +15,59 @@
 
     systemSettings = rec {
       hostName = "panoptes-nix";
+      stateVersion = "24.11";
       system = "x86_64-linux";
       timeZone = "America/Chicago";
       locale = "en_US.UTF-8";
     };
 
-    pkgs = inputs.nixpkgs.legacyPackages.${systemSettings.system};
-    pkgs-stable = inputs.nixpkgs-stable.legacyPackages.${systemSettings.system};
+    pkgs = args.nixpkgs.legacyPackages.${systemSettings.system};
+    pkgs-stable = args.nixpkgs-stable.legacyPackages.${systemSettings.system};
 
   in
   {
     nixosModules.default = ./nixosModules;
 
-    nixosConfigurations = {
-      "${systemSettings.hostName}" = nixosSystem {
-        system = systemSettings.system;
-        specialArgs = {
-          inherit inputs;
-          inherit outputs;
-          inherit userSettings;
-          inherit systemSettings;
-        };
-        modules = [
-          ./configuration.nix # > Our main nixos configuration file <
-          "${inputs.nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix"
-          ({ ... }: {
-            system.stateVersion = "${stateVersion}";
-            services.vscode-server.enable = true;
-          })
-          inputs.vscode-server.nixosModules.default
-        ];
+    nixosConfigurations.${systemSettings.hostName} = nixosSystem {
+      system = systemSettings.system;
+      specialArgs = {
+        inherit systemSettings;
+        inherit userSettings;
       };
+      modules = [
+        (args.nixpkgs + "/nixos/modules/virtualisation/proxmox-lxc.nix")
+        # ./configuration.nix # > Our main nixos configuration file <
+        outputs.nixosModules.default
+        args.home-manager.nixosModules.default
+        args.vscode-server.nixosModules.default
+        ({ ... }: { services.vscode-server.enable = true; })
+      ];
     };
 
     homeConfigurations = {
       useGlobalPkgs = true;
-      "panoptes@panoptes-nix" = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs stateVersion;
-        specialArgs = {
-          inherit inputs;
+      ${userSettings.username} = args.home-manager.lib.homeManagerConfiguration {
+        inherit pkgs;
+        extraSpecialArgs = {
+          inherit args;
           inherit outputs;
           inherit userSettings;
           inherit systemSettings;
         };
         modules = [
           ./home.nix
-          # ({...}: {home.stateVersion = "${stateVersion}";})
         ];
       };
     };
   };
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    vscode-server.url = "github:nix-community/nixos-vscode-server";
+  };
 }