swarsel/.dotfiles
1
0
Fork 0
mirror of https://github.com/Swarsel/.dotfiles.git synced 2025-12-06 09:07:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: fix typos; build niri less eagerly

Browse source
This commit is contained in:
Leon Schwarzäugl 2025-11-13 23:40:41 +01:00
parent 910fef4914
commit f950ea97be
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
6 changed files with 232 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

20
SwarselSystems.org
View file

@ -3664,7 +3664,7 @@ This is a slim setup for developing base configuration. I do not track the hardw
}; };
swarselmodules = { swarselmodules = {
servevr.network = lib.mkForce false; server.network = lib.mkForce false;
}; };
swarselsystems = { swarselsystems = {
@ -6794,12 +6794,16 @@ Auto login for the initial session.
xwayland-satellite-unstable xwayland-satellite-unstable
]; ];
niri-flake.cache.enable = true;
programs.niri = { programs.niri = {
enable = true; enable = true;
package = pkgs.niri-unstable; # the actual niri that will be installed and used package = pkgs.niri-unstable; # the actual niri that will be installed and used
}; };
} // {
niri-flake.cache.enable = true;
programs.niri = {
package = null;
};
}; };
} }
#+end_src #+end_src
@ -15353,6 +15357,12 @@ Currently, I am too lazy to explain every option here, but most of it is very se
}; };
}; };
} // {
programs.niri = lib.mkIf (!config.swarselmodules.niri) {
package = null;
config = null;
settings = null;
};
}; };
} }
#+end_src #+end_src
@ -15405,7 +15415,7 @@ Currently, I am too lazy to explain every option here, but most of it is very se
exec = [ "${pkgs.swaybg}/bin/swaybg --output '${config.swarselsystems.sharescreen}' --image ${config.swarselsystems.wallpaper} --mode ${config.stylix.imageScalingMode}" ]; exec = [ "${pkgs.swaybg}/bin/swaybg --output '${config.swarselsystems.sharescreen}' --image ${config.swarselsystems.wallpaper} --mode ${config.stylix.imageScalingMode}" ];
outputs = [ outputs = [
{ {
criteria = "eDP-2"; criteria = config.swarselsystems.sharescreen;
status = "enable"; status = "enable";
scale = 1.0; scale = 1.0;
} }
@ -19445,7 +19455,7 @@ Modules that need to be loaded on the NixOS level. Note that these will not be a
lowBattery = lib.mkDefault false; lowBattery = lib.mkDefault false;
network = lib.mkDefault true; network = lib.mkDefault true;
networkDevices = lib.mkDefault true; networkDevices = lib.mkDefault true;
niri = lib.mkDefault true; niri = lib.mkDefault false;
nix-ld = lib.mkDefault true; nix-ld = lib.mkDefault true;
nvd = lib.mkDefault true; nvd = lib.mkDefault true;
packages = lib.mkDefault true; packages = lib.mkDefault true;
@ -19792,7 +19802,7 @@ This holds modules that are to be used on most hosts. These are also the most im
kitty = lib.mkDefault true; kitty = lib.mkDefault true;
mail = lib.mkDefault true; mail = lib.mkDefault true;
mako = lib.mkDefault true; mako = lib.mkDefault true;
niri = lib.mkDefault true; niri = lib.mkDefault false;
nix-index = lib.mkDefault true; nix-index = lib.mkDefault true;
nixgl = lib.mkDefault true; nixgl = lib.mkDefault true;
nix-your-shell = lib.mkDefault true; nix-your-shell = lib.mkDefault true;

2
modules/home/common/kanshi.nix
View file

@ -39,7 +39,7 @@
exec = [ "${pkgs.swaybg}/bin/swaybg --output '${config.swarselsystems.sharescreen}' --image ${config.swarselsystems.wallpaper} --mode ${config.stylix.imageScalingMode}" ]; exec = [ "${pkgs.swaybg}/bin/swaybg --output '${config.swarselsystems.sharescreen}' --image ${config.swarselsystems.wallpaper} --mode ${config.stylix.imageScalingMode}" ];
outputs = [ outputs = [
{ {
criteria = "eDP-2"; criteria = config.swarselsystems.sharescreen;
status = "enable"; status = "enable";
scale = 1.0; scale = 1.0;
} }

9
modules/home/common/niri.nix
View file

@ -1,7 +1,8 @@
{ config, pkgs, lib, vars, ... }: { config, pkgs, lib, vars, ... }:
{ {
options.swarselmodules.niri = lib.mkEnableOption "niri settings"; options.swarselmodules.niri = lib.mkEnableOption "niri settings";
config = lib.mkIf config.swarselmodules.niri { config = lib.mkIf config.swarselmodules.niri
{
programs.niri = { programs.niri = {
package = pkgs.niri-unstable; # which package to use for niri validation package = pkgs.niri-unstable; # which package to use for niri validation
@ -202,5 +203,11 @@
}; };
}; };
} // {
programs.niri = lib.mkIf (!config.swarselmodules.niri) {
package = null;
config = null;
settings = null;
};
}; };
} }

9
modules/nixos/client/niri.nix
View file

@ -4,7 +4,8 @@ let
in in
{ {
options.swarselmodules.${moduleName} = lib.mkEnableOption "${moduleName} settings"; options.swarselmodules.${moduleName} = lib.mkEnableOption "${moduleName} settings";
config = lib.mkIf config.swarselmodules.${moduleName} { config = lib.mkIf config.swarselmodules.${moduleName}
{
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wl-clipboard wl-clipboard
@ -15,11 +16,15 @@ in
xwayland-satellite-unstable xwayland-satellite-unstable
]; ];
niri-flake.cache.enable = true;
programs.niri = { programs.niri = {
enable = true; enable = true;
package = pkgs.niri-unstable; # the actual niri that will be installed and used package = pkgs.niri-unstable; # the actual niri that will be installed and used
}; };
} // {
niri-flake.cache.enable = true;
programs.niri = {
package = null;
};
}; };
} }

2
profiles/home/personal/default.nix
View file

@ -29,7 +29,7 @@
kitty = lib.mkDefault true; kitty = lib.mkDefault true;
mail = lib.mkDefault true; mail = lib.mkDefault true;
mako = lib.mkDefault true; mako = lib.mkDefault true;
niri = lib.mkDefault true; niri = lib.mkDefault false;
nix-index = lib.mkDefault true; nix-index = lib.mkDefault true;
nixgl = lib.mkDefault true; nixgl = lib.mkDefault true;
nix-your-shell = lib.mkDefault true; nix-your-shell = lib.mkDefault true;

2
profiles/nixos/personal/default.nix
View file

@ -26,7 +26,7 @@
lowBattery = lib.mkDefault false; lowBattery = lib.mkDefault false;
network = lib.mkDefault true; network = lib.mkDefault true;
networkDevices = lib.mkDefault true; networkDevices = lib.mkDefault true;
niri = lib.mkDefault true; niri = lib.mkDefault false;
nix-ld = lib.mkDefault true; nix-ld = lib.mkDefault true;
nvd = lib.mkDefault true; nvd = lib.mkDefault true;
packages = lib.mkDefault true; packages = lib.mkDefault true;