From e010805a863d3a82e30750f2f2e6f7270a2b1116 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Tue, 25 Aug 2020 13:35:54 +0300
Subject: [PATCH] Update nixpkgs

---
 flake.lock                       | 12 ++++++------
 flake.nix                        |  2 +-
 modules/applications/weechat.nix |  4 ++--
 modules/nextcloud.nix            |  1 -
 modules/packages.nix             |  4 ++--
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 54b125d..e1bc294 100644
--- a/flake.lock
+++ b/flake.lock
@@ -229,17 +229,17 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1596571799,
-        "narHash": "sha256-NlJ8rSNODhje8t4RVS+Jos+3rpohguqZWmP93niWKFc=",
+        "lastModified": 1597943282,
+        "narHash": "sha256-G/VQBlqO7YeFOSvn29RqdvABZxmQBtiRYVA6kjqWZ6o=",
         "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c253216595572930316f2be737dc288a1da22558",
+        "repo": "nixpkgs-channels",
+        "rev": "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c253216595572930316f2be737dc288a1da22558",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs-channels",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index a9b959b..9443ae6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
     "A collection of crap, hacks and copy-paste to make my localhosts boot";
 
   inputs = {
-    nixpkgs.url = github:nixos/nixpkgs/c253216595572930316f2be737dc288a1da22558;
+    nixpkgs.url = github:nixos/nixpkgs-channels/nixos-unstable;
     nixpkgs-mesa.url = github:nixos/nixpkgs-channels/bdac777becdbb8780c35be4f552c9d4518fe0bdb;
     lambda-launcher.url = github:balsoft/lambda-launcher;
     NUR = {
diff --git a/modules/applications/weechat.nix b/modules/applications/weechat.nix
index d42112e..5f2c387 100644
--- a/modules/applications/weechat.nix
+++ b/modules/applications/weechat.nix
@@ -2,8 +2,8 @@
 let
   weechat-matrix = pkgs.weechatScripts.weechat-matrix.overrideAttrs (_: {
     src = pkgs.fetchzip {
-      url = "https://github.com/myii/weechat-matrix/archive/feat/enable-replies.tar.gz";
-      sha256 = "sha256-KeTfSdwVosouJwz0aZARKdxNERmFWl96Dl1ps0kbBy4=";
+      url = "https://github.com/poljar/weechat-matrix/archive/master.tar.gz";
+      sha256 = "sha256-zYq68dl9nlHflsVrbg32KNNa/P3otEfvZrUTuD3ahT0=";
     };
   });
   weechat = pkgs.weechat.override {
diff --git a/modules/nextcloud.nix b/modules/nextcloud.nix
index e75cdee..ff7ef50 100644
--- a/modules/nextcloud.nix
+++ b/modules/nextcloud.nix
@@ -2,7 +2,6 @@
 {
   services.nextcloud = {
     enable = true;
-    nginx.enable = true;
     hostName = "nextcloud.balsoft.ru";
     config.adminpassFile = "/home/balsoft/nextcloud-admin";
     package = pkgs.nextcloud19;
diff --git a/modules/packages.nix b/modules/packages.nix
index faa7dea..48eae43 100644
--- a/modules/packages.nix
+++ b/modules/packages.nix
@@ -21,8 +21,6 @@ in {
           nurpkgs = pkgs;
         }).repos;
 
-        inherit (inputs.nixpkgs-mesa.legacyPackages.x86_64-linux) sway mesa_drivers;
-
         inherit (nur.balsoft.pkgs) termNote nix-patch;
 
         # inherit (old) mautrix-telegram;
@@ -34,6 +32,8 @@ in {
         yt-utilities = inputs.yt-utilities.defaultPackage.x86_64-linux;
 
         nerdfonts = nur.balsoft.pkgs.roboto-mono-nerd;
+
+        inherit (inputs.nixpkgs-mesa.legacyPackages.x86_64-linux) sway mesa_drivers;
       })
   ];
   nixpkgs.config = {