Update nixpkgs: pin mesa to older version

flake.lock

@@ -88,11 +88,11 @@
     "materia-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1595824519,
+        "lastModified": 1596129804,
-        "narHash": "sha256-cvKm3XONZy062P7XZdPQO98t0qmL/buiFM/oekTrfJQ=",
+        "narHash": "sha256-Vtyja8A6SfeRA78XK1e89hwWYY0kQm1VkY7/EagDXl8=",
         "owner": "nana-4",
         "repo": "materia-theme",
-        "rev": "c6aa571a1ba279e48f3f52610c9c6bedc2c9a0f8",
+        "rev": "6f7e51a97fc7ff3ddbb7908cff505a8c1919b6a2",
         "type": "github"
       },
       "original": {
@@ -147,19 +147,35 @@
         "type": "indirect"
       }
     },
-    "nixpkgs-old": {
+    "nixpkgs-mesa": {
-      "flake": false,
       "locked": {
-        "lastModified": 1581379743,
+        "lastModified": 1593760204,
-        "narHash": "sha256-i1XCn9rKuLjvCdu2UeXKzGLF6IuQePQKFt4hEKRU5oc=",
+        "narHash": "sha256-M/c2DTP6EUnSgnBYyVScApeHv5I+NbN57nn+px4bEaI=",
         "owner": "nixos",
-        "repo": "nixpkgs",
+        "repo": "nixpkgs-channels",
-        "rev": "34c7eb7545d155cc5b6f499b23a7cb1c96ab4d59",
+        "rev": "bdac777becdbb8780c35be4f552c9d4518fe0bdb",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-19.03",
+        "repo": "nixpkgs-channels",
+        "rev": "bdac777becdbb8780c35be4f552c9d4518fe0bdb",
+        "type": "github"
+      }
+    },
+    "nixpkgs-old": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1592518222,
+        "narHash": "sha256-dkWpvJM3y7vXNu2FFrj4XHE3GoX0h+pIyc4gLQpQsmQ=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "289466dd6a11c65a7de4a954d6ebf66c1ad07652",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-19.09",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -213,11 +229,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1596043279,
+        "lastModified": 1596185210,
-        "narHash": "sha256-PgQAn4NUVLLO058jyl73stME492PBv6On6HR+SbmCJ4=",
+        "narHash": "sha256-Dj9rN3OxZ/j0XH00bwe/4teq9DN4Q0mynKm46BKulFM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9e453cc2b7d015ab7554be471f130825f2a44604",
+        "rev": "b0edcfd09bbf9e8571704cf5df8d68956c79af44",
         "type": "github"
       },
       "original": {
@@ -250,6 +266,7 @@
         "nix": "nix",
         "nixos-fhs-compat": "nixos-fhs-compat",
         "nixpkgs": "nixpkgs_4",
+        "nixpkgs-mesa": "nixpkgs-mesa",
         "nixpkgs-old": "nixpkgs-old",
         "nixpkgs-wayland": "nixpkgs-wayland",
         "simple-nixos-mailserver": "simple-nixos-mailserver",

flake.nix

@@ -3,46 +3,27 @@
     "A collection of crap, hacks and copy-paste to make my localhosts boot";
 
   inputs = {
-    lambda-launcher = {
+    nixpkgs-mesa.url = github:nixos/nixpkgs-channels/bdac777becdbb8780c35be4f552c9d4518fe0bdb;
-      type = "github";
+    lambda-launcher.url = github:balsoft/lambda-launcher;
-      owner = "balsoft";
-      repo = "lambda-launcher";
-    };
     NUR = {
-      type = "github";
+      url = github:nix-community/NUR;
-      owner = "nix-community";
-      repo = "NUR";
       flake = false;
     };
     base16-unclaimed-schemes = {
-      type = "github";
+      url = github:chriskempson/base16-unclaimed-schemes;
-      owner = "chriskempson";
-      repo = "base16-unclaimed-schemes";
       flake = false;
     };
-    home-manager = {
+    home-manager.url = github:rycee/home-manager/bqv-flakes;
-      type = "github";
-      owner = "rycee";
-      repo = "home-manager";
-      ref = "bqv-flakes";
-    };
     materia-theme = {
-      type = "github";
+      url = github:nana-4/materia-theme;
-      owner = "nana-4";
-      repo = "materia-theme";
       flake = false;
     };
     nixpkgs-old = {
-      type = "github";
+      url = github:nixos/nixpkgs/nixos-19.09;
-      owner = "nixos";
-      repo = "nixpkgs";
-      ref = "nixos-19.03";
       flake = false;
     };
     weechat-scripts = {
-      type = "github";
+      url = github:weechat/scripts;
-      owner = "weechat";
-      repo = "scripts";
       flake = false;
     };
     simple-nixos-mailserver = {
@@ -52,15 +33,11 @@
       flake = false;
     };
     nixpkgs-wayland = {
-      type = "github";
+      url = github:colemickens/nixpkgs-wayland;
-      owner = "colemickens";
-      repo = "nixpkgs-wayland";
       flake = false;
     };
     weechat-notify-send = {
-      type = "github";
+      url = github:s3rvac/weechat-notify-send;
-      owner = "s3rvac";
-      repo = "weechat-notify-send";
       flake = false;
     };
     yt-utilities = {
@@ -68,11 +45,7 @@
       url = "ssh://git@github.com/serokell/yt-utilities";
       ref = "flake";
     };
-    nixos-fhs-compat = {
+    nixos-fhs-compat.url = github:balsoft/nixos-fhs-compat;
-      type = "github";
-      owner = "balsoft";
-      repo = "nixos-fhs-compat";
-    };
   };
 
   outputs = { nixpkgs, nix, self, ... }@inputs: {

modules/hardware.nix

@@ -12,6 +12,7 @@ with deviceSpecific; {
   hardware.opengl.enable = true;
   hardware.opengl.driSupport = true;
   hardware.opengl.driSupport32Bit = true; # For steam
+  hardware.opengl.package = pkgs.mesa_drivers;
 
   hardware.bluetooth.enable = true;
   hardware.bluetooth.package = pkgs.bluezFull;

modules/matrix-synapse.nix

@@ -20,7 +20,7 @@
       x_forwarded = true;
     }];
     registration_shared_secret = config.secrets.matrix.shared_secret;
-    public_baseurl = "http://balsoft.ru";
+    public_baseurl = "https://balsoft.ru";
     server_name = "balsoft.ru";
     app_service_config_files = [
       (builtins.toFile "registration_tg.yaml"

modules/nginx.nix

@@ -14,7 +14,9 @@
           root = "/var/lib/balsoft.ru";
           index = "index.txt";
         };
-        locations."/.well-known".proxyPass = "http://localhost:13748";
+        locations."/.well-known" = {
+          proxyPass = "http://localhost:13748";
+        };
         locations."/_matrix" = {
           proxyPass = "http://localhost:13748";
         };
@@ -28,7 +30,9 @@
         locations."/" = { proxyPass = "http://localhost:5000"; };
       } // default;
       "matrix.balsoft.ru" = {
-        locations."/" = { proxyPass = "http://localhost:13748"; };
+        locations."/" = {
+          proxyPass = "http://localhost:13748";
+        };
       } // default;
       "share.balsoft.ru" = {
         locations."/" = { root = "/var/lib/share"; };

modules/packages.nix

@@ -21,6 +21,8 @@ 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;

modules/services.nix

@@ -66,5 +66,4 @@
     locations."~ ^\\/(?:build|tests|config|lib|3rdparty|templates|data)\\/".proxyWebsockets = true;
     locations."~ ^\\/(?:index|remote|public|cron|core/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|ocs-provider\\/.+|ocm-provider\\/.+)\\.php(?:$|\\/)".proxyWebsockets = true;
   };
-
 }

modules/workspace/misc.nix

@@ -67,6 +67,5 @@
       "${pkgs.breeze-qt5}/share/icons/breeze_cursors";
     systemd.user.startServices = true;
     services.kdeconnect.enable = true;
-    services.gnome-keyring.enable = true;
   };
 }

modules/workspace/sway/default.nix

@@ -21,7 +21,7 @@ in {
           { app_id = "org.kde.trojita"; }
           { title = ".* - Sylpheed.*"; }
           { title = "balsoft : weechat.*"; }
-          { title = "nheko"; }
+          { title = "Spectral"; }
           { title = "Slack"; }
         ];
         "ﱘ" = [{ app_id = "cantata"; }];
@@ -83,7 +83,7 @@ in {
             "${pkgs.keepassxc}/bin/keepassxc /home/balsoft/projects/nixos-config/misc/Passwords.kdbx";
         }
         { command = "${pkgs.termNote}/bin/noted"; }
-        { command = "${pkgs.fractal}/bin/fractal"; }
+        { command = "${pkgs.spectral}/bin/spectral"; }
         { command = "${pkgs.xorg.xrdb}/bin/xrdb -merge ~/.Xresources"; }
 
         { command = "${pkgs.cantata}/bin/cantata"; }