From bbfec6ea9aced75c376fd5247b359b433177e696 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Mon, 13 Jan 2025 11:02:57 +0100 Subject: [PATCH] switch back to explicit sync? --- flake.lock | 16 +++--- flake.nix | 4 +- .../gnome-shell-customization.nix | 4 +- .../{quickshare.nix => owncloud-client.nix} | 3 +- modules/nixos/gdm.nix | 34 ++++++------- modules/nixos/nvidia.nix | 49 +++++++++---------- users/remy.nix | 3 +- 7 files changed, 54 insertions(+), 59 deletions(-) rename modules/home-manager/{quickshare.nix => owncloud-client.nix} (58%) diff --git a/flake.lock b/flake.lock index 7cfebaf..dd3dff6 100644 --- a/flake.lock +++ b/flake.lock @@ -7,16 +7,16 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1736373539, + "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -39,16 +39,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725001927, - "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", + "lastModified": 1736549401, + "narHash": "sha256-ibkQrMHxF/7TqAYcQE+tOnIsSEzXmMegzyBWza6uHKM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", + "rev": "1dab772dd4a68a7bba5d9460685547ff8e17d899", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 9e1d2b3..86f9762 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "Nix config entry point"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Home manager - home-manager.url = "github:nix-community/home-manager/release-24.05"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Managing flatpak apps nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; diff --git a/modules/home-manager/gnome-shell-customization.nix b/modules/home-manager/gnome-shell-customization.nix index 7a256a6..f033377 100644 --- a/modules/home-manager/gnome-shell-customization.nix +++ b/modules/home-manager/gnome-shell-customization.nix @@ -10,11 +10,11 @@ with lib.hm.gvariant; } { id = "tilingshell@ferrarodomenico.com"; - package = pkgs.gnome.gnome-shell-extensions; + package = pkgs.gnome-shell-extensions; } { id = "search-light@icedman.github.com"; - package = pkgs.gnome.gnome-shell-extensions; + package = pkgs.gnome-shell-extensions; } { package = pkgs.gnomeExtensions.window-gestures; diff --git a/modules/home-manager/quickshare.nix b/modules/home-manager/owncloud-client.nix similarity index 58% rename from modules/home-manager/quickshare.nix rename to modules/home-manager/owncloud-client.nix index a7a1630..76d5cbb 100644 --- a/modules/home-manager/quickshare.nix +++ b/modules/home-manager/owncloud-client.nix @@ -1,6 +1,7 @@ {pkgs, ...}: { home.packages = [ - pkgs.rquickshare + pkgs.owncloud-client ]; + } diff --git a/modules/nixos/gdm.nix b/modules/nixos/gdm.nix index 75f6663..88ef654 100644 --- a/modules/nixos/gdm.nix +++ b/modules/nixos/gdm.nix @@ -17,29 +17,29 @@ environment.gnome.excludePackages = (with pkgs; [ gnome-photos gnome-tour - gnome.geary + geary gedit - gnome.tali - gnome.gnome-music - gnome.cheese + tali + gnome-music + cheese epiphany - gnome.gnome-calendar - gnome.gnome-maps - gnome.simple-scan - gnome.yelp - gnome.gnome-disk-utility - gnome.gnome-notes - gnome.gnome-weather + gnome-calendar + gnome-maps + simple-scan + yelp + gnome-disk-utility + gnome-notes + gnome-weather gnome-secrets - gnome.gnome-characters - gnome.gnome-font-viewer - gnome.gnome-system-monitor + gnome-characters + gnome-font-viewer + gnome-system-monitor gnome-text-editor gnome-connections - gnome.gnome-clocks + gnome-clocks baobab - gnome.gnome-contacts - gnome.gnome-logs + gnome-contacts + gnome-logs ]); } diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix index 921f770..bf308d7 100644 --- a/modules/nixos/nvidia.nix +++ b/modules/nixos/nvidia.nix @@ -7,23 +7,15 @@ { # Enable OpenGL - hardware.opengl = { + hardware.graphics = { enable = true; }; # Load nvidia driver for Xorg and Wayland services.xserver.videoDrivers = ["nvidia"]; + # specify nvidia driver version 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; @@ -38,27 +30,30 @@ # Experimental and only works on modern Nvidia GPUs (Turing or newer). powerManagement.finegrained = false; + # the open source drivers are not compatible with the old 1050ti open = false; # Enable the Nvidia settings menu, # accessible via `nvidia-settings`. nvidiaSettings = true; + + # Optionally, you may need to select the appropriate driver version for your specific GPU. + 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="; + }; + + prime = { + offload = { + enable = true; + enableOffloadCmd = true; + }; + intelBusId = "PCI:0:2:0"; + nvidiaBusId = "PCI:1:0:0"; + }; }; - - ## 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; - }; - }; } diff --git a/users/remy.nix b/users/remy.nix index 504fe8b..6592b1b 100644 --- a/users/remy.nix +++ b/users/remy.nix @@ -9,9 +9,8 @@ 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