nix: update inputs

diff --git a/flake.lock b/flake.lock
index 0d25d31031fcabde6e9bda5ce40a74b5d7a1306e..5da9c058777f67e968188b73448b14d766ece141 100644 (file)
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "doom-emacs": {
       "flake": false,
       "locked": {
-        "lastModified": 1643252771,
-        "narHash": "sha256-T1H4uXm0dwDBxa+3aYE+xl/6hiW4VXX0ax6DEGvy25Y=",
+        "lastModified": 1647913749,
+        "narHash": "sha256-JlPq+PAJW00rDFOSdLYCdd+nnQzNkjztK2zXAS2S2zY=",
         "owner": "hlissner",
         "repo": "doom-emacs",
-        "rev": "ff4609835a4c47312b3d685e09330034d6f4c8a4",
+        "rev": "aed2972d7400834210759727117c50de34826db9",
         "type": "github"
       },
       "original": {
@@ -51,11 +51,11 @@
     },
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1643252190,
-        "narHash": "sha256-V774e49jTUgdsHRfkPDNsH4BHT4hxbhCYkayLEwOHdM=",
+        "lastModified": 1648290468,
+        "narHash": "sha256-Mibv/7lr2QxNwydU0WP1VDC0GMu6Xn0E5Yez73xDjQE=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "8e5d094f0a82b37c24e77577c46f1787887f5af8",
+        "rev": "adf05412cca0a492c2465ac5de719954834c449e",
         "type": "github"
       },
       "original": {
@@ -147,11 +147,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1642700792,
-        "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
+        "lastModified": 1644229661,
+        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
+        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
         "type": "github"
       },
       "original": {
@@ -167,17 +167,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1639329010,
-        "narHash": "sha256-k9OXwR06419/s0FAnRalUs24+8EI6GepGaatAXhBc+0=",
+        "lastModified": 1648283590,
+        "narHash": "sha256-OjoAiY2XWr2ah73rY+kvEYLF+q40S/X61tUC0JPuCKw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3d46c011d2cc2c9ca24d9b803e9daf156d9429ea",
+        "rev": "8afee75d0d1cb054cfeddfdc9f7193adc7741c95",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3d46c011d2cc2c9ca24d9b803e9daf156d9429ea",
         "type": "github"
       }
     },
@@ -242,17 +241,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1643221379,
-        "narHash": "sha256-ctMJZA++yYzbRCEHFb5ydukKdPgaGY0vCZSlbkFCW6o=",
+        "lastModified": 1646497237,
+        "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ad79594d1e2fea66bf7d5faeec6ef35319596031",
+        "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ad79594d1e2fea66bf7d5faeec6ef35319596031",
+        "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
         "type": "github"
       }
     },

diff --git a/flake.nix b/flake.nix
index dfbff20515c55ccad219f5aa11ab0984a846ba5d..4204cf4f283526d4e687705259b4f7351431d6d3 100644 (file)
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
-inputs.nixpkgs.url = "github:NixOS/nixpkgs/ad79594d1e2fea66bf7d5faeec6ef35319596031";
+inputs.nixpkgs.url = "github:NixOS/nixpkgs/062a0c5437b68f950b081bbfc8a699d57a4ee026";
 inputs.flake-utils.url = "github:numtide/flake-utils";
-inputs.home-manager.url = "github:nix-community/home-manager/3d46c011d2cc2c9ca24d9b803e9daf156d9429ea";
+inputs.home-manager.url = "github:nix-community/home-manager";
 inputs.home-manager.inputs.nixpkgs.follows = "nixpkgs";
 inputs.doom-emacs.url = "github:hlissner/doom-emacs";
 inputs.doom-emacs.flake = false;

