feat: isMac -> isDarwin
This commit is contained in:
@@ -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";
|
||||
};
|
||||
|
||||
@@ -92,5 +92,5 @@
|
||||
usbutils
|
||||
ddcbacklight
|
||||
]
|
||||
++ lib.optionals device.isMac [];
|
||||
++ lib.optionals device.isDarwin [];
|
||||
}
|
||||
|
||||
@@ -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
|
||||
''}
|
||||
'';
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user