From 7970bd7738adb1641fb9eb290dbc0f0a87aedffd Mon Sep 17 00:00:00 2001
From: Nicole <frega.nicole@gmail.com>
Date: Sat, 25 Oct 2025 19:00:51 +0200
Subject: [PATCH] Update

---
 etc/nixos/configuration.nix    | 34 ++++++++++++++++++++++++++++------
 etc/nixos/flake.nix            |  2 +-
 etc/nixos/modules/desktop.nix  |  2 +-
 etc/nixos/modules/programs.nix | 10 +++++++---
 4 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/etc/nixos/configuration.nix b/etc/nixos/configuration.nix
index 6709d6e..d325ba6 100644
--- a/etc/nixos/configuration.nix
+++ b/etc/nixos/configuration.nix
@@ -21,8 +21,9 @@ in
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
       ./modules/virtualization.nix
-      ./modules/nvidia.nix
       ./modules/desktop.nix
+      #./modules/nvidia.nix
+      ./modules/nvidia-basic.nix
       ./modules/ld-fix.nix
       ./modules/programs.nix
       ./modules/bluetooth.nix
@@ -133,10 +134,26 @@ in
 #░▄▀▄░█░█░█░█
 #░▀░▀░▀▀░░▀▀▀
 
-
-  xdg.portal.enable = true;
-  xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
-  xdg.portal.config.common.default = "*";
+  xdg.portal = {
+    enable = true;
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-gtk
+      xdg-desktop-portal-gnome
+    ];
+    config = {
+      common = {
+        default = [ "*" ];
+      };
+      niri = {
+        default = [
+          "gtk"
+          "gnome"
+        ];
+        "org.freedesktop.impl.portal.ScreenCast" = [ "gnome" ];
+        "org.freedesktop.impl.portal.Screenshot" = [ "gnome" ];
+      };
+    };
+  };
 
 
 
@@ -192,7 +209,12 @@ in
   };
 
   # Fonts with emojis uwu #
-  fonts.packages = with pkgs; [ nerd-fonts.jetbrains-mono ];
+  fonts.packages = with pkgs; [ 
+  nerd-fonts.jetbrains-mono 
+  material-symbols
+  inter
+  fira-code
+  ];
 
   services.gvfs.enable = true;
   programs.dconf.enable = true;
diff --git a/etc/nixos/flake.nix b/etc/nixos/flake.nix
index a95f6ea..a56cba3 100644
--- a/etc/nixos/flake.nix
+++ b/etc/nixos/flake.nix
@@ -2,7 +2,7 @@
   description = "My Flake";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.05";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     nix-flatpak.url = "github:gmodena/nix-flatpak";
   };
diff --git a/etc/nixos/modules/desktop.nix b/etc/nixos/modules/desktop.nix
index 26030fe..0d18538 100644
--- a/etc/nixos/modules/desktop.nix
+++ b/etc/nixos/modules/desktop.nix
@@ -6,7 +6,7 @@
 {
   
   # Enable GDM
-  services.displayManager.gdm.enable = true;
+  services.xserver.displayManager.gdm.enable = true;
   
   # Enable SDDM
   #services.displayManager.sddm.enable = true;
diff --git a/etc/nixos/modules/programs.nix b/etc/nixos/modules/programs.nix
index fedaa03..9365a35 100644
--- a/etc/nixos/modules/programs.nix
+++ b/etc/nixos/modules/programs.nix
@@ -9,6 +9,7 @@
   # RISKY, REMOVE ASAP ###
   nixpkgs.config.permittedInsecurePackages = [
     "qtwebengine-5.15.19"
+    "mbedtls-2.28.10"
   ];
 
   # Defined Programs
@@ -59,7 +60,9 @@
     rofi
     libnotify
     wayvnc
-    pkgs-unstable.quickshell
+    #pkgs-unstable.quickshell
+    xwayland-satellite
+    #inputs.quickshell.packages.${pkgs.system}.default
 
     # OFFICE #
     pkgs-unstable.onlyoffice-desktopeditors
@@ -72,7 +75,7 @@
     anydesk
 
     # PRODUCTION #
-    gimp
+    #gimp
     pinta
 
     # MEDIA #
@@ -87,10 +90,11 @@
     element-desktop
     vesktop
     mailspring
+    geary
     tutanota-desktop
     teams-for-linux
     qbittorrent
-    rustdesk
+    #rustdesk
     sunshine
     
     # DEV #