From 8428e4fe84d6b86905a807de6963074d5d71ceae Mon Sep 17 00:00:00 2001 From: langedev Date: Mon, 4 Dec 2023 17:40:50 -0800 Subject: [PATCH] fix desktop environment --- configuration.nix | 6 +++--- desktop.nix | 2 +- flake.lock | 26 +++++++++++++------------- flake.nix | 2 +- hardware/desktop.nix | 4 +--- modules/audio/pipewire/default.nix | 1 + modules/graphics/nvidia/default.nix | 20 +++++++++++++++++--- 7 files changed, 37 insertions(+), 24 deletions(-) diff --git a/configuration.nix b/configuration.nix index ff30656..f0f53e2 100644 --- a/configuration.nix +++ b/configuration.nix @@ -5,8 +5,8 @@ { config, pkgs, ... }: let - systemType = "laptop"; - #systemType = "desktop"; + #systemType = "laptop"; + systemType = "desktop"; in { nix.package = pkgs.nixUnstable; imports = @@ -23,7 +23,7 @@ in { ./modules/audio/pipewire - ./modules/shell/fish # This enables fish as the default shell + ./modules/shell/fish ./modules/network/browsers/librewolf ./modules/network/syncthing diff --git a/desktop.nix b/desktop.nix index 18573f3..9a5dc5d 100644 --- a/desktop.nix +++ b/desktop.nix @@ -5,6 +5,6 @@ imports = [ ./hardware/desktop.nix - # ./modules/graphics/nvidia + ./modules/graphics/nvidia ]; } diff --git a/flake.lock b/flake.lock index 79f4514..a51ef7d 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1699808562, - "narHash": "sha256-wTU1ivhWAAGWO6Fzx4RYFruW8HrIh5X7fjy5NJPaqOc=", + "lastModified": 1701737536, + "narHash": "sha256-xSmfHhhCL9mAta5jKfcbJxYjCoD2MdLPBMjBUWvYAJI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0ba2e6870478bcf1af1b6508677b46a3484fb21f", + "rev": "3bb9c7c5cf4f2ee30bf821501499f2308d616f94", "type": "github" }, "original": { @@ -49,11 +49,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698134075, - "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { @@ -104,18 +104,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1699292815, - "narHash": "sha256-HXu98PyBMKEWLqiTb8viuLDznud/SdkdJsx5A5CWx7I=", + "lastModified": 1701368958, + "narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=", "owner": "wlroots", "repo": "wlroots", - "rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1", + "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1", + "rev": "5d639394f3e83b01596dcd166a44a9a1a2583350", "type": "gitlab" } }, @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1697981233, - "narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=", + "lastModified": 1700508250, + "narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2", + "rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 84f22c0..27ca7cf 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ }; outputs = { nixpkgs, hyprland, ... }: { - nixosConfigurations.jibril = nixpkgs.lib.nixosSystem { + nixosConfigurations.onizuka = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ./configuration.nix diff --git a/hardware/desktop.nix b/hardware/desktop.nix index e48ba96..f6be0dc 100644 --- a/hardware/desktop.nix +++ b/hardware/desktop.nix @@ -8,7 +8,7 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; @@ -36,6 +36,4 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; } diff --git a/modules/audio/pipewire/default.nix b/modules/audio/pipewire/default.nix index c3ebfe8..3e55b02 100644 --- a/modules/audio/pipewire/default.nix +++ b/modules/audio/pipewire/default.nix @@ -5,6 +5,7 @@ services.pipewire = { enable = true; + wireplumber.enable = true; alsa.enable = false; alsa.support32Bit = false; pulse.enable = true; diff --git a/modules/graphics/nvidia/default.nix b/modules/graphics/nvidia/default.nix index 6d39712..7e0e568 100644 --- a/modules/graphics/nvidia/default.nix +++ b/modules/graphics/nvidia/default.nix @@ -1,7 +1,21 @@ { config, pkgs, lib, ... }: { - services.xserver.videoDrivers = [ "nvidia" ]; - hardware.opengl.enable = true; - hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; + # Enable OpenGL + hardware.opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + }; + + services.xserver.videoDrivers = ["nvidia"]; + + hardware.nvidia = { + modesetting.enable = true; + package = config.boot.kernelPackages.nvidiaPackages.stable; + }; + + environment.systemPackages = with pkgs; [ + nvidia-vaapi-driver + ]; }