Skip to content

Commit a9f1c12

Browse files
committed
24.11
1 parent bea2f20 commit a9f1c12

File tree

4 files changed

+111
-88
lines changed

4 files changed

+111
-88
lines changed

flake.lock

Lines changed: 104 additions & 79 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Pin our primary nixpkgs repository. This is the main nixpkgs repository
66
# we'll use for our configurations. Be very careful changing this because
77
# it'll impact your entire system.
8-
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
8+
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
99

1010
# We use the unstable nixpkgs repo for some packages.
1111
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
@@ -15,7 +15,7 @@
1515
nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";
1616

1717
home-manager = {
18-
url = "github:nix-community/home-manager/release-23.11";
18+
url = "github:nix-community/home-manager/release-24.05";
1919
inputs.nixpkgs.follows = "nixpkgs";
2020
};
2121

@@ -52,7 +52,6 @@
5252
outputs = { self, nixpkgs, home-manager, darwin, ... }@inputs: let
5353
# Overlays is the list of overlays we want to apply from flake inputs.
5454
overlays = [
55-
inputs.neovim-nightly-overlay.overlay
5655
inputs.zig.overlays.default
5756
];
5857

machines/vm-shared.nix

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ in {
1010
boot.kernelPackages = pkgs.linuxPackages_latest;
1111

1212
nix = {
13-
# use unstable nix so we can access flakes
14-
package = pkgs.nixUnstable;
13+
package = pkgs.nixVersions.latest;
1514
extraOptions = ''
1615
experimental-features = nix-command flakes
1716
keep-outputs = true
@@ -73,12 +72,12 @@ in {
7372
# setup windowing environment
7473
services.xserver = if linuxGnome then {
7574
enable = true;
76-
layout = "us";
75+
xkb.layout = "us";
7776
desktopManager.gnome.enable = true;
7877
displayManager.gdm.enable = true;
7978
} else {
8079
enable = true;
81-
layout = "us";
80+
xkb.layout = "us";
8281
dpi = 220;
8382

8483
desktopManager = {

0 commit comments

Comments
 (0)