diff --git a/flake.lock b/flake.lock index 99604d2..8295165 100644 --- a/flake.lock +++ b/flake.lock @@ -114,6 +114,22 @@ "type": "github" } }, + "nixpkgs-2411": { + "locked": { + "lastModified": 1732350895, + "narHash": "sha256-GcOQbOgmwlsRhpLGSwZJwLbo3pu9ochMETuRSS1xpz4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0c582677378f2d9ffcb01490af2f2c678dcb29d3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1723362943, @@ -137,6 +153,7 @@ "intake-sources": "intake-sources", "nixpkgs-2311": "nixpkgs-2311", "nixpkgs-2405": "nixpkgs-2405", + "nixpkgs-2411": "nixpkgs-2411", "nixpkgs-unstable": "nixpkgs-unstable" } } diff --git a/flake.nix b/flake.nix index a7c9c4f..05c9bd6 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,7 @@ inputs = { nixpkgs-2311.url = "github:NixOS/nixpkgs/23.11"; nixpkgs-2405.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs-2411.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-compat = { url = "github:edolstra/flake-compat"; @@ -22,6 +23,7 @@ self, nixpkgs-2311, nixpkgs-2405, + nixpkgs-2411, nixpkgs-unstable, flake-compat, intake, @@ -64,7 +66,7 @@ ./machine/empyrean ]; }; - imperium = nixpkgs-2405.lib.nixosSystem { + imperium = nixpkgs-2411.lib.nixosSystem { system = "x86_64-linux"; modules = [ self.nixosModules.beatific diff --git a/machine/imperium/default.nix b/machine/imperium/default.nix index a15343f..b85761a 100644 --- a/machine/imperium/default.nix +++ b/machine/imperium/default.nix @@ -40,7 +40,6 @@ }; # Enable sound with pipewire. - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { @@ -70,8 +69,8 @@ programs.steam.enable = true; nixpkgs.config.allowUnfree = true; services.xserver.videoDrivers = [ "i915" ]; - hardware.opengl.enable = true; - hardware.opengl.driSupport32Bit = true; + hardware.graphics.enable = true; + hardware.graphics.enable32Bit = true; beatific.extraPrograms = true; environment.systemPackages = with pkgs; [ @@ -80,7 +79,7 @@ bitwarden-cli comic-mono firefox - gnome.gnome-terminal + gnome-terminal gthumb libreoffice mpv