improve gitignore, make niri shared config more modular

This commit is contained in:
greyweather committed 2026-09-17 03:11:53 +01:00
1 parent 882372c082
commit 66fe4cf9cf
12 files changed
+233 -86

No files matched your search

+6 -1
View File
@@ -11,7 +11,7 @@
kdePackages.filelight
];
in {
flake.nixosModules.graphics = { pkgs, config, ... }: {
flake.nixosModules.graphics = { pkgs, config, lib, ... }: {
imports = [ self.nixosModules.graphicsOptions ];
environment.systemPackages = with pkgs; [
@@ -24,6 +24,11 @@ in {
iosevka-comfy.comfy
nerd-fonts.jetbrains-mono
];
features.applications.gui = {
vscode.enable = lib.mkDefault true;
kitty.enable = lib.mkDefault true;
};
};
flake.homeModules.graphics = { config, pkgs, ... }: {
+2 -2
View File
@@ -1,6 +1,6 @@
{ inputs, self, ... }: {
flake.nixosModules.graphics = { pkgs, config, lib, ... }: {
config = lib.mkIf ((config.components.shells == "noctalia")||(builtins.elem "noctalia" config.components.shells)) {
config = lib.mkIf (builtins.elem "noctalia" config.components.shells) {
environment.systemPackages = [
inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default
];
@@ -14,7 +14,7 @@
};
flake.homeModules.graphics = { pkgs, config, lib, inputs, ... }: {
config = lib.mkIf ((config.components.shells == "noctalia")||(builtins.elem "noctalia" config.components.shells)) {
config = lib.mkIf (builtins.elem "noctalia" config.components.shells) {
home = {
activation = {
linkNoctaliaState = lib.hm.dag.entryAfter ["writeBoundary"] (inputs.helpers.mkSymlinkActivationScript {
+18 -4
View File
@@ -25,17 +25,31 @@
};
flake.homeModules.graphics = { config, pkgs, lib, inputs, ... }: {
home = lib.mkIf (builtins.elem "niri" config.components.windowManagers || builtins.elem "biri" config.components.windowManagers) {
activation = {
config = lib.mkIf (builtins.elem "niri" config.components.windowManagers || builtins.elem "biri" config.components.windowManagers) {
features.applications.gui = {
kitty.enable = lib.mkForce true;
};
home.activation = {
linkNiriConfig = lib.hm.dag.entryAfter ["writeBoundary"] (inputs.helpers.mkSymlinkActivationScript {
target = "${config.xdg.configHome}/niri/config.kdl";
source = "${config.info.rootPath}/dotfiles/${config.info.hostName}/niri.kdl";
});
linkSharedConfig = lib.hm.dag.entryAfter ["writeBoundary"] (inputs.helpers.mkSymlinkActivationScript {
linkSharedNiriConfig = lib.hm.dag.entryAfter ["writeBoundary"] (inputs.helpers.mkSymlinkActivationScript {
target = "${config.xdg.configHome}/niri/shared.kdl";
source = "${config.info.rootPath}/dotfiles/shared/niri-shared.kdl";
source = "${config.info.rootPath}/dotfiles/shared/niri/shared.kdl";
});
linkSharedNoctaliaNiriConfig = lib.mkIf (builtins.elem "noctalia" config.components.shells) (lib.hm.dag.entryAfter ["writeBoundary"] (inputs.helpers.mkSymlinkActivationScript {
target = "${config.xdg.configHome}/niri/noctalia-shared.kdl";
source = "${config.info.rootPath}/dotfiles/shared/niri/noctalia-shared.kdl";
}));
linkSharedBiriConfig = lib.mkIf (builtins.elem "biri" config.components.windowManagers) (lib.hm.dag.entryAfter ["writeBoundary"] (inputs.helpers.mkSymlinkActivationScript {
target = "${config.xdg.configHome}/niri/biri-shared.kdl";
source = "${config.info.rootPath}/dotfiles/shared/niri/biri-shared.kdl";
}));
};
};
};