nix: update inputs

diff --git a/flake.lock b/flake.lock
index f86cffc864dede31fcdf4edb8ab048254af05fc8..ec699130ef8428627c860435024350dbb6c09f2d 100644 (file)
--- a/flake.lock
+++ b/flake.lock
@@ -65,22 +65,6 @@
         "type": "github"
       }
     },
-    "emacs-overlay_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1645469527,
-        "narHash": "sha256-4/IIqR8YaXsZrjujgg4Uwq+5fR3IfgfcUFL6fZSWZRc=",
-        "owner": "nix-community",
-        "repo": "emacs-overlay",
-        "rev": "cf0c80474bcb44955ee0bb999526de4b2b1fed13",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "emacs-overlay",
-        "type": "github"
-      }
-    },
     "emacs-so-long": {
       "flake": false,
       "locked": {
@@ -176,24 +160,12 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "locked": {
-        "lastModified": 1644229661,
-        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "julm-nix",
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1639329010,
@@ -224,11 +196,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1645473714,
-        "narHash": "sha256-Abbd3FHVGJsGKdCLorn5cqJY6oXaGkHvCZXbL+qyO70=",
+        "lastModified": 1645673937,
+        "narHash": "sha256-GsuQdhO/ImvqsL5aFi3f/XV7n79s4DXCiK1lsQMtAlY=",
         "ref": "main",
-        "rev": "e1ea14e31e55cbce9021977e408689dc23cfe0da",
-        "revCount": 402,
+        "rev": "5814f328f41d08fa566c4f556c4fb72617dd8609",
+        "revCount": 404,
         "type": "git",
         "url": "file:///home/julm/work/sourcephile/nix/julm-nix"
       },
@@ -242,15 +214,24 @@
       "inputs": {
         "doom-emacs": "doom-emacs_2",
         "doom-snippets": "doom-snippets",
-        "emacs-overlay": "emacs-overlay_2",
+        "emacs-overlay": [
+          "julm-nix",
+          "emacs-overlay"
+        ],
         "emacs-so-long": "emacs-so-long",
         "evil-markdown": "evil-markdown",
         "evil-org-mode": "evil-org-mode",
         "evil-quick-diff": "evil-quick-diff",
         "explain-pause-mode": "explain-pause-mode",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": [
+          "julm-nix",
+          "flake-utils"
+        ],
         "nix-straight": "nix-straight",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": [
+          "julm-nix",
+          "nixpkgs"
+        ],
         "nose": "nose",
         "ob-racket": "ob-racket",
         "org": "org",
@@ -293,46 +274,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1643221379,
-        "narHash": "sha256-ctMJZA++yYzbRCEHFb5ydukKdPgaGY0vCZSlbkFCW6o=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ad79594d1e2fea66bf7d5faeec6ef35319596031",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1645013224,
-        "narHash": "sha256-b7OEC8vwzJv3rsz9pwnTX2LQDkeOWz2DbKypkVvNHXc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "b66b39216b1fef2d8c33cc7a5c72d8da80b79970",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixpkgs-unstable",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1643221379,
-        "narHash": "sha256-ctMJZA++yYzbRCEHFb5ydukKdPgaGY0vCZSlbkFCW6o=",
+        "lastModified": 1645334861,
+        "narHash": "sha256-We9ECiMglthzbZ5S6Myqqf+RHzBFZPoM2qL5/jDkUjs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ad79594d1e2fea66bf7d5faeec6ef35319596031",
+        "rev": "d5f237872975e6fb6f76eef1368b5634ffcd266f",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ad79594d1e2fea66bf7d5faeec6ef35319596031",
+        "rev": "d5f237872975e6fb6f76eef1368b5634ffcd266f",
         "type": "github"
       }
     },
@@ -480,7 +432,7 @@
           "julm-nix",
           "nix-doom-emacs"
         ],
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs",
         "pass": "pass",
         "secrets": "secrets",
         "shell": "shell"

diff --git a/flake.nix b/flake.nix
index 4d755ff207e3f418a57169aaf278dca32beedbc3..c9d90d046190e22cb0bcb60501697164842d263d 100644 (file)
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
 # Pin down nixpkgs from github, instead of using global, system or user registries.
