From 7b65de580334a8e04e264601fe3770cb9288b92f Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Sun, 18 May 2025 12:05:29 +0000 Subject: merge conflict upcoming --- machines/picast/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/machines/picast/default.nix b/machines/picast/default.nix index e99a15b..827045f 100644 --- a/machines/picast/default.nix +++ b/machines/picast/default.nix @@ -12,7 +12,6 @@ ../../modules/nixos/nix-common.nix ../../modules/nixos/environment.nix ../../modules/nixos/tailscale.nix - ../../modules/nixos/cgit.nix ../../modules/nixos/system-packages.nix ../../modules/users/defin.nix ../../modules/users/root.nix @@ -23,13 +22,13 @@ # Enables the generation of /boot/extlinux/extlinux.conf boot.loader.generic-extlinux-compatible.enable = true; - # networking.hostName = "nixos"; # Define your hostname. + networking.hostName = "picast"; # Define your hostname. # Pick only one of the below networking options. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. # Set your time zone. - # time.timeZone = "Europe/Amsterdam"; + time.timeZone = "US/Mountain"; # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; @@ -106,7 +105,7 @@ # and migrated your data accordingly. # # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "24.05"; # Did you read the comment? + system.stateVersion = "24.11"; # Did you read the comment? } -- cgit v1.2.3