From 12277464cb5d989f8bbd422d25796aa047d1954c Mon Sep 17 00:00:00 2001 From: Nathan McCarty Date: Fri, 4 Nov 2022 02:29:59 -0400 Subject: [PATCH] Switch desktop over to unstable until 22.11 --- flake.nix | 1 + home-manager/linux/programs/communications.nix | 3 ++- modules/linux/hardware.nix | 5 +---- modules/linux/swaywm.nix | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index fb6f8a3..d32591c 100644 --- a/flake.nix +++ b/flake.nix @@ -129,6 +129,7 @@ # Real systems nixosConfigurations = { levitation = makeNixosSystem { + ourNixpkgs = nixpkgs-unstable; system = "x86_64-linux"; hostName = "levitation"; extraModules = [ diff --git a/home-manager/linux/programs/communications.nix b/home-manager/linux/programs/communications.nix index d92038a..e610de9 100644 --- a/home-manager/linux/programs/communications.nix +++ b/home-manager/linux/programs/communications.nix @@ -62,7 +62,8 @@ # Desktop telegram client tdesktop # Desktop mastodon client - tootle + # TODO: Reenable when unbroken on unstable + # tootle # zulip unstable.zulip zulipWayland diff --git a/modules/linux/hardware.nix b/modules/linux/hardware.nix index 374325e..bf8114e 100644 --- a/modules/linux/hardware.nix +++ b/modules/linux/hardware.nix @@ -20,10 +20,7 @@ in with lib; { onBoot = "ignore"; onShutdown = "shutdown"; qemu = { - ovmf = { - enable = true; - package = pkgs.OVMFFull; - }; + ovmf = { enable = true; }; runAsRoot = true; swtpm.enable = true; }; diff --git a/modules/linux/swaywm.nix b/modules/linux/swaywm.nix index c193a36..a937e21 100644 --- a/modules/linux/swaywm.nix +++ b/modules/linux/swaywm.nix @@ -50,8 +50,7 @@ in with lib; { }; }) ]; - # Enable QT themeing - programs.qt5ct.enable = true; + qt5.platformTheme = "qt5ct"; # Enable and configure sway itself programs.sway = { enable = true;