From 6f9bdb39afd3f1ae5711383d3127b87342ae2574 Mon Sep 17 00:00:00 2001
From: iiogama <iiogama@0x212.org>
Date: Fri, 12 Jan 2024 22:15:01 -0800
Subject: [PATCH] Changed xdg portal to xdg-desktop-portal-wlr

---
 nixos/office.nix  |  2 +-
 nixos/wayland.nix | 30 ++++++++++--------------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/nixos/office.nix b/nixos/office.nix
index 791ed5e..14e4c46 100644
--- a/nixos/office.nix
+++ b/nixos/office.nix
@@ -4,7 +4,7 @@
   users.users.${user.name}.packages = with pkgs; [
     ledger
     libreoffice
-    obsidian
+    #obsidian
     pandoc
     pdftk
     #sc-im
diff --git a/nixos/wayland.nix b/nixos/wayland.nix
index 4ff833a..e4236dd 100644
--- a/nixos/wayland.nix
+++ b/nixos/wayland.nix
@@ -15,25 +15,24 @@
       enable = true;
       xdgOpenUsePortal = true;
       extraPortals = [
-        pkgs.xdg-desktop-portal-hyprland
+        pkgs.xdg-desktop-portal-wlr
       ];
       configPackages = [
-        pkgs.xdg-desktop-portal-hyprland
+        pkgs.xdg-desktop-portal-wlr
       ];
     };
   };
-  fonts.packages = with pkgs; [
-    comic-mono
-    noto-fonts
-    noto-fonts-cjk
-    noto-fonts-emoji
-    fira-code
-    fira-code-symbols
-    dina-font
-  ];
   programs = {
     river = {
       enable = true;
+      extraPackages = with pkgs; [
+        bemenu
+        foot
+        mako
+        swaylock
+        way-displays
+        wtype
+      ];
     };
     xwayland = {
       enable = true;
@@ -48,13 +47,4 @@
     tessen
     wl-clipboard
   ];
-  environment.systemPackages = with pkgs; [
-    bemenu
-    foot
-    mako
-    swaylock
-    waybar
-    way-displays
-    wtype
-  ];
 }