Add xdg-desktop-portal-wlr, switch around devices

boot-config.nix

@@ -21,6 +21,10 @@
           preLVM = true;
           allowDiscards = true;
         };
+        glimmer = {
+          preLVM = true;
+          allowDiscards = true;
+        };
       };
     };
   };

configuration.nix

@@ -99,6 +99,7 @@
     keybase.enable = true;
     logind.extraConfig = "HandlePowerKey=suspend";
     pcscd.enable = true;
+    pipewire.enable = true;
     tor = {
       enable = true;
       client.enable = true;
@@ -115,7 +116,10 @@
   };
   xdg.portal = {
     enable = true;
-    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-gtk
+      (callPackage ./externals/packages/xdg-desktop-portal-wlr.nix { })
+    ];
   };
 
   hardware = {	

externals/packages/xdg-desktop-portal-wlr.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub
+, meson, ninja, pkgconfig, wayland-protocols
+, pipewire, wayland, elogind, systemd, libdrm }:
+
+stdenv.mkDerivation rec {
+  pname = "xdg-desktop-portal-wlr";
+  version = "2020-03-13";
+
+  src = fetchFromGitHub {
+    owner = "emersion";
+    repo = pname;
+    rev = "dfa0ac704064304824b6d4fea7870d33359dcd15";
+    sha256 = "0k73nyd9z25ph4pc4vpa3xsd49b783qfk1dxqk20bgyg1ln54b81";
+  };
+
+  nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ];
+  buildInputs = [ pipewire wayland elogind systemd libdrm ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/emersion/xdg-desktop-portal-wlr";
+    description = "xdg-desktop-portal backend for wlroots";
+    maintainers = with maintainers; [ minijackson ];
+    platforms = platforms.linux;
+    license = licenses.mit;
+  };
+}

hardware-configuration.nix

@@ -1,11 +1,11 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
   imports =
-    [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
+    [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ];
@@ -25,27 +25,32 @@
       options = [ "subvol=nix" ];
     };
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/1AC2-9317";
-      fsType = "vfat";
-    };
-
   fileSystems."/home" =
     { device = "/dev/disk/by-uuid/aca21111-a488-4bc7-90a7-e61517c24818";
       fsType = "btrfs";
       options = [ "subvol=home" ];
     };
 
-  fileSystems."/media/data" =
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/1AC2-9317";
+      fsType = "vfat";
+    };
+
+  fileSystems."/media/archive" =
     { device = "/dev/disk/by-uuid/ba796824-5165-4a95-87c2-1fb49a449138";
       fsType = "btrfs";
     };
 
-  boot.initrd.luks.devices."data".device = "/dev/disk/by-uuid/3de20c8e-2c31-491a-a8cc-fea4762e8601";
+  fileSystems."/media/data" =
+    { device = "/dev/disk/by-uuid/c01b98d1-1eb9-42ce-8d05-4b9d852fca55";
+      fsType = "btrfs";
+    };
+
+  boot.initrd.luks.devices."alicorn".device = "/dev/disk/by-uuid/3de20c8e-2c31-491a-a8cc-fea4762e8601";
+  boot.initrd.luks.devices."glimmer".device = "/dev/disk/by-uuid/43220fc3-2f33-4915-9365-59eb27b21719";
 
   swapDevices =
     [ { device = "/dev/disk/by-uuid/b134fecf-719f-45af-b317-001e413f06c4"; }
     ];
 
-  nix.maxJobs = lib.mkDefault 16;
 }

packages.nix

@@ -161,12 +161,14 @@ in
     llvm.clang
     llvm.lld
     nasm
+    nodejs
     patchelf
     python37Packages.python-language-server
     rr
     rustup
     valgrind
     vscode
+    yarn
 
     # Hardware
     arachne-pnr