works again, mostly done, now we can start with server
This commit is contained in:
parent
784f214fb7
commit
270e1a0be4
38 changed files with 623 additions and 381 deletions
|
|
@ -30,22 +30,35 @@
|
|||
programs = {
|
||||
uwsm = {
|
||||
waylandCompositors = {
|
||||
hyprland = lib.mkIf config.desktop.window-managers.hyprland.enable {
|
||||
prettyName = "Hyprland";
|
||||
comment = "Hyprland";
|
||||
binPath = "${config.programs.hyprland.package}/bin/start-hyprland";
|
||||
};
|
||||
sway = lib.mkIf config.desktop.window-managers.sway.enable {
|
||||
prettyName = "Sway";
|
||||
comment = "Sway";
|
||||
binPath = "${config.programs.sway.package}/bin/sway --session";
|
||||
};
|
||||
niri = lib.mkIf config.desktop.window-managers.niri.enable {
|
||||
prettyName = "Niri";
|
||||
comment = "Niri";
|
||||
binPath = "${config.programs.niri.package}/bin/niri-session";
|
||||
};
|
||||
hyprland =
|
||||
if config.desktop.window-managers.hyprland.enable then
|
||||
{
|
||||
prettyName = "Hyprland";
|
||||
comment = "Hyprland";
|
||||
binPath = "${config.programs.hyprland.package}/bin/start-hyprland";
|
||||
}
|
||||
else
|
||||
{ };
|
||||
sway =
|
||||
if config.desktop.window-managers.sway.enable then
|
||||
{
|
||||
prettyName = "Sway";
|
||||
comment = "Sway";
|
||||
binPath = "${config.programs.sway.package}/bin/sway --session";
|
||||
}
|
||||
else
|
||||
{ };
|
||||
niri =
|
||||
if config.desktop.window-managers.niri.enable then
|
||||
{
|
||||
prettyName = "Niri";
|
||||
comment = "Niri";
|
||||
binPath = "${config.programs.niri.package}/bin/niri-session";
|
||||
}
|
||||
else
|
||||
{ };
|
||||
};
|
||||
};
|
||||
};
|
||||
xdg.portal.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,20 +12,23 @@
|
|||
walker.enable = lib.mkEnableOption "enable walker";
|
||||
rofi.enable = lib.mkEnableOption "enable rofi";
|
||||
launcher = lib.mkOption {
|
||||
default = (lib.mkIf config.desktop.shell.walker.enable "walker");
|
||||
default = (if config.desktop.shell.walker.enable then "walker" else null);
|
||||
description = "default launcher";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = {
|
||||
programs = {
|
||||
walker = lib.mkIf config.desktop.shell.walker.enable {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
environment.systemPackages = with pkgs; [
|
||||
(lib.mkIf (config.desktop.shell.rofi.enable) rofi)
|
||||
];
|
||||
config = {
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
[
|
||||
]
|
||||
++ (
|
||||
if config.desktop.shell.rofi.enable then
|
||||
|
||||
[ rofi ]
|
||||
else
|
||||
[ ]
|
||||
);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,13 +12,4 @@
|
|||
noctalia.enable = lib.mkEnableOption "enable noctalia";
|
||||
};
|
||||
};
|
||||
imports = lib.mkIf config.desktop.shell.noctalia.enable [
|
||||
inputs.noctalia.homeModules.default
|
||||
];
|
||||
config = lib.mkIf config.desktop.shell.noctalia.enable {
|
||||
desktop.shell.swww.enable = lib.mkDefault false;
|
||||
programs.noctalia-shell = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,10 +13,20 @@
|
|||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf config.desktop.shell.swww.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
waypaper
|
||||
swww
|
||||
];
|
||||
};
|
||||
config =
|
||||
|
||||
{
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
[ ]
|
||||
++ (
|
||||
if config.desktop.shell.swww.enable then
|
||||
[
|
||||
waypaper
|
||||
swww
|
||||
]
|
||||
else
|
||||
[ ]
|
||||
);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,11 +12,15 @@
|
|||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf config.desktop.shell.waybar.enable {
|
||||
programs = {
|
||||
waybar = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
config = {
|
||||
programs =
|
||||
if config.desktop.shell.waybar.enable then
|
||||
{
|
||||
waybar = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
else
|
||||
{ };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,10 +13,21 @@
|
|||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf config.desktop.utilities.grimblast.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
grimblast
|
||||
gradia
|
||||
];
|
||||
};
|
||||
config =
|
||||
|
||||
{
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
[ ]
|
||||
++ (
|
||||
if config.desktop.utilities.grimblast.enable then
|
||||
with pkgs;
|
||||
[
|
||||
grimblast
|
||||
gradia
|
||||
]
|
||||
else
|
||||
[ ]
|
||||
);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,14 +14,20 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
config = lib.mkIf config.desktop.window-managers.hyprland.enable {
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
withUWSM = true;
|
||||
xwayland.enable = true;
|
||||
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
|
||||
portalPackage =
|
||||
inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
||||
config =
|
||||
|
||||
{
|
||||
programs.hyprland =
|
||||
if config.desktop.window-managers.hyprland.enable then
|
||||
{
|
||||
enable = true;
|
||||
withUWSM = true;
|
||||
xwayland.enable = true;
|
||||
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
|
||||
portalPackage =
|
||||
inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
|
||||
}
|
||||
else
|
||||
{ };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,13 +13,24 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
config = lib.mkIf config.desktop.window-managers.niri.enable {
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
xwayland-satellite
|
||||
];
|
||||
programs.niri = {
|
||||
enable = true;
|
||||
};
|
||||
config = {
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
[ ]
|
||||
++ (
|
||||
if config.desktop.window-managers.niri.enable then
|
||||
[
|
||||
xwayland-satellite
|
||||
]
|
||||
else
|
||||
[ ]
|
||||
);
|
||||
programs.niri =
|
||||
if config.desktop.window-managers.niri.enable then
|
||||
{
|
||||
enable = true;
|
||||
}
|
||||
else
|
||||
{ };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,12 +13,15 @@
|
|||
};
|
||||
};
|
||||
};
|
||||
config = lib.mkIf config.desktop.window-managers.sway.enable {
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
programs.sway = {
|
||||
enable = true;
|
||||
wrapperFeatures.gtk = true;
|
||||
package = null;
|
||||
};
|
||||
config = {
|
||||
programs.sway =
|
||||
if config.desktop.window-managers.sway.enable then
|
||||
{
|
||||
enable = true;
|
||||
wrapperFeatures.gtk = true;
|
||||
package = null;
|
||||
}
|
||||
else
|
||||
{ };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue