refactor

modules/gui/browsers.nix

@@ -1,8 +1,8 @@
-{ isNixOS, lib, ... }:
+{ userConfig, lib, ... }:
 
 {
   programs.chromium = {
     enable = true;
-    package = lib.mkIf (!isNixOS) null;
+    package = lib.mkIf (!userConfig.isNixOS) null;
   };
 }

modules/gui/kitty.nix

@@ -1,9 +1,9 @@
-{ lib, isNixOS, ... }:
+{ lib, userConfig, ... }:
 
 {
   programs.kitty = {
     enable = true;
-    package = lib.mkIf (!isNixOS) null;
+    package = lib.mkIf (!userConfig.isNixOS) null;
     settings = {
       confirm_os_window_close = 0;
       dynamic_background_opacity = true;

modules/gui/mako.nix

@@ -1,4 +1,4 @@
-{ isNixOS, pkgs, ... }:
+{ userConfig, pkgs, ... }:
 
 {
   services.mako = {
@@ -21,7 +21,7 @@
       progress-color = "over #313244";
       output = "DP-1";
       on-notify =
-        if isNixOS then
+        if userConfig.isNixOS then
           "exec ${pkgs.pulseaudio}/bin/paplay ${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/dialog-information.oga"
         else
           "exec paplay /usr/share/sounds/freedesktop/stereo/dialog-information.oga";
@@ -36,7 +36,7 @@
 
       [urgency=critical]
       on-notify=${
-        if isNixOS then
+        if userConfig.isNixOS then
           "exec ${pkgs.pulseaudio}/bin/paplay ${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/dialog-information.oga"
         else
           "exec paplay /usr/share/sounds/freedesktop/stereo/dialog-information.oga"

modules/gui/mangohud.nix

@@ -1,7 +1,7 @@
 {
   config,
   pkgs,
-  isNixOS,
+  userConfig,
   ...
 }:
 
@@ -10,7 +10,7 @@
 
   programs.mangohud = {
     enable = true;
-    package = if isNixOS then pkgs.mangohud else (pkgs.runCommand "dummy-mangohud" { } "mkdir $out");
+    package = if userConfig.isNixOS then pkgs.mangohud else (pkgs.runCommand "dummy-mangohud" { } "mkdir $out");
   };
 
   xdg.configFile."MangoHud/MangoHud.conf".text = ''

modules/gui/obsidian-catppuccin.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     owner = "catppuccin";
     repo = "obsidian";
     rev = "main";
-    hash = "sha256-IGkP0z8gJj1dbNclpMebZXZvaRby1F8zGNEDPtitfqo=";
+    hash = "sha256-uB0a2nSZkHHf65xBYXyNh50vaAiqdEpKQVf3eXnCVlE=";
   };
 
   installPhase = ''

modules/gui/obsidian.nix

@@ -1,5 +1,4 @@
 {
-  isNixOS,
   lib,
   pkgs,
   userConfig,
@@ -9,7 +8,7 @@
 {
   programs.obsidian = {
     enable = true;
-    package = lib.mkIf (!isNixOS) null;
+    package = lib.mkIf (!userConfig.isNixOS) null;
 
     defaultSettings = {
       app = {

modules/gui/satty.nix

@@ -1,6 +1,5 @@
 {
   lib,
-  isNixOS,
   userConfig,
   ...
 }:
@@ -8,7 +7,7 @@
 {
   programs.satty = {
     enable = true;
-    package = lib.mkIf (!isNixOS) null;
+    package = lib.mkIf (!userConfig.isNixOS) null;
     settings = {
       general = {
         fullscreen = true;