vinzenz/nixos-configuration
0
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: move niri enable to desktop settings

Browse source
This commit is contained in:
müde 2026-05-01 23:15:02 +02:00
parent 281d763c62
commit a7cc61a624
2 changed files with 9 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

23
flake.nix
View file

@ -153,25 +153,10 @@
}; };
}; };
vscodeExtensions = nix-vscode-extensions.overlays.default; vscodeExtensions = nix-vscode-extensions.overlays.default;
niri = niri.overlays.niri;
}; };
nixosModules = (importModuleDir ./nixosModules) // { nixosModules = importModuleDir ./nixosModules;
niri =
{ lib, config, ... }:
{
imports = [ niri.nixosModules.niri ];
options.my.niri.enable = lib.mkEnableOption "niri wayland compositor";
config = lib.mkIf config.my.niri.enable {
nixpkgs.overlays = [ niri.overlays.niri ];
programs.niri = {
enable = true;
#package = pkgs.niri-stable;
};
};
};
};
homeModules = importModuleDir ./homeModules; homeModules = importModuleDir ./homeModules;
homeConfigurations = { homeConfigurations = {
@ -202,7 +187,6 @@
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
lanzaboote.nixosModules.lanzaboote lanzaboote.nixosModules.lanzaboote
nova-shell.nixosModules.default nova-shell.nixosModules.default
self.nixosModules.niri
servicepoint-cli.nixosModules.default servicepoint-cli.nixosModules.default
servicepoint-simulator.nixosModules.default servicepoint-simulator.nixosModules.default
servicepoint-tanks.nixosModules.default servicepoint-tanks.nixosModules.default
@ -236,7 +220,7 @@
globalinstalls.enable = true; globalinstalls.enable = true;
lixIsNix.enable = true; lixIsNix.enable = true;
openssh.enable = true; openssh.enable = true;
prometheusNode.enable = true; # prometheusNode.enable = true;
systemdBoot.enable = true; systemdBoot.enable = true;
tailscale.enable = true; tailscale.enable = true;
}; };
@ -276,7 +260,6 @@
gnome.enable = true; gnome.enable = true;
kdeconnect.enable = true; kdeconnect.enable = true;
modernDesktop.enable = true; modernDesktop.enable = true;
niri.enable = true;
nixLd.enable = true; nixLd.enable = true;
quietBoot.enable = true; quietBoot.enable = true;
stylix.enable = true; stylix.enable = true;

6
nixosModules/muede-desktop-settings.nix
View file

@ -2,12 +2,18 @@
lib, lib,
config, config,
pkgs, pkgs,
niri,
... ...
}: }:
{ {
imports = [ niri.nixosModules.niri ];
options.my.muedeDesktopSettings.enable = lib.mkEnableOption "muede desktop settings (Firefox, Logitech, RDP)"; options.my.muedeDesktopSettings.enable = lib.mkEnableOption "muede desktop settings (Firefox, Logitech, RDP)";
config = lib.mkIf config.my.muedeDesktopSettings.enable { config = lib.mkIf config.my.muedeDesktopSettings.enable {
my.overlays.niri.enable = true;
programs.niri.enable = true;
programs.firefox.enable = true; programs.firefox.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [