Merge branch 'release-24.05' into 'main'

Release 24.05

See merge request ahoneybun/nix-configs!7
This commit is contained in:
Aaron Honeycutt 2024-06-25 22:23:40 +00:00
commit 3f5a6ebcc4
2 changed files with 7 additions and 6 deletions

View file

@ -34,7 +34,7 @@
time.timeZone = "America/Denver"; time.timeZone = "America/Denver";
# Enter keyboard layout # Enter keyboard layout
services.xserver.layout = "us"; services.xserver.xkb.layout = "us";
# Define user accounts # Define user accounts
users.users.aaronh = { users.users.aaronh = {
@ -101,7 +101,7 @@
services.avahi = { services.avahi = {
enable = true; enable = true;
nssmdns = true; #nssmdns4 = true;
openFirewall = true; openFirewall = true;
# Needed for detecting scanners # Needed for detecting scanners
publish = { publish = {
@ -126,6 +126,6 @@
}; };
# System # System
system.stateVersion = "23.11"; system.stateVersion = "24.05";
system.autoUpgrade.enable = true; system.autoUpgrade.enable = true;
} }

View file

@ -2,14 +2,15 @@
description = "Generic System Flake file"; description = "Generic System Flake file";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/release-23.11"; # nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
disko = { disko = {
url = github:nix-community/disko; url = github:nix-community/disko;
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.11"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list where available inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
}; };