flake.lock

@@ -7,16 +7,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1736373539,
+        "lastModified": 1720042825,
-        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
+        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
+        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -39,16 +39,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1736549401,
+        "lastModified": 1725001927,
-        "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=",
+        "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899",
+        "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -2,10 +2,10 @@
   description = "Nix config entry point";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     # Home manager
-    home-manager.url = "github:nix-community/home-manager/release-24.11";
+    home-manager.url = "github:nix-community/home-manager/release-24.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     # Managing flatpak apps
     nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1";

modules/home-manager/gnome-shell-customization.nix

@@ -10,11 +10,11 @@ with lib.hm.gvariant;
             }
             {
                 id = "tilingshell@ferrarodomenico.com";
-                package = pkgs.gnome-shell-extensions;
+                package = pkgs.gnome.gnome-shell-extensions;
             }
             {
                 id = "search-light@icedman.github.com";
-                package = pkgs.gnome-shell-extensions;
+                package = pkgs.gnome.gnome-shell-extensions;
             }
             {
                 package = pkgs.gnomeExtensions.window-gestures;

modules/home-manager/quickshare.nix

@@ -1,7 +1,6 @@
 {pkgs, ...}: 
 {
     home.packages = [
-        pkgs.owncloud-client
+        pkgs.rquickshare
     ];
-    
 }

modules/nixos/gdm.nix

@@ -17,29 +17,29 @@
     environment.gnome.excludePackages = (with pkgs; [
         gnome-photos
         gnome-tour
-        geary
+        gnome.geary
         gedit
-        tali
+        gnome.tali
-        gnome-music
+        gnome.gnome-music
-        cheese
+        gnome.cheese
         epiphany
-        gnome-calendar
+        gnome.gnome-calendar
-        gnome-maps
+        gnome.gnome-maps
-        simple-scan
+        gnome.simple-scan
-        yelp
+        gnome.yelp
-        gnome-disk-utility
+        gnome.gnome-disk-utility
-        gnome-notes
+        gnome.gnome-notes
-        gnome-weather
+        gnome.gnome-weather
         gnome-secrets
-        gnome-characters
+        gnome.gnome-characters
-        gnome-font-viewer
+        gnome.gnome-font-viewer
-        gnome-system-monitor
+        gnome.gnome-system-monitor
         gnome-text-editor
         gnome-connections
-        gnome-clocks
+        gnome.gnome-clocks
         baobab
-        gnome-contacts
+        gnome.gnome-contacts
-        gnome-logs
+        gnome.gnome-logs
     ]);
 
 }

modules/nixos/nvidia.nix

