diff --git a/configuration.nix b/configuration.nix index c0e2b2d..5e1500b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,15 +1,5 @@ -{ pkgs, modulesPath, ... }: -let - stateVersion = "24.05"; -in +{ pkgs, ... }: { - # system.stateVersion = stateVersion; - # imports = [ - # (modulesPath + "/virtualisation/proxmox-lxc.nix") - # ]; - - # time.timeZone = "America/Chicago"; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; environment.systemPackages = with pkgs; [ diff --git a/flake.lock b/flake.lock index 88db3e9..7651aa9 100644 --- a/flake.lock +++ b/flake.lock @@ -48,9 +48,10 @@ "type": "github" }, "original": { - "id": "nixpkgs", + "owner": "NixOS", "ref": "nixos-unstable", - "type": "indirect" + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-stable": { @@ -63,9 +64,10 @@ "type": "github" }, "original": { - "id": "nixpkgs", + "owner": "NixOS", "ref": "nixos-24.11", - "type": "indirect" + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_2": { diff --git a/flake.nix b/flake.nix index 8b2e6af..a2ad4e4 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,6 @@ description = "Loki flake config"; inputs = { - # nixos.url = "github:NixOS/nixpkgs/nixos"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; home-manager = { @@ -14,7 +13,6 @@ outputs = { self, - nixos, nixpkgs, nixpkgs-stable, home-manager, @@ -24,6 +22,7 @@ let inherit (self) outputs; system = "x86_64-linux"; + stateVersion = "24.05"; timeZone = "America/Chicago"; hostname = "loki"; lokiUser = "loki"; @@ -33,13 +32,15 @@ nixosConfigurations = { # FIXME replace with your hostname ${hostname} = nixpkgs.lib.nixosSystem { - stateVersion = "24.05"; - system = "${system}"; - timeZone = "${timeZone}"; + inherit system; specialArgs = {inherit inputs outputs;}; modules = [ ./configuration.nix # > Our main nixos configuration file < "${nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix" + ({ ... }: { + system.stateVersion = "${stateVersion}"; + time.timeZone = "${timeZone}"; + }) vscode-server.nixosModules.default ({ config, pkgs, ... }: {services.vscode-server.enable = true;}) ]; @@ -68,4 +69,4 @@ }; }; }; -} \ No newline at end of file +}