From 446e8db3fa8e1b736fc06ec80807e0ef6c416a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Tue, 5 Mar 2024 08:53:23 +0000 Subject: [PATCH] prep migration to plasma6 --- nixos/kde.nix | 16 ---------------- nixos/kde/default.nix | 9 +++++++++ nixos/kde/home.nix | 10 ++++++++++ nixos/kde/system.nix | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 16 deletions(-) delete mode 100644 nixos/kde.nix create mode 100644 nixos/kde/default.nix create mode 100644 nixos/kde/home.nix create mode 100644 nixos/kde/system.nix diff --git a/nixos/kde.nix b/nixos/kde.nix deleted file mode 100644 index fb11b250..00000000 --- a/nixos/kde.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - config, - pkgs, - ... -}: { - services.xserver = { - enable = true; - displayManager.sddm = { - enable = true; - enableHidpi = true; - }; - desktopManager.default = "plasma5"; - desktopManager.plasma5.enable = true; - }; - users.users.cyryl.packages = with pkgs; []; -} diff --git a/nixos/kde/default.nix b/nixos/kde/default.nix new file mode 100644 index 00000000..107087c0 --- /dev/null +++ b/nixos/kde/default.nix @@ -0,0 +1,9 @@ +{ + config, + pkgs, + ... +}: { + imports = [./system.nix]; + + home-manager.users.cyryl = {...}: {imports = [./home.nix];}; +} diff --git a/nixos/kde/home.nix b/nixos/kde/home.nix new file mode 100644 index 00000000..a4874cda --- /dev/null +++ b/nixos/kde/home.nix @@ -0,0 +1,10 @@ +{ + config, + pkgs, + ... +}: { + services = {}; + + home.packages = []; + dconf.settings = {}; +} diff --git a/nixos/kde/system.nix b/nixos/kde/system.nix new file mode 100644 index 00000000..869e4a1e --- /dev/null +++ b/nixos/kde/system.nix @@ -0,0 +1,42 @@ +{ + config, + pkgs, + inputs, + system, + ... +}: let + master = inputs.nixpkgs-master; + pkgs = master.legacyPackages."${system}"; + lib = pkgs.lib; + utils = pkgs.utils; +in { + disabledModules = [ + "services/x11/desktop-managers.plasma5.nix" + "programs/chromium.nix" + ]; + imports = [ + ({ + pkgs, + lib, + config, + utils, + ... + }: + import "${master}/nixos/modules/services/x11/desktop-managers/plasma6.nix" { + inherit pkgs lib config utils; + }) + "${master}/nixos/modules/programs/chromium.nix" + ]; + + services.flatpak.enable = true; + + services.xserver = { + enable = true; + displayManager.sddm = { + enable = true; + enableHidpi = true; + }; + desktopManager.plasma6.enable = true; + }; + users.users.cyryl.packages = with pkgs; []; +}