From 976c16f1acbc76ffc8499680ab52864dadb8e043 Mon Sep 17 00:00:00 2001 From: Lyes Saadi Date: Sat, 10 May 2025 13:19:33 +0200 Subject: [PATCH] Updating to staging and GNOME 48 --- flake.lock | 68 ++++++++++++++++----------------- flake.nix | 3 +- hosts/lyes-pc/default.nix | 8 ++-- modules/gnome/packages.nix | 2 - users/lyes/desktop/packages.nix | 14 ++++--- 5 files changed, 50 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index f4eaeab..937edbb 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1745630506, + "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "96e078c646b711aee04b82ba01aefbff87004ded", "type": "github" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", "type": "github" }, "original": { @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1745369821, - "narHash": "sha256-mi6cAjuBztm9gFfpiVo6mAn81cCID6nmDXh5Kmyjwyc=", + "lastModified": 1746729224, + "narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=", "owner": "nix-community", "repo": "disko", - "rev": "c5140c6079ff690e85eac0b86e254de16a79a4b7", + "rev": "85555d27ded84604ad6657ecca255a03fd878607", "type": "github" }, "original": { @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", "type": "github" }, "original": { @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1745380081, - "narHash": "sha256-bUy25YkdRfdWPxSyx22igWi6g3rd3HXKFg+yL4dfBPY=", + "lastModified": 1746798521, + "narHash": "sha256-axfz/jBEH9XHpS7YSumstV7b2PrPf7L8bhWUtLBv3nA=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d0e13904bd8c444ab1595f686ede5eff377e881", + "rev": "e95a7c5b6fa93304cd2fd78cf676c4f6d23c422c", "type": "github" }, "original": { @@ -144,11 +144,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745392233, - "narHash": "sha256-xmqG4MZArM1JNxPJ33s0MtuBzgnaCO9laARoU3AfP8E=", + "lastModified": 1746814339, + "narHash": "sha256-hf2lICJzwACWuzHCmZn5NI6LUAOgGdR1yh8ip+duyhk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8bf8a2a0822365bd8f44fd1a19d7ed0a1d629d64", + "rev": "3c5e12673265dfb0de3d9121420c0c2153bf21e0", "type": "github" }, "original": { @@ -160,11 +160,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { @@ -176,11 +176,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1745279238, - "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", + "lastModified": 1746557022, + "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3", + "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "type": "github" }, "original": { @@ -192,11 +192,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1745234285, - "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", + "lastModified": 1746663147, + "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", + "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "type": "github" }, "original": { @@ -208,17 +208,17 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1745234285, - "narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", + "lastModified": 1746813904, + "narHash": "sha256-PEg97fiwGATQOYyBCHnPBe61WXspoEtTnkdfpUFs+hg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c11863f1e964833214b767f4a369c6e6a7aba141", + "rev": "f609feb30fe15f3586195fd99769600e842d7cad", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "f609feb30fe15f3586195fd99769600e842d7cad", "type": "github" } }, @@ -272,11 +272,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1745382202, - "narHash": "sha256-idR8y6WmZ9eLpxUJqSXtZznAkVlan4luRSvzEIc/6LQ=", + "lastModified": 1746825459, + "narHash": "sha256-d5Pbf8fn+fvkl3XQRmojybbCTCAUpq7WWfkaBg8mXKc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "6b11cfc1cae680049a6d5108fb90a72e2786f24f", + "rev": "697676ff0c4f6377659db7972e8db845d65181f9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 876f796..393d815 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,8 @@ inputs = { # nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/f609feb30fe15f3586195fd99769600e842d7cad"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; # home-manager.url = "github:nix-community/home-manager/release-24.11"; diff --git a/hosts/lyes-pc/default.nix b/hosts/lyes-pc/default.nix index a68a108..92570b1 100644 --- a/hosts/lyes-pc/default.nix +++ b/hosts/lyes-pc/default.nix @@ -12,7 +12,7 @@ }; # Kernel - boot.kernelPackages = pkgs.linuxPackages_6_13; + boot.kernelPackages = pkgs.linuxPackages_6_14; # Boot boot.loader.systemd-boot.enable = true; @@ -85,7 +85,9 @@ # }; # Disabling failing test - # nixpkgs.overlays = [ (final: prev: { + nixpkgs.overlays = [ (final: prev: { + upower = prev.upower.overrideAttrs (_: { doCheck = false; }); + gxml = prev.gxml.overrideAttrs (_: { doCheck = false; }); # # orc = prev.orc.overrideAttrs (_: { doCheck = false; }); # # gsl = prev.gsl.overrideAttrs (_: { doCheck = false; }); # fprintd = prev.fprintd.overrideAttrs (super: { @@ -106,7 +108,7 @@ # }); # # # haskellPackages.crypton = pkgs.haskell.lib.overrideCabal prev.crypton (_: { doCheck = false; }); # # # haskellPackages.cryptonite = pkgs.haskell.lib.overrideCabal prev.cryptonite (_: { doCheck = false; }); - # }) ]; + }) ]; # nixpkgs.config.packageOverrides = pkgs: { # haskellPackages = pkgs.haskellPackages.override { diff --git a/modules/gnome/packages.nix b/modules/gnome/packages.nix index fb8afa4..bf5202a 100644 --- a/modules/gnome/packages.nix +++ b/modules/gnome/packages.nix @@ -43,8 +43,6 @@ resources file-roller baobab - planify - dosage-tracker # Customization gnome-tweaks diff --git a/users/lyes/desktop/packages.nix b/users/lyes/desktop/packages.nix index ad552ce..b32eb63 100644 --- a/users/lyes/desktop/packages.nix +++ b/users/lyes/desktop/packages.nix @@ -69,7 +69,7 @@ in { parsec-bin unstable.suyu # suyu - factorio + # factorio # Reading # calibre @@ -83,6 +83,10 @@ in { zotero folio + # Planification + # planify + dosage-tracker + # Programming git git-lfs @@ -120,7 +124,7 @@ in { # Proton protonmail-bridge-gui protonmail-desktop - stable.protonvpn-gui + protonvpn-gui proton-pass # Multimedia @@ -129,9 +133,9 @@ in { libopus ]; - system.extraDependencies = with pkgs; [ - factorio.src - ]; + # system.extraDependencies = with pkgs; [ + # factorio.src + # ]; # Flatpaks services.flatpak = lib.mkIf (config?services.flatpak.packages) {