Update from desktop changes

5 files changed, 28 insertions, 7 deletions

diff --git a/flake.nix b/flake.nix
index 5ac075e..d4cb7ea 100755
--- a/flake.nix
+++ b/flake.nix
@@ -34,6 +34,7 @@
     # Sources...
     nhekoSrc = {
       url = "github:Nheko-reborn/nheko/master";
+      #url = "github:q234rty/nheko/b34bce70a4b6572330a6abcfe7b75ce123567f1e";
       flake = false;
     };
     mtxclientSrc = {
@@ -83,7 +84,14 @@
           ./host/Rory-desktop/configuration.nix
           ./hardware-configuration.nix
           home-manager.nixosModules.home-manager
-          ({...}: { nix.registry.nixpkgs.flake = nixpkgs; })
+          ({...}: { 
+            nix = {
+              registry.nixpkgs.flake = nixpkgs;
+              nixPath = [
+                "nixpkgs=${nixpkgs.outPath}"
+              ];
+            };
+          })
           # ... add this line to the rest of your configuration modules
           #nix-ld.nixosModules.nix-ld
 
diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index c0cd5f1..7f885e8 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -208,9 +208,16 @@
       extraPortals = with pkgs; [
         #xdg-desktop-portal-gtk
         xdg-desktop-portal-xapp
-        #(callPackage ../../modules/packages/xdg-desktop-portal-gtk.nix { })
+        (callPackage ../../modules/packages/xdg-desktop-portal-gtk.nix { })
       ];
+      config = {
+        common = {
+          default = [ "gtk" ];
+        };
+      };
       xdgOpenUsePortal = true;
+      gtkUsePortal = true;
+
     };
     #sounds.enable = true;
     #mime.enable = true;
@@ -269,8 +276,9 @@
       modesetting.enable = true;
       powerManagement.enable = false;
       powerManagement.finegrained = false;
-      open = true;
+      open = false;
       nvidiaSettings = true;
+      nvidiaPersistenced = true;
       package = config.boot.kernelPackages.nvidiaPackages.stable;
     };
 
diff --git a/modules/packages/xdg-desktop-portal-gtk.nix b/modules/packages/xdg-desktop-portal-gtk.nix
index e44ffe1..fa32730 100644
--- a/modules/packages/xdg-desktop-portal-gtk.nix
+++ b/modules/packages/xdg-desktop-portal-gtk.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk3
     xdg-desktop-portal
+    gsettings-desktop-schemas # settings exposed by settings portal
+    #fontconfig
   ] ++ lib.optionals buildPortalsInGnome [
     gsettings-desktop-schemas # settings exposed by settings portal
     gnome-desktop
@@ -44,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   mesonFlags = lib.optionals (!buildPortalsInGnome) [
     "-Dwallpaper=disabled"
-    "-Dsettings=disabled"
-    "-Dappchooser=disabled"
+    "-Dsettings=enabled"
+    "-Dappchooser=enabled"
     "-Dlockdown=disabled"
   ];
 
diff --git a/modules/software-templates/dotnet.nix b/modules/software-templates/dotnet.nix
index 3f52ce7..8a8c1b5 100644
--- a/modules/software-templates/dotnet.nix
+++ b/modules/software-templates/dotnet.nix
@@ -4,4 +4,8 @@
     environment.systemPackages = with pkgs; [    
         (callPackage ../packages/dotnet-pack.nix { inherit pkgs; })
     ];
-}
\ No newline at end of file
+    environment.sessionVariables = {
+        DOTNET_CLI_TELEMETRY_OPTOUT = "1";
+        DOTNET_ROOT = "${(callPackage ../packages/dotnet-pack.nix { inherit pkgs; })}";
+    };
+}e
\ No newline at end of file
diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
index ef7ea72..c6a4ed6 100755
--- a/modules/users/Rory.nix
+++ b/modules/users/Rory.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, home-manager, ... }:
 
 {
-
   users.users.Rory = {
     isNormalUser = true;
     extraGroups = [ "wheel" "libvirtd" "ocp" ];