diff --git a/modules/features/desktop/niri.nix b/modules/features/desktop/niri.nix index cd2d92b..7f8002b 100644 --- a/modules/features/desktop/niri.nix +++ b/modules/features/desktop/niri.nix @@ -10,30 +10,16 @@ { - imports = [ + # for home manager functionality + imports = [ inputs.home-manager.nixosModules.home-manager ]; - # for home manager functionality - inputs.home-manager.nixosModules.home-manager - - # for niri binary cache from epireyn - # disable if untrusted - # conflicts with unstable overlay - #inputs.niri.nixosModules.niri - - ]; - - # for niri binary cache from epireyn - # disable if untrusted - #niri-flake.cache.enable = true; - - # for latest niri versions - disable if using binary cache + # for latest niri versions nixpkgs.overlays = [ inputs.niri.overlays.niri ]; # packages for desktop environment environment.systemPackages = with pkgs; [ jq # unsure what this is for - research time? xwayland-satellite # niri xwayland support - disable if using unstable - #xwayland-satellite-unstable # niri xwayland support - disable if using stable ]; # session management @@ -52,10 +38,8 @@ # enables niri globally programs.niri = { enable = true; - # use latest nixpkgs version - disable if using binary cache or unstable + # use latest nixpkgs version package = with pkgs; niri; - # use latest unstable version - disable if using binary cache or stable - #package = with pkgs; niri-unstable; }; # niri personalisation @@ -67,19 +51,15 @@ programs.niri = { # enables niri within home manager enable = true; - # use latest nixpkgs version - disable if using binary cache or unstable + # use latest nixpkgs version package = with pkgs; niri; - # uses latest unstable version - disable if using binary cache or stable - #package = with pkgs; niri-unstable; settings = { # xwayland implementation xwayland-satellite = { enable = true; - # use niri-stable matching version - disable if using unstable + # use niri-stable matching version path = lib.getExe pkgs.xwayland-satellite; - # use niri-unstable matching version - disable if using stable - #path = lib.getExe pkgs.xwayland-satellite-unstable; }; # environment variables diff --git a/modules/features/desktop/noctalia.nix b/modules/features/desktop/noctalia.nix index e3108f6..8553f90 100644 --- a/modules/features/desktop/noctalia.nix +++ b/modules/features/desktop/noctalia.nix @@ -38,10 +38,6 @@ # enables noctalia enable = true; systemd.enable = true; - # ensures networkmanager and bluetooth - # as well as upower and a power profile service - # are enabled globally - #recommendedServices.enable = true; # noctalia settings settings = {