more reorg

This commit is contained in:
John Lancaster
2024-12-07 14:49:14 -06:00
parent 679f8bfca0
commit a3179e52d7
3 changed files with 32 additions and 9 deletions

View File

@@ -8,7 +8,7 @@
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
vscode-server.url = "github:nix-community/nixos-vscode-server";
vscode-local.url = "path:./nixos/vscode";
};
outputs = {
@@ -16,7 +16,6 @@
nixpkgs,
nixpkgs-stable,
home-manager,
vscode-server,
...
} @ inputs:
let
@@ -25,16 +24,14 @@
stateVersion = "24.05";
timeZone = "America/Chicago";
hostname = "loki";
lokiPort = 3100;
lokiUser = "loki";
lokiPath = "/srv/loki";
lokiPort = 3100;
in
{
nixosConfigurations = {
# FIXME replace with your hostname
${hostname} = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs;};
# pkgs = import nixpkgs { system = "x86_64-linux"; };
modules = [
./nixos/configuration.nix # > Our main nixos configuration file <
"${nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix"
@@ -43,8 +40,6 @@
system.stateVersion = "${stateVersion}";
time.timeZone = "${timeZone}";
})
vscode-server.nixosModules.default
({ config, pkgs, ... }: {services.vscode-server.enable = true;})
(import ./nixos/loki.nix {
pkgs = nixpkgs.legacyPackages.${system};
inherit lokiPort;