From c08b8bb0ac902c125d34c50c101f5ebb71ff129e Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Fri, 28 May 2021 14:46:46 +0200
Subject: [PATCH 1/3] flake.lock: Update

Flake input changes:

* Updated 'home-manager': 'github:nix-community/home-manager/90493027e33ba9eb3f50dc1da365d0e4ca31bf14' -> 'github:nix-community/home-manager/0e6c61a44092e98ba1d75b41f4f947843dc7814d'
* Updated 'nixpkgs-unstable': 'github:NixOS/nixpkgs/ea7d4aa9b8225abd6147339f0d56675d6f1f0fd1' -> 'github:NixOS/nixpkgs/5658fadedb748cb0bdbcb569a53bd6065a5704a9'
---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index e57a2ff..64338d6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1621794721,
-        "narHash": "sha256-JXfTSZUu9EVbT9D/MFsx0cXfa8bw1NFCzIxZ7gO73Uo=",
+        "lastModified": 1622145920,
+        "narHash": "sha256-/tt6IApLuVcGP5auy4zjLzfm5+MBHYLS3Nauvv2U2EQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "90493027e33ba9eb3f50dc1da365d0e4ca31bf14",
+        "rev": "0e6c61a44092e98ba1d75b41f4f947843dc7814d",
         "type": "github"
       },
       "original": {
@@ -55,11 +55,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1621840840,
-        "narHash": "sha256-o6h6+d5ZwrFmOTe+ma9s1Z9kyHsCW1C84IA8RZ9/fIU=",
+        "lastModified": 1622103435,
+        "narHash": "sha256-5i5mGg402AANnSRQmWVo7lqiyw3taoMwX26oslOD9c4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ea7d4aa9b8225abd6147339f0d56675d6f1f0fd1",
+        "rev": "5658fadedb748cb0bdbcb569a53bd6065a5704a9",
         "type": "github"
       },
       "original": {

From 3a125fde27480abf34699e1e2cb3a7d59f917b79 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Fri, 28 May 2021 14:48:00 +0200
Subject: [PATCH 2/3] base: return discord to standard channel

---
 base/gui-programs.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/base/gui-programs.nix b/base/gui-programs.nix
index 74132d1..38560a7 100644
--- a/base/gui-programs.nix
+++ b/base/gui-programs.nix
@@ -2,8 +2,7 @@
 {
   environment.systemPackages = with pkgs; [
     alacritty
-    # https://nixpk.gs/pr-tracker.html?pr=124336
-    unstable-small.discord
+    discord
     feh
     firefox
     element-desktop

From feebd0940e4d3cf311b259e0cab59a69917a5298 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Fri, 28 May 2021 14:48:19 +0200
Subject: [PATCH 3/3] boreal: remove nix sandbox workaround

---
 hosts/boreal/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/hosts/boreal/default.nix b/hosts/boreal/default.nix
index b481ec7..5930747 100644
--- a/hosts/boreal/default.nix
+++ b/hosts/boreal/default.nix
@@ -111,9 +111,6 @@ in
   };
   my.displayManager.sddm.enable = true;
 
-  # TODO: remove when https://nixpk.gs/pr-tracker.html?pr=124237 reaches unstable
-  nix.sandboxPaths = [ "/bin/sh=${pkgs.bash}/bin/sh" ];
-
   hardware.bluetooth = {
     enable = true;
     powerOnBoot = true;