add kde de for Tytonidae

This commit is contained in:
ulic-youthlic 2025-05-03 23:23:02 +08:00
parent c0d67ed108
commit 5bc43a1a92
Signed by: youthlic
GPG key ID: 63E86C3C14A0D721
8 changed files with 89 additions and 81 deletions

View file

@ -17,6 +17,7 @@ Hey, you. This is my nixos configurations.
| Specialisation | DE / WM | Shell | Editor | Terminal | Launcher | Browser | DM |
| -------------- | ------- | ----------- | ----------- | -------- | -------- | ------- | ---------------- |
| default | niri | fish + bash | helix + zed | ghostty | fuzzel | firefox | greetd + regreet |
| kde | kde | fish + bash | helix + zed | ghostty | kde run | firefox | sddm |
- david@Akun

View file

@ -2,7 +2,6 @@
inherit (inputs.niri-flake.lib.kdl) node leaf plain flag;
in {
david.programs.niri = {
enable = true;
extraConfig = let
output = node "output";
in [

View file

@ -15,12 +15,18 @@ in {
};
};
};
config = lib.mkIf cfg.enable {
youthlic.programs.niri = {
enable = true;
# settings = lib.mkMerge [(import ./settings.nix args) cfg.settings];
config = (lib.toList (import ./config.nix args)) ++ (lib.toList cfg.extraConfig);
};
david.programs.wluma.enable = true;
};
config = lib.mkMerge [
{
david.programs.niri.enable = config.youthlic.programs.niri.enable;
}
(
lib.mkIf cfg.enable {
youthlic.programs.niri = {
# settings = lib.mkMerge [(import ./settings.nix args) cfg.settings];
config = (lib.toList (import ./config.nix args)) ++ (lib.toList cfg.extraConfig);
};
david.programs.wluma.enable = true;
}
)
];
}

View file

@ -20,55 +20,62 @@ in {
};
};
};
config = lib.mkIf cfg.enable {
home.packages =
(with pkgs; [
swaynotificationcenter
swaybg
xwayland-satellite
kdePackages.polkit-kde-agent-1
wl-clipboard
cliphist
])
++ [niri];
qt = {
enable = true;
};
xdg.portal = {
configPackages = [niri];
enable = true;
extraPortals = lib.mkIf (
!niri.cargoBuildNoDefaultFeatures || builtins.elem "xdp-gnome-screencast" niri.cargoBuildFeatures
) [pkgs.xdg-desktop-portal-gnome];
};
xdg.configFile = let
qtctConf =
''
[Appearance]
standard_dialogs=xdgdesktopportal
''
+ lib.optionalString (config.qt.style ? name) ''
style=${config.qt.style.name}
'';
in {
"qt5ct/qt5ct.conf" = lib.mkForce {
text = qtctConf;
};
"qt6ct/qt6ct.conf" = lib.mkForce {
text = qtctConf;
};
};
youthlic.programs = {
fuzzel.enable = true;
wluma.enable = true;
waybar.enable = true;
swaync.enable = true;
swaylock.enable = true;
};
programs.niri = {
# settings = cfg.settings;
config = cfg.config;
package = niri;
};
};
config = lib.mkMerge [
{
youthlic.programs.niri.enable = osConfig.youthlic.gui.enabled == "niri";
}
(
lib.mkIf cfg.enable {
home.packages =
(with pkgs; [
swaynotificationcenter
swaybg
xwayland-satellite
kdePackages.polkit-kde-agent-1
wl-clipboard
cliphist
])
++ [niri];
qt = {
enable = true;
};
xdg.portal = {
configPackages = [niri];
enable = true;
extraPortals = lib.mkIf (
!niri.cargoBuildNoDefaultFeatures || builtins.elem "xdp-gnome-screencast" niri.cargoBuildFeatures
) [pkgs.xdg-desktop-portal-gnome];
};
xdg.configFile = let
qtctConf =
''
[Appearance]
standard_dialogs=xdgdesktopportal
''
+ lib.optionalString (config.qt.style ? name) ''
style=${config.qt.style.name}
'';
in {
"qt5ct/qt5ct.conf" = lib.mkForce {
text = qtctConf;
};
"qt6ct/qt6ct.conf" = lib.mkForce {
text = qtctConf;
};
};
youthlic.programs = {
fuzzel.enable = true;
wluma.enable = true;
waybar.enable = true;
swaync.enable = true;
swaylock.enable = true;
};
programs.niri = {
# settings = cfg.settings;
config = cfg.config;
package = niri;
};
}
)
];
}

View file

@ -48,20 +48,20 @@
};
};
# specialisation = {
# cosmic = {
# inheritParentConfig = true;
# configuration = {
# youthlic.gui.enabled = lib.mkForce "cosmic";
# };
# };
# kde = {
# inheritParentConfig = true;
# configuration = {
# youthlic.gui.enabled = lib.mkForce "kde";
# };
# };
# };
specialisation = {
# cosmic = {
# inheritParentConfig = true;
# configuration = {
# youthlic.gui.enabled = lib.mkForce "cosmic";
# };
# };
kde = {
inheritParentConfig = true;
configuration = {
youthlic.gui.enabled = lib.mkForce "kde";
};
};
};
programs.gnupg.agent = {
enable = true;

View file

@ -13,7 +13,7 @@ in {
display = 0;
enable = true;
xkb = {
layout = "cn";
layout = "us";
variant = "";
};
};

View file

@ -6,14 +6,13 @@
cfg = config.youthlic.gui;
in {
config = lib.mkIf (cfg.enabled == "kde") {
stylix.targets.qt.platform = "kde";
services = {
desktopManager.plasma6.enable = true;
displayManager.sddm.enable = true;
xserver = {
enable = true;
xkb = {
layout = "cn";
layout = "us";
variant = "";
};
};

View file

@ -97,10 +97,6 @@ in {
layout = "us";
variant = "";
};
# displayManager.gdm = {
# enable = true;
# wayland = true;
# };
};
};
programs = {