From 074b3d25b601d1f267dabd39c8ba63808152152a Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 14 May 2023 15:04:36 +0100 Subject: [PATCH] porcorosso: let's try KDE --- ops/nixos/lib/home-manager/plasma.nix | 10 ++++++++++ ops/nixos/lib/plasma.nix | 22 ++++++++++++++++++++++ ops/nixos/porcorosso/default.nix | 16 +++++++++------- 3 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 ops/nixos/lib/home-manager/plasma.nix create mode 100644 ops/nixos/lib/plasma.nix diff --git a/ops/nixos/lib/home-manager/plasma.nix b/ops/nixos/lib/home-manager/plasma.nix new file mode 100644 index 0000000000..5f9a01f0e1 --- /dev/null +++ b/ops/nixos/lib/home-manager/plasma.nix @@ -0,0 +1,10 @@ +# SPDX-FileCopyrightText: 2023 Luke Granger-Brown +# +# SPDX-License-Identifier: Apache-2.0 + +{ pkgs, depot, lib, ... }: +{ + config = { + services.kdeconnect.enable = true; + }; +} diff --git a/ops/nixos/lib/plasma.nix b/ops/nixos/lib/plasma.nix new file mode 100644 index 0000000000..26b7a544c9 --- /dev/null +++ b/ops/nixos/lib/plasma.nix @@ -0,0 +1,22 @@ +# SPDX-FileCopyrightText: 2023 Luke Granger-Brown +# +# SPDX-License-Identifier: Apache-2.0 + +{ pkgs, depot, lib, ... }: +{ + config = { + my.home-manager.imports = lib.mkAfter [ ./home-manager/plasma.nix ]; + + services.xserver.desktopManager.plasma5 = { + enable = true; + useQtScaling = true; + }; + + qt.platformTheme = "kde"; + + environment.systemPackages = with pkgs.libsForQt5; [ + # Bismuth, tiling window manager + bismuth + ]; + }; +} diff --git a/ops/nixos/porcorosso/default.nix b/ops/nixos/porcorosso/default.nix index 989bdf4ec6..261ba05f90 100644 --- a/ops/nixos/porcorosso/default.nix +++ b/ops/nixos/porcorosso/default.nix @@ -25,6 +25,7 @@ in { imports = [ ../lib/zfs.nix ../lib/graphical-client-x11.nix + ../lib/plasma.nix ../lib/whitby-distributed.nix ]; @@ -340,13 +341,14 @@ in { mandatoryFeatures = [ ]; }]; - services.tlp = { - enable = true; - settings = { - DISK_DEVICES = "nvme0n1 nvme1n1 nvme2n1"; - DISK_IOSCHED = "mq-deadline mq-deadline mq-deadline"; - }; - }; + # XXX: disabled because conflicts with plasma5 + #services.tlp = { + # enable = true; + # settings = { + # DISK_DEVICES = "nvme0n1 nvme1n1 nvme2n1"; + # DISK_IOSCHED = "mq-deadline mq-deadline mq-deadline"; + # }; + #}; my.scrapeJournal.enable = false; # Laptop, don't pull too much.