diff --git a/flake.lock b/flake.lock index cb58940..c2f8003 100644 --- a/flake.lock +++ b/flake.lock @@ -178,11 +178,11 @@ "gpg-base-conf": { "flake": false, "locked": { - "lastModified": 1717992711, - "narHash": "sha256-UQtwNSoR9Rtk30QSmSBwpSuLyM907xMCF11kqv8D/0c=", + "lastModified": 1719781410, + "narHash": "sha256-cmtAG7UQX7mVNoHHpVIqasfkjnO7VtBMcz8MJ7frO0k=", "owner": "drduh", "repo": "config", - "rev": "89dd34af42b5a144ab241a553bb292439841707f", + "rev": "4eca229664d056737f1a097cdbdb10e5f247b0bc", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1719180626, - "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", + "lastModified": 1720045378, + "narHash": "sha256-lmE7B+QXw7lWdBu5GQlUABSpzPk3YBb9VbV+IYK5djk=", "owner": "nix-community", "repo": "home-manager", - "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", + "rev": "0a30138c694ab3b048ac300794c2eb599dc40266", "type": "github" }, "original": { @@ -256,11 +256,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719145664, - "narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=", + "lastModified": 1719895800, + "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e", + "rev": "6e253f12b1009053eff5344be5e835f604bb64cd", "type": "github" }, "original": { @@ -305,11 +305,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1719099622, - "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", + "lastModified": 1719663039, + "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", + "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119", "type": "github" }, "original": { @@ -321,11 +321,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1719075281, - "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { @@ -337,11 +337,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1718983919, - "narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", + "lastModified": 1719468428, + "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90338afd6177fc683a04d934199d693708c85a3b", + "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d", "type": "github" }, "original": { @@ -461,11 +461,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1719111739, - "narHash": "sha256-kr2QzRrplzlCP87ddayCZQS+dhGW98kw2zy7+jUXtF4=", + "lastModified": 1719873517, + "narHash": "sha256-D1dxZmXf6M2h5lNE1m6orojuUawVPjogbGRsqSBX+1g=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5e2e9421e9ed2b918be0a441c4535cfa45e04811", + "rev": "a11224af8d824935f363928074b4717ca2e280db", "type": "github" }, "original": { @@ -506,11 +506,11 @@ }, "unstable": { "locked": { - "lastModified": 1719075281, - "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { diff --git a/modules/nixos/apps/vivaldi/default.nix b/modules/nixos/apps/vivaldi/default.nix index 32a9faa..f6e8a8a 100644 --- a/modules/nixos/apps/vivaldi/default.nix +++ b/modules/nixos/apps/vivaldi/default.nix @@ -19,6 +19,9 @@ in environment.systemPackages = with pkgs; [ vivaldi vivaldi-ffmpeg-codecs + qt5.qtwayland ]; + + # environment.sessionVariables.NIXOS_OZONE_WL = "1"; }; } diff --git a/modules/nixos/graphical-interface/desktop-manager/kde/default.nix b/modules/nixos/graphical-interface/desktop-manager/kde/default.nix index 09803fd..99af216 100644 --- a/modules/nixos/graphical-interface/desktop-manager/kde/default.nix +++ b/modules/nixos/graphical-interface/desktop-manager/kde/default.nix @@ -15,7 +15,10 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = with pkgs; [ xdg-utils ]; + environment.systemPackages = with pkgs; [ + xdg-utils + kdePackages.qtbase + ]; services = { xserver = enabled; diff --git a/overlays/vivaldi/default.nix b/overlays/vivaldi/default.nix index 1756269..c66518f 100644 --- a/overlays/vivaldi/default.nix +++ b/overlays/vivaldi/default.nix @@ -1,5 +1,14 @@ { channels, ... }: final: prev: { - vivaldi = prev.vivaldi.override { commandLineArgs = "--disable-features=AllowQt"; }; + vivaldi = prev.vivaldi.overrideAttrs (oldAttrs: { + dontWrapQtApps = false; + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ channels.unstable.kdePackages.wrapQtAppsHook ]; + commandLineArgs = '' + -enable-features=UseOzonePlatform + --ozone-platform=wayland + --ozone-platform-hint=auto + --enable-features=WaylandWindowDecorations + ''; + }); } diff --git a/systems/x86_64-linux/yggdrasil/hardware.nix b/systems/x86_64-linux/yggdrasil/hardware.nix index 8e6cf08..e00556a 100644 --- a/systems/x86_64-linux/yggdrasil/hardware.nix +++ b/systems/x86_64-linux/yggdrasil/hardware.nix @@ -4,12 +4,21 @@ { config, lib, - pkgs, modulesPath, + inputs, ... }: +let + inherit (inputs) nixos-hardware; +in { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + imports = with nixos-hardware.nixosModules; [ + (modulesPath + "/installer/scan/not-detected.nix") + common-cpu-amd + common-gpu-nvidia-nonprime + common-pc + common-pc-ssd + ]; boot = { initrd.availableKernelModules = [