youthlic/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add kde de for Tytonidae

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

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

1
home/david/configurations/Tytonidae/niri.nix
View file

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

22
home/david/modules/programs/niri/default.nix
View file

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

109
home/modules/programs/niri.nix
View file

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

28
nixos/configurations/Tytonidae/default.nix
View file

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

2
nixos/modules/gui/cosmic.nix
View file

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

3
nixos/modules/gui/kde.nix
View file

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

4
nixos/modules/gui/niri.nix
View file

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