sys: bao: correct timezone

top-level-nix
Pegasust 2022-12-21 17:43:20 -07:00
parent e827efcedf
commit 7cdfe03e31
2 changed files with 21 additions and 27 deletions

View File

@ -11,9 +11,9 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./wsl-configuration.nix ./wsl-configuration.nix
{ {
system.stateVersion = "22.05"; system.stateVersion = "22.05";
} }
]; ];
specialArgs = { specialArgs = {
# includeHardware = false; # includeHardware = false;
@ -28,9 +28,9 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./configuration.nix ./configuration.nix
{ {
system.stateVersion = "22.05"; system.stateVersion = "22.05";
} }
]; ];
specialArgs = { specialArgs = {
hostname = "lizzi"; hostname = "lizzi";
@ -87,9 +87,9 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./configuration.nix ./configuration.nix
{ {
system.stateVersion = "22.05"; system.stateVersion = "22.05";
} }
]; ];
specialArgs = { specialArgs = {
hostname = "pixi"; hostname = "pixi";
@ -143,9 +143,9 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./configuration.nix ./configuration.nix
{ {
system.stateVersion = "22.05"; system.stateVersion = "22.05";
} }
]; ];
specialArgs = { specialArgs = {
hostname = "nyx"; hostname = "nyx";
@ -171,9 +171,9 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./configuration.nix ./configuration.nix
{ {
system.stateVersion = "22.05"; system.stateVersion = "22.05";
} }
]; ];
specialArgs = { specialArgs = {
hostname = "nixos"; hostname = "nixos";
@ -181,10 +181,9 @@
}; };
nixosConfigurations.bao = nixpkgs.lib.nixosSystem { nixosConfigurations.bao = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs.hostname = "bao"; specialArgs.hostname = "bao";
modules = [ modules = [
./configuration.nix ./configuration.nix
({ config, pkgs, lib, ... }: ({ config, pkgs, lib, ... }:
let let
gpu_pkgs = [ pkgs.clinfo pkgs.lshw pkgs.glxinfo pkgs.pciutils ]; gpu_pkgs = [ pkgs.clinfo pkgs.lshw pkgs.glxinfo pkgs.pciutils ];
@ -217,13 +216,7 @@
}; };
systemPackages = [] ++ gpu_pkgs; systemPackages = [] ++ gpu_pkgs;
in in
lib.recursiveUpdate gpu_conf (lib.recursiveUpdate nv_rtx3060 lib.recursiveUpdate gpu_conf (lib.recursiveUpdate nv_rtx3060 {
{
imports =
[ # Include the results of the hardware scan.
./profiles/bao/hardware-configuration.nix
];
# Use UEFI # Use UEFI
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
@ -237,8 +230,7 @@
services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.sddm.enable = true;
services.xserver.desktopManager.plasma5.enable = true; services.xserver.desktopManager.plasma5.enable = true;
time.timeZone = "America/Phoenix";
# Configure keymap in X11 # Configure keymap in X11
services.xserver.layout = "us"; services.xserver.layout = "us";
# services.xserver.xkbOptions = { # services.xserver.xkbOptions = {
@ -310,7 +302,6 @@
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "22.11"; # Did you read the comment? system.stateVersion = "22.11"; # Did you read the comment?
})) }))
]; ];
}; };

3
scripts/list-generations.sh Executable file
View File

@ -0,0 +1,3 @@
#!/usr/bin/env sh
sudo nix-env --list-generations --profile /nix/var/nix/profiles/system