continuous reorg

This commit is contained in:
John Lancaster
2024-12-08 16:03:45 -06:00
parent 9334d2cc7f
commit 343c6a89db
2 changed files with 39 additions and 26 deletions

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, userSettings, systemSettings, ... }:
{ {
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];
@@ -23,4 +23,13 @@
execWheelOnly = false; execWheelOnly = false;
wheelNeedsPassword = false; # allows sudo without password for those in the wheel group wheelNeedsPassword = false; # allows sudo without password for those in the wheel group
}; };
users.users.${userSettings.username} = {
isNormalUser = true;
uid = 1000;
extraGroups = [ "wheel" "networkmanager" ];
openssh.authorizedKeys.keyFiles = [ /root/.ssh/authorized_keys ];
};
time.timeZone = "${systemSettings.timeZone}";
} }

View File

@@ -1,5 +1,5 @@
{ {
description = "Loki flake config"; description = "Panoptes flake config";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
@@ -20,39 +20,43 @@
... ...
} @ inputs: } @ inputs:
let let
stateVersion = "24.11";
inherit (self) outputs; inherit (self) outputs;
system = "x86_64-linux"; nixosSystem = inputs.nixpkgs.lib.nixosSystem;
pkgs = nixpkgs.legacyPackages.${system};
stateVersion = "24.05";
# userSettings = rec { userSettings = rec {
# username = "shahvirb"; # username on the system username = "panoptes";
# name = "Shahvir"; # name/identifier on the system gitUserName = "John Lancaster";
# email = "shahvirb@gmail.com"; gitUserEmail = "32917998+jsl12@users.noreply.github.com";
# gitUserName = "shahvirb"; };
# gitUserEmail = "shahvirb@gmail.com";
# }; systemSettings = rec {
hostname = "panoptes-nix";
system = "x86_64-linux";
timeZone = "America/Chicago";
locale = "en_US.UTF-8";
};
pkgs = inputs.nixpkgs.legacyPackages.${systemSettings.system};
timeZone = "America/Chicago";
hostname = "panoptes-nix";
user = "panoptes";
in in
{ {
nixosConfigurations = { nixosConfigurations = {
${hostname} = nixpkgs.lib.nixosSystem { "${systemSettings.hostname}" = nixosSystem {
specialArgs = {inherit inputs outputs;}; system = systemSettings.system;
specialArgs = {
inherit inputs;
inherit outputs;
inherit userSettings;
inherit systemSettings;
};
modules = [ modules = [
./configuration.nix # > Our main nixos configuration file < ./configuration.nix # > Our main nixos configuration file <
"${nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix" "${inputs.nixpkgs}/nixos/modules/virtualisation/proxmox-lxc.nix"
({ ... }: { ({ ... }: {
nixpkgs.hostPlatform = "${system}"; # nixpkgs.hostPlatform = "${system}";
system.stateVersion = "${stateVersion}"; system.stateVersion = "${stateVersion}";
time.timeZone = "${timeZone}"; # time.timeZone = "${systemSettings.timeZone}";
users.users.${user} = {
extraGroups = [ "wheel" ];
isNormalUser = true;
openssh.authorizedKeys.keyFiles = [ /root/.ssh/authorized_keys ];
};
services.vscode-server.enable = true; services.vscode-server.enable = true;
}) })
inputs.vscode-server.nixosModules.default inputs.vscode-server.nixosModules.default