From 64a73551015ac218dc741245697ae25b45df1393 Mon Sep 17 00:00:00 2001
From: Felix Rath <felixm.rath@gmail.com>
Date: Tue, 6 Dec 2022 02:05:54 +0100
Subject: [PATCH] all: upgrade to new nixos-22.11 :tada:

---
 cachix.nix                  |  2 +-
 cachix/nix-community.nix    |  6 +++---
 flake.lock                  | 34 +++++++++++++++++++++++++---------
 flake.nix                   |  4 ++--
 home-modules/doom-emacs.nix |  4 ++--
 home.nix                    |  4 +++-
 system.nix                  | 17 ++++++++++-------
 7 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/cachix.nix b/cachix.nix
index 88b2f08..ecd2d39 100644
--- a/cachix.nix
+++ b/cachix.nix
@@ -9,5 +9,5 @@ let
   imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));
 in {
   inherit imports;
-  nix.binaryCaches = ["https://cache.nixos.org/"];
+  nix.settings.substituters = ["https://cache.nixos.org/"];
 }
diff --git a/cachix/nix-community.nix b/cachix/nix-community.nix
index 427a518..71099c2 100644
--- a/cachix/nix-community.nix
+++ b/cachix/nix-community.nix
@@ -1,10 +1,10 @@
 
 {
-  nix = {
-    binaryCaches = [
+  nix.settings = {
+    substituters = [
       "https://nix-community.cachix.org"
     ];
-    binaryCachePublicKeys = [
+    trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     ];
   };
diff --git a/flake.lock b/flake.lock
index d544221..6c242da 100644
--- a/flake.lock
+++ b/flake.lock
@@ -70,19 +70,20 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "utils": "utils"
       },
       "locked": {
-        "lastModified": 1667907331,
-        "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=",
+        "lastModified": 1670156115,
+        "narHash": "sha256-L2FKLedprp3AkQ+GS+2Br7CYWeCmLCjt3zUd87p0lNQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6639e3a837fc5deb6f99554072789724997bc8e5",
+        "rev": "e704ef9ec7a8ccf8711bb11ff68da06f1917a26d",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-22.05",
+        "ref": "release-22.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -151,16 +152,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1669196918,
-        "narHash": "sha256-st3uS3X/qIdyleFN3HUmDJkqIhHfkgxuDK3J8XyQwls=",
+        "lastModified": 1670009809,
+        "narHash": "sha256-yt/dQ32Vz4WenDLu4XeHbnXFxiHbTcnU0WwiLW5Ce6c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f10cdcf31dd2a436edbf7f0ad82c44b911804bc8",
+        "rev": "660e7737851506374da39c0fa550c202c824a17c",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-22.05",
+        "ref": "nixos-22.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -176,6 +177,21 @@
         "nixpkgs-pkgs-unstable": "nixpkgs-pkgs-unstable",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
+    },
+    "utils": {
+      "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 4977838..a1f8663 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "Full Flake Panic!";
 
   inputs = {
-    nixpkgs = { url = "github:nixos/nixpkgs/nixos-22.05"; };
+    nixpkgs = { url = "github:nixos/nixpkgs/nixos-22.11"; };
     nixpkgs-unstable = { url = "github:nixos/nixpkgs/nixos-unstable"; };
     nixpkgs-pkgs-unstable = { url = "github:nixos/nixpkgs/nixpkgs-unstable"; };
     nixpkgs-master = { url = "github:nixos/nixpkgs/master"; };
@@ -11,7 +11,7 @@
     emacs-overlay = { url = "github:nix-community/emacs-overlay"; };
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-22.05";
+      url = "github:nix-community/home-manager/release-22.11";
       inputs = { nixpkgs.follows = "nixpkgs"; };
     };
 
diff --git a/home-modules/doom-emacs.nix b/home-modules/doom-emacs.nix
index a2e5ed2..9d2149e 100644
--- a/home-modules/doom-emacs.nix
+++ b/home-modules/doom-emacs.nix
@@ -30,8 +30,8 @@ let
       # python
       python-language-server
       black
-      python38Packages.pyflakes
-      python38Packages.isort
+      python3Packages.pyflakes
+      python3Packages.isort
 
       # nix
       nixfmt
diff --git a/home.nix b/home.nix
index 3480337..b4e8cad 100644
--- a/home.nix
+++ b/home.nix
@@ -35,6 +35,8 @@ in
   programs.nix-index.enable = true;
 
   home = {
+    stateVersion = "22.05";
+
     packages =
       # bound packages
       [
@@ -49,7 +51,7 @@ in
         ripgrep
         fd
         bat
-        python39
+        python3
         element-desktop # temp stable, until bug resolved
         file
         procs # TODO move config from `~/.config/procs/config.toml` into this repo # stable, because fish completion on unstable is broken
diff --git a/system.nix b/system.nix
index 14c2d3e..29075c0 100644
--- a/system.nix
+++ b/system.nix
@@ -11,7 +11,16 @@
     extraOptions = ''
       experimental-features = nix-command flakes ca-derivations
     '';
-    trustedUsers = [ "felix" ];
+
+    settings = {
+      trusted-users = [ "felix" ];
+
+      # add paths to the nix sandbox
+      extra-sandbox-paths = [
+        # ccache needs to be available in the sandbox
+        config.programs.ccache.cacheDir
+      ];
+    };
   };
 
   imports = [ # Include the results of the hardware scan.
@@ -214,12 +223,6 @@
     ];
   };
 
-  # add paths to the nix sandbox
-  nix.sandboxPaths = [
-    # ccache needs to be available in the sandbox
-    config.programs.ccache.cacheDir
-  ];
-
   # List services that you want to enable:
 
   # Enable the OpenSSH daemon.