summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
authorRory& <root@rory.gay>2024-02-02 11:08:48 +0100
committerRory& <root@rory.gay>2024-02-02 11:09:16 +0100
commitaed44a2e2120dab226b6db1a36fe8308173dfc95 (patch)
tree08c3bf514933f0a5e85374bb1ec4174e64c1becc /modules
parentChanges (diff)
downloadRory-Open-Architecture-aed44a2e2120dab226b6db1a36fe8308173dfc95.tar.xz
Update from desktop changes
Diffstat (limited to 'modules')
-rw-r--r--modules/packages/xdg-desktop-portal-gtk.nix6
-rw-r--r--modules/software-templates/dotnet.nix6
-rwxr-xr-xmodules/users/Rory.nix1
3 files changed, 9 insertions, 4 deletions
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" ];