From 39cdad4b8b9509f46c351792f14c8c7cb2a1be77 Mon Sep 17 00:00:00 2001 From: karitham Date: Fri, 24 Apr 2026 20:26:48 +0200 Subject: [PATCH] refactor to use osConfig --- modules/desktop/apps/browser.nix | 3 ++- modules/desktop/apps/social.nix | 4 ++-- modules/desktop/audio/easyeffects.nix | 4 ++-- modules/desktop/audio/rnnoise.nix | 4 ++-- modules/desktop/terminal/ghostty.nix | 2 +- modules/desktop/wm/cursor.nix | 4 ++-- modules/desktop/wm/dunst.nix | 4 ++-- modules/desktop/wm/fuzzel.nix | 6 +++--- modules/desktop/wm/hyprlock.nix | 2 +- modules/desktop/wm/niri.nix | 3 ++- modules/desktop/wm/noctalia/default.nix | 3 ++- modules/desktop/wm/wallpaper.nix | 3 ++- modules/desktop/wm/waybar.nix | 2 +- modules/desktop/wm/xdg.nix | 9 +++++++-- modules/dev/editor/helix.nix | 4 ++-- modules/dev/shell/atuin.nix | 4 ++-- modules/dev/shell/nushell.nix | 4 ++-- modules/dev/shell/starship.nix | 4 ++-- modules/dev/shell/zellij.nix | 4 ++-- modules/dev/tools/default.nix | 4 ++-- modules/dev/tools/direnv.nix | 4 ++-- modules/dev/tools/yazi.nix | 4 ++-- modules/dev/vcs/git.nix | 3 ++- modules/dev/vcs/jj.nix | 4 ++-- modules/opencode/default.nix | 4 +++- modules/options/desktop.nix | 18 ------------------ modules/options/dev.nix | 13 ------------- 27 files changed, 54 insertions(+), 73 deletions(-) diff --git a/modules/desktop/apps/browser.nix b/modules/desktop/apps/browser.nix index 65c8001..ff91802 100644 --- a/modules/desktop/apps/browser.nix +++ b/modules/desktop/apps/browser.nix @@ -1,12 +1,13 @@ { lib, config, + osConfig, pkgs, inputs', ... }: { - config = lib.mkIf config.desktop.apps.enable { + config = lib.mkIf osConfig.desktop.apps.enable { home = { packages = [ pkgs.firefox-devedition diff --git a/modules/desktop/apps/social.nix b/modules/desktop/apps/social.nix index a8a0dc9..76c13e6 100644 --- a/modules/desktop/apps/social.nix +++ b/modules/desktop/apps/social.nix @@ -1,11 +1,11 @@ { lib, - config, + osConfig, pkgs, ... }: { - config = lib.mkIf config.desktop.apps.enable { + config = lib.mkIf osConfig.desktop.apps.enable { programs.vesktop.enable = true; home.packages = [ pkgs.signal-desktop ]; }; diff --git a/modules/desktop/audio/easyeffects.nix b/modules/desktop/audio/easyeffects.nix index c814902..9dbb089 100644 --- a/modules/desktop/audio/easyeffects.nix +++ b/modules/desktop/audio/easyeffects.nix @@ -1,6 +1,6 @@ -{ lib, config, ... }: +{ lib, osConfig, ... }: { - config = lib.mkIf config.desktop.audio.enable { + config = lib.mkIf osConfig.desktop.audio.enable { xdg.dataFile."easyeffects/output".source = ./easyeffects; services.easyeffects = { enable = true; diff --git a/modules/desktop/audio/rnnoise.nix b/modules/desktop/audio/rnnoise.nix index 4f7587c..c752c0a 100644 --- a/modules/desktop/audio/rnnoise.nix +++ b/modules/desktop/audio/rnnoise.nix @@ -1,11 +1,11 @@ { - config, + osConfig, lib, pkgs, ... }: { - config = lib.mkIf config.desktop.audio.enable { + config = lib.mkIf osConfig.desktop.audio.enable { xdg.configFile."pipewire/pipewire.conf.d/99-input-denoising.conf".text = builtins.toJSON { "context.modules" = [ { diff --git a/modules/desktop/terminal/ghostty.nix b/modules/desktop/terminal/ghostty.nix index a82d4b8..2c141b3 100644 --- a/modules/desktop/terminal/ghostty.nix +++ b/modules/desktop/terminal/ghostty.nix @@ -5,7 +5,7 @@ ... }: { - config = lib.mkIf config.desktop.terminal.enable { + config = lib.mkIf osConfig.desktop.terminal.enable { programs.ghostty = { enable = true; settings = { diff --git a/modules/desktop/wm/cursor.nix b/modules/desktop/wm/cursor.nix index 4bb5c17..63ff94b 100644 --- a/modules/desktop/wm/cursor.nix +++ b/modules/desktop/wm/cursor.nix @@ -1,6 +1,6 @@ -{ lib, config, ... }: +{ lib, osConfig, ... }: { - config = lib.mkIf config.desktop.wm.enable { + config = lib.mkIf osConfig.desktop.wm.enable { catppuccin.cursors.enable = true; home.pointerCursor = { gtk.enable = true; diff --git a/modules/desktop/wm/dunst.nix b/modules/desktop/wm/dunst.nix index 6359c32..0e52c68 100644 --- a/modules/desktop/wm/dunst.nix +++ b/modules/desktop/wm/dunst.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ osConfig, ... }: { - services.dunst.enable = config.desktop.notification.enable; + services.dunst.enable = osConfig.desktop.notification.enable; } diff --git a/modules/desktop/wm/fuzzel.nix b/modules/desktop/wm/fuzzel.nix index fd786bb..d2c2e80 100644 --- a/modules/desktop/wm/fuzzel.nix +++ b/modules/desktop/wm/fuzzel.nix @@ -1,18 +1,18 @@ { - config, + osConfig, lib, pkgs, ... }: { - programs.fuzzel = lib.mkIf config.desktop.launcher.enable { + programs.fuzzel = lib.mkIf osConfig.desktop.launcher.enable { enable = true; settings.main = { terminal = "ghostty"; }; }; - programs.niri.settings.binds = lib.mkIf config.desktop.launcher.enable { + programs.niri.settings.binds = lib.mkIf osConfig.desktop.launcher.enable { "Mod+R".action.spawn = "${lib.getExe pkgs.fuzzel}"; }; } diff --git a/modules/desktop/wm/hyprlock.nix b/modules/desktop/wm/hyprlock.nix index cc62be0..48ced57 100644 --- a/modules/desktop/wm/hyprlock.nix +++ b/modules/desktop/wm/hyprlock.nix @@ -5,7 +5,7 @@ ... }: { - config = lib.mkIf config.desktop.hyprlock.enable { + config = lib.mkIf osConfig.desktop.hyprlock.enable { services.hypridle = { enable = true; settings = { diff --git a/modules/desktop/wm/niri.nix b/modules/desktop/wm/niri.nix index 0da9a68..3ff498c 100644 --- a/modules/desktop/wm/niri.nix +++ b/modules/desktop/wm/niri.nix @@ -1,11 +1,12 @@ { config, + osConfig, lib, pkgs, ... }: { - config = lib.mkIf config.desktop.wm.enable { + config = lib.mkIf osConfig.desktop.wm.enable { home.packages = [ pkgs.nautilus ]; # xdg-desktop-portal-gnome wants it programs.niri = { settings = { diff --git a/modules/desktop/wm/noctalia/default.nix b/modules/desktop/wm/noctalia/default.nix index 39f3cc9..3363224 100644 --- a/modules/desktop/wm/noctalia/default.nix +++ b/modules/desktop/wm/noctalia/default.nix @@ -1,6 +1,7 @@ { inputs, config, + osConfig, lib, ... }: @@ -10,7 +11,7 @@ in { imports = [ inputs.noctalia.homeModules.default ]; - config = lib.mkIf config.desktop.noctalia.enable { + config = lib.mkIf osConfig.desktop.noctalia.enable { qt = { enable = true; style.name = "kvantum"; diff --git a/modules/desktop/wm/wallpaper.nix b/modules/desktop/wm/wallpaper.nix index 080f518..e4bc4a0 100644 --- a/modules/desktop/wm/wallpaper.nix +++ b/modules/desktop/wm/wallpaper.nix @@ -1,11 +1,12 @@ { config, + osConfig, lib, pkgs, ... }: { - config = lib.mkIf config.desktop.wallpaper.enable { + config = lib.mkIf osConfig.desktop.wallpaper.enable { services.swww = { enable = true; }; diff --git a/modules/desktop/wm/waybar.nix b/modules/desktop/wm/waybar.nix index a145aa5..5a0d714 100644 --- a/modules/desktop/wm/waybar.nix +++ b/modules/desktop/wm/waybar.nix @@ -6,7 +6,7 @@ ... }: { - config = lib.mkIf config.desktop.waybar.enable { + config = lib.mkIf osConfig.desktop.waybar.enable { programs.niri.settings.spawn-at-startup = [ { command = [ "systemctl --user restart waybar.service" ]; } ]; programs.waybar = { enable = true; diff --git a/modules/desktop/wm/xdg.nix b/modules/desktop/wm/xdg.nix index ae61e37..94143c7 100644 --- a/modules/desktop/wm/xdg.nix +++ b/modules/desktop/wm/xdg.nix @@ -1,6 +1,11 @@ -{ config, lib, ... }: { - config = lib.mkIf config.desktop.wm.enable { + config, + lib, + osConfig, + ... +}: +{ + config = lib.mkIf osConfig.desktop.wm.enable { xdg.mimeApps = let editor = "Helix.desktop"; diff --git a/modules/dev/editor/helix.nix b/modules/dev/editor/helix.nix index 0adcf2b..3df0771 100644 --- a/modules/dev/editor/helix.nix +++ b/modules/dev/editor/helix.nix @@ -3,7 +3,7 @@ pkgs, inputs, inputs', - config, + osConfig, ... }: let @@ -29,7 +29,7 @@ let nufmt ]; in -lib.mkIf config.dev.editor.enable { +lib.mkIf osConfig.dev.editor.enable { home.packages = global-tools; xdg.configFile."helix/init.scm".text = '' diff --git a/modules/dev/shell/atuin.nix b/modules/dev/shell/atuin.nix index 9ad583f..455d67e 100644 --- a/modules/dev/shell/atuin.nix +++ b/modules/dev/shell/atuin.nix @@ -1,6 +1,6 @@ -{ config, lib, ... }: +{ osConfig, lib, ... }: { - config = lib.mkIf config.dev.shell.enable { + config = lib.mkIf osConfig.dev.shell.enable { programs.atuin = { enable = true; flags = [ "--disable-up-arrow" ]; diff --git a/modules/dev/shell/nushell.nix b/modules/dev/shell/nushell.nix index c641b74..42963c6 100644 --- a/modules/dev/shell/nushell.nix +++ b/modules/dev/shell/nushell.nix @@ -1,12 +1,12 @@ { - config, + osConfig, lib, pkgs, self', ... }: { - config = lib.mkIf config.dev.shell.enable { + config = lib.mkIf osConfig.dev.shell.enable { home.packages = [ pkgs.moreutils ]; # vipe, chronic, pee programs.nushell = { enable = true; diff --git a/modules/dev/shell/starship.nix b/modules/dev/shell/starship.nix index 44bd4ae..9a9e91e 100644 --- a/modules/dev/shell/starship.nix +++ b/modules/dev/shell/starship.nix @@ -1,11 +1,11 @@ { - config, + osConfig, pkgs, lib, ... }: { - config = lib.mkIf config.dev.shell.enable { + config = lib.mkIf osConfig.dev.shell.enable { home.packages = [ pkgs.jj-starship ]; programs.starship = { enable = true; diff --git a/modules/dev/shell/zellij.nix b/modules/dev/shell/zellij.nix index eb2bdbd..d049e6f 100644 --- a/modules/dev/shell/zellij.nix +++ b/modules/dev/shell/zellij.nix @@ -1,7 +1,7 @@ { pkgs, lib, - config, + osConfig, ... }: let @@ -10,7 +10,7 @@ let sha256 = "0lyxah0pzgw57wbrvfz2y0bjrna9bgmsw9z9f898dgqw1g92dr2d"; }; in -lib.mkIf config.dev.shell.enable { +lib.mkIf osConfig.dev.shell.enable { programs.zellij = { enable = true; settings = { diff --git a/modules/dev/tools/default.nix b/modules/dev/tools/default.nix index 5eb6368..9117806 100644 --- a/modules/dev/tools/default.nix +++ b/modules/dev/tools/default.nix @@ -1,5 +1,5 @@ { - config, + osConfig, lib, pkgs, ... @@ -17,7 +17,7 @@ let ]; in { - config = lib.mkIf config.dev.tools.enable { + config = lib.mkIf osConfig.dev.tools.enable { home.packages = [ pkgs.sd pkgs.fd diff --git a/modules/dev/tools/direnv.nix b/modules/dev/tools/direnv.nix index bcf5fbd..7e7d662 100644 --- a/modules/dev/tools/direnv.nix +++ b/modules/dev/tools/direnv.nix @@ -1,6 +1,6 @@ -{ config, lib, ... }: +{ osConfig, lib, ... }: { - config = lib.mkIf config.dev.tools.enable { + config = lib.mkIf osConfig.dev.tools.enable { programs.direnv = { enable = true; nix-direnv.enable = true; diff --git a/modules/dev/tools/yazi.nix b/modules/dev/tools/yazi.nix index 5cc39ad..5031c13 100644 --- a/modules/dev/tools/yazi.nix +++ b/modules/dev/tools/yazi.nix @@ -1,6 +1,6 @@ -{ config, lib, ... }: +{ osConfig, lib, ... }: { - config = lib.mkIf config.dev.tools.enable { + config = lib.mkIf osConfig.dev.tools.enable { programs.yazi = { enable = true; }; diff --git a/modules/dev/vcs/git.nix b/modules/dev/vcs/git.nix index 2fa04d5..186d78b 100644 --- a/modules/dev/vcs/git.nix +++ b/modules/dev/vcs/git.nix @@ -1,11 +1,12 @@ { config, + osConfig, lib, pkgs, ... }: { - config = lib.mkIf config.dev.vcs.enable { + config = lib.mkIf osConfig.dev.vcs.enable { home.packages = [ pkgs.gh ]; programs.git = { enable = true; diff --git a/modules/dev/vcs/jj.nix b/modules/dev/vcs/jj.nix index a439a26..b400f1d 100644 --- a/modules/dev/vcs/jj.nix +++ b/modules/dev/vcs/jj.nix @@ -1,6 +1,6 @@ -{ config, lib, ... }: +{ osConfig, lib, ... }: { - config = lib.mkIf config.dev.vcs.enable { + config = lib.mkIf osConfig.dev.vcs.enable { programs.jujutsu = { enable = true; diff --git a/modules/opencode/default.nix b/modules/opencode/default.nix index 0ca0186..5647092 100644 --- a/modules/opencode/default.nix +++ b/modules/opencode/default.nix @@ -3,6 +3,7 @@ lib, pkgs, self', + osConfig, ... }: let @@ -35,8 +36,9 @@ let }; cfg = config.dev.opencode; + osCfg = osConfig.dev.opencode; in -lib.mkIf cfg.enable { +lib.mkIf osCfg.enable { xdg.configFile."opencode/skills".source = pkgs.symlinkJoin { name = "opencode-skills"; paths = [ diff --git a/modules/options/desktop.nix b/modules/options/desktop.nix index 3efbbd8..fcbe5cf 100644 --- a/modules/options/desktop.nix +++ b/modules/options/desktop.nix @@ -32,23 +32,5 @@ in desktop.audio.enable = mkIf cfg.enable true; desktop.apps.enable = mkIf cfg.enable true; - home-manager.sharedModules = [ - { - options.desktop = sharedOptions; - config.desktop = { - enable = cfg.enable; - wm.enable = cfg.wm.enable; - noctalia.enable = cfg.noctalia.enable; - waybar.enable = cfg.waybar.enable; - hyprlock.enable = cfg.hyprlock.enable; - wallpaper.enable = cfg.wallpaper.enable; - notification.enable = cfg.notification.enable; - launcher.enable = cfg.launcher.enable; - terminal.enable = cfg.terminal.enable; - audio.enable = cfg.audio.enable; - apps.enable = cfg.apps.enable; - }; - } - ]; }; } diff --git a/modules/options/dev.nix b/modules/options/dev.nix index 09698be..94ef70c 100644 --- a/modules/options/dev.nix +++ b/modules/options/dev.nix @@ -23,18 +23,5 @@ in dev.tools.enable = mkIf cfg.enable true; dev.opencode.enable = mkIf cfg.enable true; - home-manager.sharedModules = [ - { - options.dev = sharedOptions; - config.dev = { - enable = cfg.enable; - shell.enable = cfg.shell.enable; - editor.enable = cfg.editor.enable; - vcs.enable = cfg.vcs.enable; - tools.enable = cfg.tools.enable; - opencode.enable = cfg.opencode.enable; - }; - } - ]; }; } -- 2.51.2