greyweather/nix-flake
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor to fix dependency on 'osConfig' arg

Browse Source
This commit is contained in:
greyweather committed 2026-08-28 05:26:46 +01:00
1 parent 1c1174edd3
commit 22d431e271
11 files changed
+86 -55
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

modules/features/applications/gui/floorp.nix
+9 -3
View File
@@ -1,13 +1,19 @@
{ inputs, self, ... }: {
flake.homeModules.graphics = { pkgs, lib, config, osConfig, ... }: {
flake.nixosModules.graphics = { pkgs, lib, config, ... }: {
home-manager.sharedModules = lib.mkIf (config.features.nixos.stylix.enable) [
({ config, lib, ... }: {
stylix.targets.floorp.profileNames = lib.mkIf (config.features.applications.gui.floorp.enable) [ "default" ];
})
];
};
flake.homeModules.graphics = { pkgs, lib, config, ... }: {
options.features.applications.gui.floorp.enable = lib.mkEnableOption "floorp";
config = lib.mkIf (config.features.applications.gui.floorp.enable) (
let
firefox-addons = with pkgs; inputs.firefox-addons.packages.${system};
in {
stylix.targets.floorp.profileNames = [ "default" ];
programs.floorp = {
enable = true;
nativeMessagingHosts = [
modules/features/applications/gui/kitty.nix
+7 -1
View File
@@ -1,10 +1,16 @@
{ inputs, self, ... }: {
flake.nixosModules.graphics = { pkgs, config, lib, ... }: {
options.features.applications.gui.kitty.enable = lib.mkEnableOption "kitty";
config.home-manager.sharedModules = lib.mkIf (config.features.applications.gui.kitty.enable) [
{
features.applications.gui.kitty.enable = true;
}
];
};
flake.homeModules.graphics = { pkgs, config, lib, ... }: {
options.features.applications.gui.kitty.enable = lib.mkOption (config.helpers.inheritOsConfigToHome "features.applications.gui.kitty.enable");
options.features.applications.gui.kitty.enable = lib.mkEnableOption "kitty";
config = lib.mkIf (config.features.applications.gui.kitty.enable) {
programs.kitty = {
modules/features/applications/gui/nautilus.nix
+8 -2
View File
@@ -16,11 +16,17 @@
enable = true;
terminal = "kitty";
};
home-manager.sharedModules = [
{
features.applications.gui.nautilus.enable = true;
}
];
};
};
flake.homeModules.graphics = { pkgs, osConfig, config, lib, ... }: {
options.features.applications.gui.nautilus.enable = lib.mkOption (config.helpers.inheritOsConfigToHome "features.applications.gui.nautilus.enable");
flake.homeModules.graphics = { pkgs, config, lib, ... }: {
options.features.applications.gui.nautilus.enable = lib.mkEnableOption "nautilus";
config = lib.mkIf (config.features.applications.gui.nautilus.enable) {
gtk.gtk3.bookmarks = [
modules/features/applications/gui/vscode.nix
+7 -1
View File
@@ -1,10 +1,16 @@
{ inputs, self, ... }: {
flake.nixosModules.graphics = { config, pkgs, lib, ... }: {
options.features.applications.gui.vscode.enable = lib.mkEnableOption "vscode";
config.home-manager.sharedModules = lib.mkIf (config.features.applications.gui.vscode.enable) [
{
features.applications.gui.vscode.enable = true;
}
];
};
flake.homeModules.graphics = { config, pkgs, lib, ... }: {
options.features.applications.gui.vscode.enable = lib.mkOption (config.helpers.inheritOsConfigToHome "features.applications.gui.vscode.enable");
options.features.applications.gui.vscode.enable = lib.mkEnableOption "vscode";
config = lib.mkIf (config.features.applications.gui.vscode.enable) {
home.packages = [ pkgs.vscode ];
modules/features/shells/zsh.nix
+10 -3
View File
@@ -9,16 +9,23 @@
programs.zsh.enable = true;
users.defaultUserShell = pkgs.zsh;
users.users."grey".shell = pkgs.zsh;
home-manager.sharedModules = [
{
features.shells.zsh.enable = true;
features.shells.zsh.antidote.enable = lib.mkIf (config.features.shells.zsh.antidote.enable) true;
}
];
};
};
flake.homeModules.global = { pkgs, osConfig, config, lib, ... }: {
flake.homeModules.global = { pkgs, config, lib, ... }: {
options.features.shells.zsh = {
enable = lib.mkEnableOption "zsh";
antidote.enable = lib.mkEnableOption "antidote";
};
config = (if (builtins.tryEval osConfig).success then (lib.mkIf (osConfig.features.shells.zsh.enable || config.features.shells.zsh.enable)) else (lib.mkIf (config.features.shells.zsh.enable))) {
config = lib.mkIf (config.features.shells.zsh.enable) {
home.shell.enableZshIntegration = true;
programs.kitty.shellIntegration.enableZshIntegration = true;
@@ -26,7 +33,7 @@
programs.zsh = {
enable = true;
completionInit = "";
antidote = (if (builtins.tryEval osConfig).success then (lib.mkIf (osConfig.features.shells.zsh.antidote.enable || config.features.shells.zsh.antidote.enable)) else (lib.mkIf (config.features.shells.zsh.antidote.enable))) {
antidote = lib.mkIf (config.features.shells.zsh.antidote.enable) {
enable = true;
plugins = [
"getantidote/use-omz"