@@ -6,67 +6,59 @@
 }:
 {
 
-  # Allow to use the nvidia driver in the special case
-  # Use in the boot menu
-  specialisation = {
-    nvidia-enabled = {
-      configuration = {
-        system.nixos.tags = [ "nvidia-enabled" ];
   # Enable OpenGL
-        hardware.graphics = {
+  hardware.opengl = {
     enable = true;
   };
-        hardware.nvidia = {
-          prime = {
-            sync.enable = true;
-            # reverseSync.enable = true;
-            # allowExternalGpu = false;
-            nvidiaBusId = "PCI:1:0:0";
-            intelBusId = "PCI:0:2:0";
 
-          };
+  # Load nvidia driver for Xorg and Wayland
-          modesetting.enable = true;
-          powerManagement.enable = false;
-          powerManagement.finegrained = false;
-          open = false;
-          nvidiaSettings = false;
-
-          package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
-            version = "565.77"; # latest
-            sha256_64bit = "sha256-CnqnQsRrzzTXZpgkAtF7PbH9s7wbiTRNcM0SPByzFHw=";
-            sha256_aarch64 = "sha256-LSAYUnhfnK3rcuPe1dixOwAujSof19kNOfdRHE7bToE=";
-            openSha256 = "sha256-Fxo0t61KQDs71YA8u7arY+503wkAc1foaa51vi2Pl5I=";
-            settingsSha256 = "sha256-VUetj3LlOSz/LB+DDfMCN34uA4bNTTpjDrb6C6Iwukk=";
-            persistencedSha256 = "sha256-wnDjC099D8d9NJSp9D0CbsL+vfHXyJFYYgU3CwcqKww=";
-          };
-        };
-
-        boot.extraModprobeConfig = "";
-        boot.blacklistedKernelModules = [];
-        services.udev.extraRules = "";
   services.xserver.videoDrivers = ["nvidia"];
-      };
+
-    };
+  hardware.nvidia = {
+    # manually specify the driver version
+    package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+      version = "555.58.02";
+      sha256_64bit = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM=";
+      sha256_aarch64 = "sha256-8hyRiGB+m2hL3c9MDA/Pon+Xl6E788MZ50WrrAGUVuY=";
+      openSha256 = "sha256-8hyRiGB+m2hL3c9MDA/Pon+Xl6E788MZ50WrrAGUVuY=";
+      settingsSha256 = "sha256-ZpuVZybW6CFN/gz9rx+UJvQ715FZnAOYfHn5jt5Z2C8=";
+      persistencedSha256 = "sha256-xctt4TPRlOJ6r5S54h5W6PT6/3Zy2R4ASNFPu8TSHKM=";
     };
 
+    # Modesetting is required.
+    modesetting.enable = true;
 
-  # In the global configuration, we blacklist the nouveau driver and load the nvidia driver
+    # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
-  boot.extraModprobeConfig = lib.mkDefault ''
+    # Enable this if you have graphical corruption issues or application crashes after waking
-    blacklist nouveau
+    # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead 
-    options nouveau modeset=0
+    # of just the bare essentials.
-  '';
+    powerManagement.enable = false;
 
-  services.udev.extraRules = lib.mkDefault ''
+    # Fine-grained power management. Turns off GPU when not in use.
-    # Remove NVIDIA USB xHCI Host Controller devices, if present
+    # Experimental and only works on modern Nvidia GPUs (Turing or newer).
-    ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{power/control}="auto", ATTR{remove}="1"
+    powerManagement.finegrained = false;
-    # Remove NVIDIA USB Type-C UCSI devices, if present
-    ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{power/control}="auto", ATTR{remove}="1"
-    # Remove NVIDIA Audio devices, if present
-    ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{power/control}="auto", ATTR{remove}="1"
-    # Remove NVIDIA VGA/3D controller devices
-    ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", ATTR{power/control}="auto", ATTR{remove}="1"
-  '';
 
-  boot.blacklistedKernelModules = lib.mkDefault [ "nouveau" "nvidia" "nvidia_drm" "nvidia_modeset" ];  
+    open = false;
 
+    # Enable the Nvidia settings menu,
+	  # accessible via `nvidia-settings`.
+    nvidiaSettings = true;
+  };
+
+  ## See https://nixos.wiki/wiki/Nvidia
+  hardware.nvidia.prime = {
+		intelBusId = "PCI:0:2:0";
+		nvidiaBusId = "PCI:1:0:0";
+
+    ## Reverse PRIME synchronization
+    # reverseSync.enable = true;
+    # # Enable if using an external GPU
+    # allowExternalGpu = false;
+
+    ## Alternatively enable offloading
+    offload = {
+			enable = true;
+			enableOffloadCmd = true;
+		};
+	};
 }

users/remy.nix

@@ -9,8 +9,9 @@ with lib.hm.gvariant;
     ../modules/home-manager/gnome-shell-customization.nix
     ../modules/home-manager/keepassxc.nix
     ../modules/home-manager/obsidian.nix
-    ../modules/home-manager/owncloud-client.nix
     ../modules/home-manager/thunderbird.nix
+    ../modules/home-manager/quickshare.nix
+
   ];
 
   ## Home Manager configuration