Update nixpkgs

.gitea/workflows/check-flake.yaml

@@ -15,10 +15,5 @@ jobs:
         with:
           fetch-depth: 0
 
-      - run: |
-          pwd
-          ls -lah .
-          whoami
-
       - name: Check Flake
         run: nix flake check --show-trace

Makefile

@@ -1,15 +1,22 @@
 # Lockfile utils
+.PHONY: update-lockfile
 update-lockfile:
 	nix flake update --commit-lock-file
+
+.PHONY: update-lockfile-without-commit
 update-lockfile-without-commit:
 	nix flake update
 
 # Agenix utils
+.PHONY: edit-secret
 edit-secret:
 	cd secrets && agenix -e $(filter-out $@,$(MAKECMDGOALS))
+
+.PHONY: rekey-secrets
 rekey-secrets:
 	cd secrets && agenix -r
 
 # NixOS utils
+.PHONY: clean-old-nixos-profiles
 clean-old-nixos-profiles:
 	doas nix-collect-garbage -d

common/flakes.nix

@@ -10,7 +10,6 @@ in
 
   config = mkIf cfg.enable {
     nix = {
-      package = pkgs.nixFlakes;
       extraOptions = ''
         experimental-features = nix-command flakes
       '';

common/pc/default.nix

@@ -57,7 +57,6 @@ in
 
       # For Nix IDE
       nixpkgs-fmt
-      rnix-lsp
     ];
 
     # Networking

flake.lock

@@ -10,11 +10,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1703433843,
-        "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=",
+        "lastModified": 1707830867,
+        "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "417caa847f9383e111d1397039c9d4337d024bf0",
+        "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6",
         "type": "github"
       },
       "original": {
@@ -96,11 +96,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1704875591,
-        "narHash": "sha256-eWRLbqRcrILgztU/m/k7CYLzETKNbv0OsT2GjkaNm8A=",
+        "lastModified": 1708091384,
+        "narHash": "sha256-dTGGw2y8wvfjr+J9CjQbfdulOq72hUG17HXVNxpH1yE=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "1776009f1f3fb2b5d236b84d9815f2edee463a9b",
+        "rev": "0a0187794ac7f7a1e62cda3dabf8dc041f868790",
         "type": "github"
       },
       "original": {
@@ -109,18 +109,6 @@
         "type": "github"
       }
     },
-    "fix-nvidia-x11-latest": {
-      "flake": false,
-      "locked": {
-        "narHash": "sha256-fLopADeWElHn3zRLJxyRZf2pjXsPQL4K1NaZ9Dmaj3E=",
-        "type": "file",
-        "url": "https://github.com/NixOS/nixpkgs/pull/286084.diff"
-      },
-      "original": {
-        "type": "file",
-        "url": "https://github.com/NixOS/nixpkgs/pull/286084.diff"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -142,11 +130,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -183,11 +171,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1707016097,
-        "narHash": "sha256-V4lHr6hFQ3rK650dh64Xffxsf4kse9vUYWsM+ldjkco=",
+        "lastModified": 1710120787,
+        "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "3e3dad2808379c522138e2e8b0eb73500721a237",
+        "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07",
         "type": "github"
       },
       "original": {
@@ -198,11 +186,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1706826059,
-        "narHash": "sha256-N69Oab+cbt3flLvYv8fYnEHlBsWwdKciNZHUbynVEOA=",
+        "lastModified": 1710420202,
+        "narHash": "sha256-MvFKESbq4rUWuaf2RKPNYENaSZEw/jaCLo2gU6oREcM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "25e3d4c0d3591c99929b1ec07883177f6ea70c9d",
+        "rev": "878ef7d9721bee9f81f8a80819f9211ad1f993da",
         "type": "github"
       },
       "original": {
@@ -273,7 +261,6 @@
         "agenix": "agenix",
         "dailybuild_modules": "dailybuild_modules",
         "deploy-rs": "deploy-rs",
-        "fix-nvidia-x11-latest": "fix-nvidia-x11-latest",
         "flake-utils": "flake-utils",
         "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs",

flake.nix

@@ -32,10 +32,6 @@
     # prebuilt nix-index database
     nix-index-database.url = "github:Mic92/nix-index-database";
     nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
-
-    # https://github.com/NixOS/nixpkgs/issues/286313
-    fix-nvidia-x11-latest.url = "https://github.com/NixOS/nixpkgs/pull/286084.diff";
-    fix-nvidia-x11-latest.flake = false;
   };
 
   outputs = { self, nixpkgs, ... }@inputs:
@@ -83,7 +79,7 @@
                 src = nixpkgs;
                 patches = [
                   ./patches/gamepadui.patch
-                  inputs.fix-nvidia-x11-latest
+                  ./patches/nixpkgs-pull-296470.patch
                 ];
               };
               patchedNixpkgs = nixpkgs.lib.fix (self: (import "${patchedNixpkgsSrc}/flake.nix").outputs { self = nixpkgs; });

patches/nixpkgs-pull-296470.patch

@@ -0,0 +1,53 @@
+diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix
+index 104b7952f2be22..b1e2ce570a2d2d 100644
+--- a/pkgs/os-specific/linux/xone/default.nix
++++ b/pkgs/os-specific/linux/xone/default.nix
+@@ -1,27 +1,18 @@
+ { stdenv, lib, fetchFromGitHub, kernel, fetchurl, fetchpatch }:
+ 
+-stdenv.mkDerivation rec {
++stdenv.mkDerivation (finalAttrs: {
+   pname = "xone";
+-  version = "0.3";
++  version = "0.3-unstable-2024-03-16";
+ 
+   src = fetchFromGitHub {
+     owner = "medusalix";
+-    repo = pname;
+-    rev = "refs/tags/v${version}";
+-    sha256 = "sha256-h+j4xCV9R6hp9trsv1NByh9m0UBafOz42ZuYUjclILE=";
++    repo = "xone";
++    rev = "948d2302acdd6333295eaba4da06d96677290ad3";
++    hash = "sha256-srAEw1ai5KT0rmVUL3Dut9R2mNb00AAZVCcINikh2sM=";
+   };
+ 
+-  patches = [
+-    # Fix build on kernel 6.3
+-    (fetchpatch {
+-      name = "kernel-6.3.patch";
+-      url = "https://github.com/medusalix/xone/commit/bbf0dcc484c3f5611f4e375da43e0e0ef08f3d18.patch";
+-      hash = "sha256-A2OzRRk4XT++rS6k6EIyiPy/LJptvVRUxoP7CIGrPWU=";
+-    })
+-  ];
+-
+   setSourceRoot = ''
+-    export sourceRoot=$(pwd)/${src.name}
++    export sourceRoot=$(pwd)/${finalAttrs.src.name}
+   '';
+ 
+   nativeBuildInputs = kernel.moduleBuildDependencies;
+@@ -30,7 +21,7 @@ stdenv.mkDerivation rec {
+     "-C"
+     "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+     "M=$(sourceRoot)"
+-    "VERSION=${version}"
++    "VERSION=0.3-unstable-2024-03-16"
+   ];
+ 
+   buildFlags = [ "modules" ];
+@@ -45,4 +36,4 @@ stdenv.mkDerivation rec {
+     platforms = platforms.linux;
+   };
+ }
+-
++)