From 0acb48c9a75d9b87e331ede5e7a46fe38023085e Mon Sep 17 00:00:00 2001 From: Random936 Date: Mon, 23 Sep 2024 18:43:32 -0700 Subject: [PATCH] Revert "Switched to unstable nixos" This reverts commit 60bbd91f3d4cd27c701196652e15bdcf5696ba34. --- config/media.nix | 4 ++-- config/omen.nix | 5 +++-- flake.lock | 16 ++++++++-------- flake.nix | 4 ++-- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/config/media.nix b/config/media.nix index 885b45b..0da7ab8 100644 --- a/config/media.nix +++ b/config/media.nix @@ -35,9 +35,9 @@ nvidiaSettings = true; }; - graphics = { + opengl = { enable = true; - enable32Bit = true; + driSupport32Bit = true; }; }; diff --git a/config/omen.nix b/config/omen.nix index 151142a..935b72f 100644 --- a/config/omen.nix +++ b/config/omen.nix @@ -43,9 +43,10 @@ environment.variables.GDK_SCALE = "0.5"; # Install OpenGL - hardware.graphics = { + hardware.opengl = { enable = true; - enable32Bit = true; + driSupport = true; + driSupport32Bit = true; }; # Ignore laptop lid closing when connected to power. diff --git a/flake.lock b/flake.lock index 8e37454..b9ac50b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,16 +7,16 @@ ] }, "locked": { - "lastModified": 1727111745, - "narHash": "sha256-EYLvFRoTPWtD+3uDg2wwQvlz88OrIr3zld+jFE5gDcY=", + "lastModified": 1717527182, + "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", "owner": "nix-community", "repo": "home-manager", - "rev": "21c021862fa696c8199934e2153214ab57150cb6", + "rev": "845a5c4c073f74105022533907703441e0464bc3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -43,16 +43,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "lastModified": 1717696253, + "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 9567558..b699f28 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "Configuration flake for RandomCTF"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; home-manager = { - url = "github:nix-community/home-manager/master"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; };