-inputs.nixpkgs.url = "github:NixOS/nixpkgs/ad79594d1e2fea66bf7d5faeec6ef35319596031";
+inputs.nixpkgs.url = "github:NixOS/nixpkgs/d5f237872975e6fb6f76eef1368b5634ffcd266f";
 #inputs.nixpkgs.url = "flake:nixpkgs";
 inputs.flake-utils.url = "github:numtide/flake-utils";
 inputs.home-manager.follows = "julm-nix/home-manager";

diff --git a/hosts/carotte/users.nix b/hosts/carotte/users.nix
index 9446bd685900b495557c1a7f5652226c5c3c4aed..d97377c39b9b56301bef2957a256531f1eec4070 100644 (file)
--- a/hosts/carotte/users.nix
+++ b/hosts/carotte/users.nix
@@ -8,7 +8,7 @@ imports = [
   ../../members/julm.nix
 ];
 
-nix.trustedUsers = [
+nix.settings.trusted-users = [
   users."julm".name
 ];
 

diff --git a/hosts/losurdo/nginx/sourcephile.fr/nix-serve.nix b/hosts/losurdo/nginx/sourcephile.fr/nix-serve.nix
index cad6ef350c1a25cc26d399f4ac116b5061c9a795..3b22f74c4ebf2a44576f06c573d870d5075f1837 100644 (file)
--- a/hosts/losurdo/nginx/sourcephile.fr/nix-serve.nix
+++ b/hosts/losurdo/nginx/sourcephile.fr/nix-serve.nix
@@ -8,7 +8,7 @@ let
   srv = "nix-serve";
 in
 {
-nix.trustedUsers = [ users."nix-serve".name ];
+nix.settings.trusted-users = [ users."nix-serve".name ];
 users.users."nix-serve" = {
   isSystemUser = true;
   group = groups."nix-serve".name;
@@ -27,7 +27,7 @@ services.nix-serve = {
   secretKeyFile = gnupg.secrets."nix/binary-cache-key/1".path;
   bindAddress = "127.0.0.1";
 };
-nix.allowedUsers = [ users."nix-ssh".name ];
+nix.settings.allowed-users = [ users."nix-ssh".name ];
 nix.sshServe = {
   enable = true;
   keys = map lib.readFile [

diff --git a/hosts/losurdo/sourcehut.nix b/hosts/losurdo/sourcehut.nix
index 6a51ce68ccc5b8f0dd5aca9ac28d6dfb7be3851d..435ae1dc5de0e3f0f2a5bf3354f24087cc3ec70c 100644 (file)
--- a/hosts/losurdo/sourcehut.nix
+++ b/hosts/losurdo/sourcehut.nix
@@ -72,7 +72,7 @@ services.sourcehut = {
         };
 
         security.sudo.wheelNeedsPassword = false;
-        nix.trustedUsers = [ "root" "build" ];
+        nix.settings.trusted-users = [ "root" "build" ];
         documentation.nixos.enable = false;
 
         # builds.sr.ht-image-specific network settings

diff --git a/hosts/losurdo/users.nix b/hosts/losurdo/users.nix
index 3745535fd095894180f7156f688472b56f92c6a1..174661d01dce8df659d24c24cb7d3aa47a639ee6 100644 (file)
--- a/hosts/losurdo/users.nix
+++ b/hosts/losurdo/users.nix
@@ -9,7 +9,7 @@ imports = [
 ];
 
 nixpkgs.config.allowUnfree = true; # for hplip
-nix.trustedUsers = [
+nix.settings.trusted-users = [
   users."julm".name
 ];
 

diff --git a/hosts/mermet/sourcehut/builds/nixos-unstable.nix b/hosts/mermet/sourcehut/builds/nixos-unstable.nix
index 446885f81a80a49859d93c69740a9860ce46d871..441579605fbb97a3e643a87b79b5747920a90eb9 100644 (file)
--- a/hosts/mermet/sourcehut/builds/nixos-unstable.nix
+++ b/hosts/mermet/sourcehut/builds/nixos-unstable.nix
@@ -22,7 +22,7 @@ let
     };
 
     security.sudo.wheelNeedsPassword = false;
-    nix.trustedUsers = [ "root" "build" ];
+    nix.settings.trusted-users = [ "root" "build" ];
     documentation.nixos.enable = false;
 
     # builds.sr.ht-image-specific network settings

diff --git a/hosts/mermet/users.nix b/hosts/mermet/users.nix
index dd017e252ebac78855424c415ce8d52f616176e1..15e0626f76819d479776ab58beec77fda476a019 100644 (file)
--- a/hosts/mermet/users.nix
+++ b/hosts/mermet/users.nix
@@ -8,7 +8,7 @@ imports = [
   ../../members/julm.nix
 ];
 
-nix.trustedUsers = [
+nix.settings.trusted-users = [
   users."julm".name
 ];
 

diff --git a/nixos/defaults.nix b/nixos/defaults.nix
index fff919e2e0564bd2e253d323b9bd2898f0694590..bfa23fecaa365f0aba4b4577ae216513e6f3b171 100644 (file)
--- a/nixos/defaults.nix
+++ b/nixos/defaults.nix
@@ -13,7 +13,7 @@ nix = {
   #binaryCaches = lib.mkForce [];
   extraOptions = ''
   '';
-  autoOptimiseStore = lib.mkDefault true;
+  settings.auto-optimise-store = lib.mkDefault true;
   # Use gc.automatic to keep disk space under control.
   gc.automatic = lib.mkDefault true;
   gc.dates = lib.mkDefault "weekly";

diff --git a/nixos/profiles/hardware/apu2e4.nix b/nixos/profiles/hardware/apu2e4.nix
index 63d0f0bf21e8245027ec81bb40459a66ad592701..0de3bf918692b3d0d7fe5576ab3e3686ece0936f 100644 (file)
--- a/nixos/profiles/hardware/apu2e4.nix
+++ b/nixos/profiles/hardware/apu2e4.nix
@@ -3,7 +3,7 @@
 hardware.cpu.amd.updateMicrocode = true;
 
 # Too CPU hungry for this hardware, for too little Mio saved
-nix.autoOptimiseStore = false;
+nix.settings.auto-optimise-store = false;
 
 powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
 

diff --git a/nixos/profiles/hardware/cubieboard2.nix b/nixos/profiles/hardware/cubieboard2.nix
index 755b634a24b330147be79e90f99ead834aaf04b5..d8c0f803ee23eb006e7c68e83b30b5ad79aa9903 100644 (file)
--- a/nixos/profiles/hardware/cubieboard2.nix
+++ b/nixos/profiles/hardware/cubieboard2.nix
@@ -5,7 +5,7 @@ imports = [
 ];
 
 # Too CPU hungry for this hardware, for too little Mio saved
-nix.autoOptimiseStore = false;
+nix.settings.auto-optimise-store = false;
 
 powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
 

diff --git a/nixos/profiles/hardware/dl10j.nix b/nixos/profiles/hardware/dl10j.nix
index 9e9af14ea73797df6b16709a207a32391677403a..73dd09c72df4136e95803ecdc314534acee8c6d6 100644 (file)
--- a/nixos/profiles/hardware/dl10j.nix
+++ b/nixos/profiles/hardware/dl10j.nix
@@ -11,7 +11,7 @@ hardware.opengl = {
 };
 
 # Too CPU hungry for this hardware, for too little Mio saved
-nix.autoOptimiseStore = false;
+nix.settings.auto-optimise-store = false;
 
 powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
 

diff --git a/nixpkgs/patches.nix b/nixpkgs/patches.nix
index fe11911f2a4e8354961fd0084ea5dde8a0fccfc2..945a5a2aa109e4b63399283c129061011f8a3fd3 100644 (file)
--- a/nixpkgs/patches.nix
+++ b/nixpkgs/patches.nix
@@ -33,9 +33,4 @@
   url = "https://github.com/NixOS/nixpkgs/pull/147559.diff";
   sha256 = "sha256-QwA0ivFsGCB9vy93kNud4ZeiSdDoBk+9s4U1V2H3JH4=";
 }
-{
-  meta.description = "sourcehut";
-  url = "https://github.com/NixOS/nixpkgs/pull/159438.diff";
-  sha256 = "sha256-QsqAEUqiF0hZ4WdxQfQWV6JjtjR8i1f2XX7cOHu/2jc=";
-}
 ]