From daf7eb8d75f156404cc0a8d782a773641f5e4ed2 Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Mon, 31 Aug 2026 20:30:05 +0200 Subject: [PATCH] Update stdenv.isLinux and stdenv.isDarwin calls --- home/homemodules/fish/default.nix | 4 ++-- home/homemodules/jellyfin-tui/default.nix | 8 ++++---- home/homemodules/kitty/default.nix | 2 +- home/homemodules/packages/default.nix | 6 +++--- home/homemodules/ssh/default.nix | 2 +- system/systemmodules/sops-nix/default.nix | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/home/homemodules/fish/default.nix b/home/homemodules/fish/default.nix index 6bffe61..4d177aa 100644 --- a/home/homemodules/fish/default.nix +++ b/home/homemodules/fish/default.nix @@ -58,7 +58,7 @@ in { in lib.mkMerge [ # Darwin exclusive config - (lib.mkIf pkgs.stdenv.isDarwin { + (lib.mkIf pkgs.stdenv.hostPlatform.isDarwin { shellInit = '' set fish_greeting yes | fish_config theme save "system-theme" @@ -81,7 +81,7 @@ in { }) # Linux exclusive config - (lib.mkIf pkgs.stdenv.isLinux { + (lib.mkIf pkgs.stdenv.hostPlatform.isLinux { generateCompletions = nixosConfig.programs.fish.generateCompletions; # TODO: There's a bug with the direnv mechanism: diff --git a/home/homemodules/jellyfin-tui/default.nix b/home/homemodules/jellyfin-tui/default.nix index 660d841..5c47b40 100644 --- a/home/homemodules/jellyfin-tui/default.nix +++ b/home/homemodules/jellyfin-tui/default.nix @@ -10,7 +10,7 @@ inherit (config.homemodules) jellyfin-tui color; systemConfig = - if pkgs.stdenv.isLinux + if pkgs.stdenv.hostPlatform.isLinux then nixosConfig else darwinConfig; in { @@ -24,7 +24,7 @@ in { file = let jellyfinUrl = - if pkgs.stdenv.isLinux + if pkgs.stdenv.hostPlatform.isLinux then "https://jellyfin.local.chriphost.de" else "https://jellyfin.vps.chriphost.de"; @@ -79,10 +79,10 @@ in { ''; in lib.mkMerge [ - (lib.optionalAttrs pkgs.stdenv.isLinux { + (lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { ".config/jellyfin-tui/config.yaml".text = configFile; }) - (lib.optionalAttrs pkgs.stdenv.isDarwin { + (lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { "Library/Application Support/jellyfin-tui/config.yaml".text = configFile; }) ]; diff --git a/home/homemodules/kitty/default.nix b/home/homemodules/kitty/default.nix index 1472235..c8bcc53 100644 --- a/home/homemodules/kitty/default.nix +++ b/home/homemodules/kitty/default.nix @@ -36,7 +36,7 @@ in { settings = lib.mkMerge [ # Linux config - (lib.mkIf pkgs.stdenv.isLinux { + (lib.mkIf pkgs.stdenv.hostPlatform.isLinux { allow_remote_control = true; # For nnn file preview or nvim scrollback listen_on = lib.mkDefault "unix:@mykitty"; # This conflicts with direnv-instant }) diff --git a/home/homemodules/packages/default.nix b/home/homemodules/packages/default.nix index 2020e40..b7ed985 100644 --- a/home/homemodules/packages/default.nix +++ b/home/homemodules/packages/default.nix @@ -81,7 +81,7 @@ in { ]) # Linux exclusive packages - (lib.optionals (pkgs.stdenv.isLinux) [ + (lib.optionals (pkgs.stdenv.hostPlatform.isLinux) [ pastel # Color tools nvd # Nix rebuild diff nurl # Generate nix fetcher sections based on URLs @@ -139,7 +139,7 @@ in { ]) # Linux exclusive packages (!headless) - (lib.optionals (pkgs.stdenv.isLinux && (!headless)) [ + (lib.optionals (pkgs.stdenv.hostPlatform.isLinux && (!headless)) [ wl-clipboard asciicam @@ -192,7 +192,7 @@ in { ]) # Darwin exclusive packages - (lib.optionals pkgs.stdenv.isDarwin [ + (lib.optionals pkgs.stdenv.hostPlatform.isDarwin [ # Use homebrew instead # alt-tab-macos # discord diff --git a/home/homemodules/ssh/default.nix b/home/homemodules/ssh/default.nix index 0fe3f6e..f4360d9 100644 --- a/home/homemodules/ssh/default.nix +++ b/home/homemodules/ssh/default.nix @@ -19,7 +19,7 @@ in { "*" = { ForwardAgent = false; AddKeysToAgent = - if pkgs.stdenv.isLinux + if pkgs.stdenv.hostPlatform.isLinux then "no" else "yes"; # Don't have keychain on darwin Compression = true; diff --git a/system/systemmodules/sops-nix/default.nix b/system/systemmodules/sops-nix/default.nix index ef4df0b..a45818d 100644 --- a/system/systemmodules/sops-nix/default.nix +++ b/system/systemmodules/sops-nix/default.nix @@ -34,11 +34,11 @@ in { secrets = let mkSecret = name: { ${name} = lib.mkMerge [ - (lib.optionalAttrs pkgs.stdenv.isLinux { + (lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { owner = config.users.users.${username}.name; group = config.users.users.${username}.group; }) - (lib.optionalAttrs pkgs.stdenv.isDarwin { + (lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { owner = config.users.users.${username}.name; group = "staff"; # Apparently there's no way to get the primary group? })