feat: isMac -> isDarwin

This commit is contained in:
uttarayan21
2025-03-13 00:33:06 +05:30
parent 6b71003bcb
commit 039585b0a9
5 changed files with 11 additions and 9 deletions

View File

@@ -5,6 +5,7 @@
];
casks = [
"firefox"
"vlc"
"librewolf"
"raycast"
"kunkun" # Soon

View File

@@ -232,7 +232,7 @@
if (builtins.hasAttr "isNix" device)
then device.isNix
else false;
isMac = !isNull (builtins.match ".*-darwin" device.system);
isDarwin = !isNull (builtins.match ".*-darwin" device.system);
hasGui =
if (builtins.hasAttr "hasGui" device)
then device.hasGui
@@ -251,7 +251,7 @@
nixos_devices = builtins.filter (x: x.isNix) devices;
linux_devices = builtins.filter (x: x.isLinux) devices;
darwin_devices = builtins.filter (x: x.isMac) devices;
darwin_devices = builtins.filter (x: x.isDarwin) devices;
overlays = import ./overlays.nix {
inherit inputs;

View File

@@ -18,7 +18,7 @@
++ lib.optionals device.isLinux [./linux]
++ lib.optionals device.hasGui [./gui-programs];
# ++ lib.optionals.device.isMac [./macos];
# ++ lib.optionals.device.isDarwin [./macos];
xdg.enable = true;
xdg.userDirs = {
@@ -35,7 +35,7 @@
home = {
username = device.user;
homeDirectory =
if device.isMac
if device.isDarwin
then lib.mkForce "/Users/${device.user}"
else lib.mkForce "/home/${device.user}";
@@ -66,7 +66,7 @@
SHELL = "${pkgs.bash}/bin/bash";
CARGO_TARGET_DIR = "${config.xdg.cacheHome}/cargo/target";
BROWSER =
if device.isMac
if device.isDarwin
then "open"
else "xdg-open";
};

View File

@@ -92,5 +92,5 @@
usbutils
ddcbacklight
]
++ lib.optionals device.isMac [];
++ lib.optionals device.isDarwin [];
}

View File

@@ -36,9 +36,10 @@
${pkgs.pfetch-rs}/bin/pfetch
${lib.optionalString (device.isLinux && !device.isNix) "source /etc/profile.d/nix-daemon.fish"}
${lib.optionalString (device.isNix && device.hasGui)
'' if not set -q HYPRLAND_INSTANCE_SIGNATURE
set -x HYPRLAND_INSTANCE_SIGNATURE (hyprctl instances | head -1 | cut -d ' ' -f2 | tr -d :)
end
''
if not set -q HYPRLAND_INSTANCE_SIGNATURE
set -x HYPRLAND_INSTANCE_SIGNATURE (hyprctl instances | head -1 | cut -d ' ' -f2 | tr -d :)
end
''}
'';
};