diff --git a/README.md b/README.md index 6150021..6e58059 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/home/david/configurations/Tytonidae/niri.nix b/home/david/configurations/Tytonidae/niri.nix index dc6c1af..2c14562 100644 --- a/home/david/configurations/Tytonidae/niri.nix +++ b/home/david/configurations/Tytonidae/niri.nix @@ -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 [ diff --git a/home/david/modules/programs/niri/default.nix b/home/david/modules/programs/niri/default.nix index 2654b7e..9d7ecbf 100644 --- a/home/david/modules/programs/niri/default.nix +++ b/home/david/modules/programs/niri/default.nix @@ -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; + } + ) + ]; } diff --git a/home/modules/programs/niri.nix b/home/modules/programs/niri.nix index e68662d..663ad38 100644 --- a/home/modules/programs/niri.nix +++ b/home/modules/programs/niri.nix @@ -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; + }; + } + ) + ]; } diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 06c49ed..83b1b61 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -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; diff --git a/nixos/modules/gui/cosmic.nix b/nixos/modules/gui/cosmic.nix index ffed1dc..40d616a 100644 --- a/nixos/modules/gui/cosmic.nix +++ b/nixos/modules/gui/cosmic.nix @@ -13,7 +13,7 @@ in { display = 0; enable = true; xkb = { - layout = "cn"; + layout = "us"; variant = ""; }; }; diff --git a/nixos/modules/gui/kde.nix b/nixos/modules/gui/kde.nix index 38b2c29..9651516 100644 --- a/nixos/modules/gui/kde.nix +++ b/nixos/modules/gui/kde.nix @@ -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 = ""; }; }; diff --git a/nixos/modules/gui/niri.nix b/nixos/modules/gui/niri.nix index faeec95..4fd56e0 100644 --- a/nixos/modules/gui/niri.nix +++ b/nixos/modules/gui/niri.nix @@ -97,10 +97,6 @@ in { layout = "us"; variant = ""; }; - # displayManager.gdm = { - # enable = true; - # wayland = true; - # }; }; }; programs = {