From 85fddb110facb968a9f1308cc3b02a7910910f94 Mon Sep 17 00:00:00 2001 From: Christoph Hollizeck Date: Sun, 10 Nov 2024 12:32:50 +0100 Subject: [PATCH] nvidia remove tty disable, update flake, go back to beta driver, switch out sddm as it wasnt working anymore --- flake.lock | 68 +++++++++---------- .../nixos/desktop/addons/hypridle/default.nix | 2 +- modules/nixos/desktop/hyprland/default.nix | 21 +++--- .../system/hardware/gpu/nvidia/default.nix | 10 +-- 4 files changed, 47 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index 7c056c9..4140c06 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1730961036, - "narHash": "sha256-nkho9Dq4WzyF4xr83UdxrlDS5Sm7ZKkPaqGVupLOpOI=", + "lastModified": 1731220256, + "narHash": "sha256-7BWlJbGZ6rXtKOfgZYDQerygXco1YyYzXciuLN0UPP4=", "owner": "nix-community", "repo": "fenix", - "rev": "9bf50cb857db8dba15528f3905e271d948cbff06", + "rev": "61c51d848301cefc1535856f9e68ad6e01a5c970", "type": "github" }, "original": { @@ -420,11 +420,11 @@ ] }, "locked": { - "lastModified": 1730065367, - "narHash": "sha256-XIsgB/tgaenHorewWrfU2gkDsbkMfPA87Z/LXjeKM7Y=", + "lastModified": 1731228735, + "narHash": "sha256-b3PuEtRHTSxV809RLUiZVQhDQZ8NxxpWUjboTe9QAAY=", "owner": "outfoxxed", "repo": "hy3", - "rev": "4c79361db9c065886c163d1cf873889e1e641e44", + "rev": "7e792f712a2a896bd8d3174780c8944ef5ae7931", "type": "github" }, "original": { @@ -476,11 +476,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1730969692, - "narHash": "sha256-yHY98IWTLDz57TrseUxdh5QnpngcNCjNXTJ2XCeNhtk=", + "lastModified": 1731172465, + "narHash": "sha256-EboiVE3dYLvoMn4/E9bUjnWFu7ebN5Np6mE7m9ta1Qw=", "ref": "refs/heads/main", - "rev": "e58e97b0a38b8ccc87a4304c9e4e2b37c9966875", - "revCount": 5425, + "rev": "a8ff3a452c1c445d24bdd9e7e4fcd66c8ef2a147", + "revCount": 5435, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -508,11 +508,11 @@ ] }, "locked": { - "lastModified": 1730755630, - "narHash": "sha256-IA5U8lHx/lnHwbx25dpPpeLbaALqNNjalYCf19tIoj0=", + "lastModified": 1731169722, + "narHash": "sha256-hOljwsXpY4Y6guvcr51tWCnXo6c56yaBknnLXk1m3Vk=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "44859f877739c05d031fcab4a2991ec004fa9bc4", + "rev": "844eb98250da448e17471f20beed23a5f5d33a3a", "type": "github" }, "original": { @@ -612,11 +612,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1730911842, - "narHash": "sha256-stAVRv13iACAIJ6mheJOwZXWD24YDupyshaUDovVNi4=", + "lastModified": 1731171284, + "narHash": "sha256-pwO3OCxIbLKm6NqpXeOGlO+CSOPQpcMCSJDXEctr7B8=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "4fc133c96fa1ad2968cad44f8e9e9e923cd0381a", + "rev": "6c3c444136d6f87d3cd9610b12e45e4c2130ef3a", "type": "github" }, "original": { @@ -631,11 +631,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1730958442, - "narHash": "sha256-8vmh+ehnDnIenBNibGTPCu8p7cJiFP6bzj0E7pBxgQQ=", + "lastModified": 1731223637, + "narHash": "sha256-9FLqM8e6aGgFjFjrdfZnzNaYPRwuEkIvBCjJJa5huLo=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "dbd932941b46ced4eac5da30994d5af2ca80530c", + "rev": "4cadb3e6bf51c7e16d1c42915cb2a6661d923583", "type": "github" }, "original": { @@ -656,11 +656,11 @@ ] }, "locked": { - "lastModified": 1730968903, - "narHash": "sha256-zFvzLXcSm0Ia4XI1SE4FQ9KE63hlGrRWhLtwMolWuR8=", + "lastModified": 1731163338, + "narHash": "sha256-Qflei0JBeqQ0c8jxA8e982xAxJvfMwfx4Aci2eJi84s=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3ce0cde8709cdacbfba471f8e828433b58a561e9", + "rev": "60d3dece30f98e8ad85131829c8529950630d6bc", "type": "github" }, "original": { @@ -844,11 +844,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1731023751, - "narHash": "sha256-80FIi/BkulfaTxT76BfDeYyKc/Lo6SIs/4Xm+VlYe4o=", + "lastModified": 1731233476, + "narHash": "sha256-I3Pk1PQWKAZaUBgAn3kp9HyaVkExeH45gSsn7MTz9JQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ed1b9995752699c34e16e5baafaf5e517397bec8", + "rev": "b306e97ffe307c3bb34e1f9ccd61ad70ddce8991", "type": "github" }, "original": { @@ -1070,11 +1070,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1730749868, - "narHash": "sha256-b8UMpLh61z6T4J1NObustAuFGoJiAKBTaPTrEf3Amts=", + "lastModified": 1731056261, + "narHash": "sha256-TPeXChHVcaCBAoE349K7OZH4We5/2ys1GgG4IiwjwOs=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "b51f9bc736dc0472481a47d7c05de2901323e543", + "rev": "dd9cd22514cb1001a0a2374b36a85eb75245f27b", "type": "github" }, "original": { @@ -1179,11 +1179,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1731008979, - "narHash": "sha256-yN1NxvmqV8UltLkqYBWTeZNgpD/eyh/7LM58caHiEfE=", + "lastModified": 1731213149, + "narHash": "sha256-jR8i6nFLmSmm0cIoeRQ8Q4EBARa3oGaAtEER/OMMxus=", "owner": "Mic92", "repo": "sops-nix", - "rev": "fe63071416471abdab06caa234122932a7c4b980", + "rev": "f1675e3b0e1e663a4af49be67ecbc9e749f85eb7", "type": "github" }, "original": { @@ -1343,11 +1343,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1730444716, - "narHash": "sha256-WtqSpYQyG5ad+GK7B0ViDSl0NolHp7yM24TacUslBXE=", + "lastModified": 1731197724, + "narHash": "sha256-PvgM1OR95kJkCAIhLfTY+j/Tz9l4/1U+jTlTU8kwUtY=", "owner": "ch4og", "repo": "zen-browser-flake", - "rev": "d3c639ee7bff20f799f443e18fffa6331a71cd3a", + "rev": "f61a5370605af58398f316edfda63ca05996e6f1", "type": "github" }, "original": { diff --git a/modules/nixos/desktop/addons/hypridle/default.nix b/modules/nixos/desktop/addons/hypridle/default.nix index a242827..fa4b26b 100644 --- a/modules/nixos/desktop/addons/hypridle/default.nix +++ b/modules/nixos/desktop/addons/hypridle/default.nix @@ -29,7 +29,7 @@ in listener = [ { - timeout = 900; + timeout = 600; on-timeout = "loginctl lock-session"; } { diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix index c5f2b96..b792963 100644 --- a/modules/nixos/desktop/hyprland/default.nix +++ b/modules/nixos/desktop/hyprland/default.nix @@ -81,11 +81,15 @@ in }; }; - services = { - xserver = enabled; - displayManager.sddm = { - enable = true; - theme = "Elegant"; + services.greetd = { + enable = true; + settings = rec { + initial_session = { + command = "${hyprland-package}/bin/Hyprland"; + user = "cholli"; + }; + + default_session = initial_session; }; }; @@ -311,18 +315,13 @@ in environment.sessionVariables = { NIXOS_OZONE_WL = "1"; # Hint electron apps to use wayland + ELECTRON_OZONE_PLATFORM_HINT = "auto"; - XDG_CURRENT_DESKTOP = "Hyprland"; XDG_SESSION_TYPE = "wayland"; - XDG_SESSION_DESKTOP = "Hyprland"; QT_AUTO_SCREEN_SCALE_FACTOR = "1"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; QT_QPA_PLATFORM = "wayland;xcb"; - - ELECTRON_OZONE_PLATFORM_HINT = "auto"; - - WLR_DRM_NO_ATOMIC = "1"; }; }; } diff --git a/modules/nixos/system/hardware/gpu/nvidia/default.nix b/modules/nixos/system/hardware/gpu/nvidia/default.nix index b6eb846..ab91698 100644 --- a/modules/nixos/system/hardware/gpu/nvidia/default.nix +++ b/modules/nixos/system/hardware/gpu/nvidia/default.nix @@ -28,25 +28,19 @@ in powerManagement.enable = true; open = false; nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.stable; # stable, beta + package = config.boot.kernelPackages.nvidiaPackages.beta; # stable, beta }; services.xserver.videoDrivers = [ "nvidia" ]; boot.kernelParams = [ + "nvidia.NVreg_PreserveVideoMemoryAllocations=1" "nvidia_drm.fbdev=1" - - # TODO: remove after https://github.com/NVIDIA/open-gpu-kernel-modules/pull/692 - # and similar are merged and build in nixpkgs-unstable. - # WARNING: this disables tty output and thus hides boot logs. - "initcall_blacklist=simpledrm_platform_driver_init" ]; environment.sessionVariables = { GBM_BACKEND = "nvidia-drm"; __GLX_VENDOR_LIBRARY_NAME = "nvidia"; LIBVA_DRIVER_NAME = "nvidia"; - __GL_GSYNC_ALLOWED = "1"; - __GL_VRR_ALLOWED = "0"; NVD_BACKEND = "direct"; }; }; -- 2.48.1