working variables

This commit is contained in:
John Lancaster
2024-12-07 13:47:50 -06:00
parent 4e87f3119f
commit d741b62d2c
3 changed files with 14 additions and 21 deletions

View File

@@ -1,15 +1,5 @@
{ pkgs, modulesPath, ... }: { pkgs, ... }:
let
stateVersion = "24.05";
in
{ {
# system.stateVersion = stateVersion;
# imports = [
# (modulesPath + "/virtualisation/proxmox-lxc.nix")
# ];
# time.timeZone = "America/Chicago";
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

10
flake.lock generated
View File

@@ -48,9 +48,10 @@
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
@@ -63,9 +64,10 @@
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "nixos-24.11",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {

View File

@@ -2,7 +2,6 @@
description = "Loki flake config"; description = "Loki flake config";
inputs = { inputs = {
# nixos.url = "github:NixOS/nixpkgs/nixos";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
home-manager = { home-manager = {
@@ -14,7 +13,6 @@
outputs = { outputs = {
self, self,
nixos,
nixpkgs, nixpkgs,
nixpkgs-stable, nixpkgs-stable,
home-manager, home-manager,
@@ -24,6 +22,7 @@
let let
inherit (self) outputs; inherit (self) outputs;
system = "x86_64-linux"; system = "x86_64-linux";
stateVersion = "24.05";
timeZone = "America/Chicago"; timeZone = "America/Chicago";
hostname = "loki"; hostname = "loki";
lokiUser = "loki"; lokiUser = "loki";
@@ -33,13 +32,15 @@
nixosConfigurations = { nixosConfigurations = {
# FIXME replace with your hostname # FIXME replace with your hostname
${hostname} = nixpkgs.lib.nixosSystem { ${hostname} = nixpkgs.lib.nixosSystem {
stateVersion = "24.05"; inherit system;
system = "${system}";
timeZone = "${timeZone}";
specialArgs = {inherit inputs outputs;}; specialArgs = {inherit inputs outputs;};
modules = [ modules = [
./configuration.nix # > Our main nixos configuration file < ./configuration.nix # > Our main nixos configuration file <
"${nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix" "${nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix"
({ ... }: {
system.stateVersion = "${stateVersion}";
time.timeZone = "${timeZone}";
})
vscode-server.nixosModules.default vscode-server.nixosModules.default
({ config, pkgs, ... }: {services.vscode-server.enable = true;}) ({ config, pkgs, ... }: {services.vscode-server.enable = true;})
]; ];