diff --git a/configuration.nix b/configuration.nix index bcd36ff..9c794ad 100644 --- a/configuration.nix +++ b/configuration.nix @@ -39,9 +39,9 @@ }; }; - xserver = { + xserver.xkb = { layout = "us"; - xkbVariant = ""; + variant = ""; }; }; diff --git a/flake.lock b/flake.lock index 561c13d..25f87d4 100644 --- a/flake.lock +++ b/flake.lock @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1716431128, - "narHash": "sha256-t3T8HlX3udO6f4ilLcN+j5eC3m2gqsouzSGiriKK6vk=", + "lastModified": 1717574802, + "narHash": "sha256-TprJdvfwdjj3co7CGZ4jPIlAdZPFwYrQjamvt2B2L4g=", "owner": "nix-community", "repo": "disko", - "rev": "7ffc4354dfeb37c8c725ae1465f04a9b45ec8606", + "rev": "7fc7009c892509b9bf81cb73c6575f3f9e6321f5", "type": "github" }, "original": { @@ -354,11 +354,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1717317124, - "narHash": "sha256-37HqhTGXy67vrIETWeuS9lfqCCCM0MKs/nH+2bSTZZs=", + "lastModified": 1717549473, + "narHash": "sha256-ZDJwC8HaNwam72OQSPG4mEEYBkG969HzJHfFlLNUOQM=", "owner": "farcaller", "repo": "nixhelm", - "rev": "3dbce8dc473f2dc6122d093e3bdefbeb0a49b270", + "rev": "745b44671ccbc2651d6f1025f18b666c5e806db0", "type": "github" }, "original": { @@ -369,11 +369,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716715385, - "narHash": "sha256-fe6Z33pbfqu4TI5ijmcaNc5vRBs633tyxJ12HTghy3w=", + "lastModified": 1717574423, + "narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2e7d6c568063c83355fe066b8a8917ee758de1b8", + "rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177", "type": "github" }, "original": { @@ -401,11 +401,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1710793502, - "narHash": "sha256-MDljQvOU5jX4S5MUGJ3izSfzaeIWQ1phoc3MarCyUes=", + "lastModified": 1716925596, + "narHash": "sha256-+iuYhP5k6PMjfhJjiEfBdaV95qejvGQPutthNpVhss8=", "owner": "pizzapim", "repo": "nixpkgs", - "rev": "8db93699b9d444e8b150443cc33b175cf3e5d24d", + "rev": "9548d6e31291da38dc2c7b24a47730c25038a27e", "type": "github" }, "original": { @@ -417,16 +417,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716361217, - "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", + "lastModified": 1717281328, + "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", + "rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 65031da..5a610a1 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "NixOS definitions for our home servers"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs-unstable.url = "github:pizzapim/nixpkgs/gatus"; deploy-rs.url = "github:serokell/deploy-rs"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";