From 03505769705f78f4e92362068a32a2100c1cdd16 Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Mon, 17 Mar 2025 00:05:05 +0100 Subject: [PATCH] attempts to downgrade mesa --- flake.lock | 30 +++++++++++++++--------------- flake.nix | 3 +++ hosts/lyes-pc/default.nix | 2 +- modules/common/default.nix | 7 +++++++ modules/desktop/packages.nix | 18 ++++++++++++++++++ modules/desktop/system.nix | 3 ++- users/lyes/default.nix | 2 +- 7 files changed, 47 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index e2a0c7e..ba14e2a 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1740485968, - "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", + "lastModified": 1741786315, + "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", "owner": "nix-community", "repo": "disko", - "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", + "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740646007, - "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", + "lastModified": 1741792691, + "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", + "rev": "e1f12151258b12c567f456d8248e4694e9390613", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741048562, - "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", + "lastModified": 1741862977, + "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", + "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", "type": "github" }, "original": { @@ -91,11 +91,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1741010256, - "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1740554227, - "narHash": "sha256-xpwZeMw2gGenixGQDyVv+ja+epcR+EJ1BPuGFdgFS18=", + "lastModified": 1742076998, + "narHash": "sha256-EuqbZFwam8dXNiuytI67rIUrF4ogy62OF2nGxWk8GGI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7de16ae319e6f6852274fa90b0d41c00049767c9", + "rev": "30fdea2435aeeb961acba896b9b65bab4fd17003", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3394dcc..0c538fb 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,12 @@ description = "NixOS Configuration"; inputs = { + # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs/ca30ae374a8977fa1c1d1336fff80317e6f5538d"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager.url = "github:nix-community/home-manager/release-24.11"; + # home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nix-flatpak.url = "github:gmodena/nix-flatpak/latest"; diff --git a/hosts/lyes-pc/default.nix b/hosts/lyes-pc/default.nix index 204c875..90f6799 100644 --- a/hosts/lyes-pc/default.nix +++ b/hosts/lyes-pc/default.nix @@ -12,7 +12,7 @@ }; # Kernel - boot.kernelPackages = pkgs.linuxPackages_6_12; + # boot.kernelPackages = pkgs.linuxPackages_6_13; # Boot boot.loader.systemd-boot.enable = true; diff --git a/modules/common/default.nix b/modules/common/default.nix index 888f914..c6bbe55 100644 --- a/modules/common/default.nix +++ b/modules/common/default.nix @@ -13,6 +13,13 @@ local = import ../../pkgs { pkgs = final; }; }) + # # Stable + # (final: prev: { + # stable = import nixpkgs-stable { + # system = prev.system; + # }; + # }) + # Unstable (final: prev: { unstable = import nixpkgs-unstable { diff --git a/modules/desktop/packages.nix b/modules/desktop/packages.nix index 6a4b68c..95925b3 100644 --- a/modules/desktop/packages.nix +++ b/modules/desktop/packages.nix @@ -45,6 +45,7 @@ in { gimp loupe snapshot + inkscape # Video mpv @@ -77,6 +78,8 @@ in { ryujinx dolphin-emu parsec-bin + unstable.suyu + # suyu # Reading # calibre @@ -98,6 +101,7 @@ in { tex pandoc unstable.typst + # typst tinymist zotero @@ -122,6 +126,7 @@ in { haskellPackages.Agda agdaPackages.standard-library devtoolbox + elan # Containers & VMs toolbox @@ -239,6 +244,7 @@ in { twitter-color-emoji twemoji-color-font (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) + # nerd-fonts.jetbrains-mono ]; fontconfig = { @@ -274,6 +280,18 @@ in { # "-DDOLPHIN_WC_REVISION=${final.dolphin-emu.commit}" # ]; # }); + # mesa = final.mesa-24-2-4.mesa; + # mesa = prev.mesa.overrideAttrs (super: { + # version = "24.2.4"; + + # src = pkgs.fetchFromGitLab { + # domain = "gitlab.freedesktop.org"; + # owner = "mesa"; + # repo = "mesa"; + # rev = "mesa-24.2.4"; + # hash = "sha256-pgyvgMHImWO+b4vpCCe4+zOI98XCqcG8NRWpIcImGUk="; + # }; + # }); }) ]; } diff --git a/modules/desktop/system.nix b/modules/desktop/system.nix index fde5862..0f47190 100644 --- a/modules/desktop/system.nix +++ b/modules/desktop/system.nix @@ -64,7 +64,7 @@ # Firefox config programs.firefox = { enable = true; - package = pkgs.firefox-beta; + # package = pkgs.firefox-beta; # Doesn't work ? # languagePacks = [ "fr" "en-US" ]; }; @@ -72,6 +72,7 @@ xdg.portal.enable = true; # Sound + # services.pulseaudio.enable = false; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { diff --git a/users/lyes/default.nix b/users/lyes/default.nix index 374f5b4..15f89f7 100644 --- a/users/lyes/default.nix +++ b/users/lyes/default.nix @@ -18,7 +18,7 @@ home-manager.useUserPackages = true; home-manager.useGlobalPkgs = true; - home-manager.users.lyes = { pkgs, ... }: { + home-manager.users.lyes = { ... }: { imports = [ ./home.nix