diff --git a/hosts/oignon.nix b/hosts/oignon.nix
index cd8f45f9ac787209c15d9b203db92105da6cdd3d..2d4942b8b6b8c0ad679b161f238c7895e7d3865a 100644 (file)
--- a/hosts/oignon.nix
+++ b/hosts/oignon.nix
@@ -54,20 +54,22 @@ nix = {
   extraOptions = ''
     secret-key-files = ${private}/${hostName}/nix/binary-cache/priv.pem
   '';
-  trustedUsers = [ config.users.users."julm".name ];
-  binaryCaches = [
-    #"http://nix-localcache.losurdo.wg"
-    "ssh://nix-ssh@losurdo.wg?priority=30"
-  ];
-  binaryCachePublicKeys = map lib.readFile [
-    ../private/shared/nix/losurdo.pub
-  ];
+  settings = {
+    trusted-users = [ config.users.users."julm".name ];
+    substituters = [
+      #"http://nix-localcache.losurdo.wg"
+      "ssh://nix-ssh@losurdo.wg?priority=30"
+    ];
+    trusted-public-keys = map lib.readFile [
+      ../private/shared/nix/losurdo.pub
+    ];
+  };
   nixPath = lib.mkForce [ "nixpkgs=${inputs.nixpkgs}" ];
 };
 #environment.etc."nixpkgs".source = pkgs.path;
 #environment.etc."nixpkgs-overlays".source = inputs.self + "/nixpkgs";
 
-nix.allowedUsers = [ config.users.users."nix-ssh".name ];
+nix.settings.allowed-users = [ config.users.users."nix-ssh".name ];
 nix.sshServe = {
   enable = true;
   keys = map lib.readFile [
@@ -111,12 +113,12 @@ fileSystems =
       ];
   in {
   "/mnt/losurdo" = {
-    device = "${pkgs.sshfsFuse}/bin/sshfs#julm@losurdo.wg:/";
+    device = "${pkgs.sshfs-fuse}/bin/sshfs#julm@losurdo.wg:/";
     fsType = "fuse";
     inherit options;
   };
   "/mnt/mermet" = {
-    device = "${pkgs.sshfsFuse}/bin/sshfs#julm@mermet.wg:/";
+    device = "${pkgs.sshfs-fuse}/bin/sshfs#julm@mermet.wg:/";
     fsType = "fuse";
     inherit options;
   };

diff --git a/hosts/patate.nix b/hosts/patate.nix
index 99a69791d5f4abee3592eade23565eadc82a293e..507cb56fcc24d142f679ece08c00872ab3abd8f6 100644 (file)
--- a/hosts/patate.nix
+++ b/hosts/patate.nix
@@ -42,15 +42,17 @@ users.users.sevy = {
 };
 
 nix = {
-  trustedUsers = [ config.users.users."sevy".name ];
-  binaryCaches = [
-    #"ssh://nix-ssh@losurdo.wg?priority=30"
-    "ssh://nix-ssh@oignon.wg?priority=10"
-  ];
-  binaryCachePublicKeys = map lib.readFile [
-    ../private/shared/nix/losurdo.pub
-    ../private/shared/nix/oignon.pub
-  ];
+  settings = {
+    trusted-users = [ config.users.users."sevy".name ];
+    substituters = [
+      #"ssh://nix-ssh@losurdo.wg?priority=30"
+      "ssh://nix-ssh@oignon.wg?priority=10"
+    ];
+    trusted-public-keys = map lib.readFile [
+      ../private/shared/nix/losurdo.pub
+      ../private/shared/nix/oignon.pub
+    ];
+  };
 };
 
 environment.systemPackages = [

diff --git a/nixos/profiles/system.nix b/nixos/profiles/system.nix
index bd867833ea664f9e3283d4e5f3ecabdf42961d67..0d3838c9df098719a49edefdcb78348e51e69de1 100644 (file)
--- a/nixos/profiles/system.nix
+++ b/nixos/profiles/system.nix
@@ -17,7 +17,7 @@ environment.variables = {
   SYSTEMD_LESS = "FKMRX";
 };
 nix = {
-  autoOptimiseStore = lib.mkDefault true;
+  settings.auto-optimise-store = lib.mkDefault true;
   gc.automatic = lib.mkDefault true;
   gc.dates = lib.mkDefault "weekly";
   gc.options = lib.mkDefault "--delete-older-than 7d";