From 4ba1ed807c59d31d9a770780e861adeb4f4396ad Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Mon, 24 Aug 2026 20:20:37 -0600 Subject: [PATCH] fix(nix): resolve stdenv deprecation warnings and gemini-cli deprecation --- docs/CHANGELOG.md | 6 +++++ pkgs/applications/misc/volnoti/package.nix | 2 +- pkgs/slsk-batchdl/package.nix | 2 +- pkgs/tools/misc/installer/package.nix | 2 +- pkgs/tools/misc/rebuild/package.nix | 2 +- .../nmasur/presets/programs/_1password.nix | 2 +- .../modules/nmasur/presets/programs/aerc.nix | 6 ++--- .../nmasur/presets/programs/calibre.nix | 4 ++-- .../nmasur/presets/programs/chawan.nix | 2 +- .../nmasur/presets/programs/firefox.nix | 6 ++--- .../nmasur/presets/programs/ghostty.nix | 6 ++--- .../modules/nmasur/presets/programs/helix.nix | 2 +- .../modules/nmasur/presets/programs/kitty.nix | 2 +- .../nmasur/presets/programs/neovim.nix | 2 +- .../presets/programs/nixpkgs-darwin.nix | 2 +- .../modules/nmasur/presets/programs/noti.nix | 2 +- .../nmasur/presets/programs/starship.nix | 2 +- .../nmasur/presets/programs/wezterm.nix | 6 ++--- .../nmasur/presets/programs/zellij.nix | 22 +++++++++---------- .../nmasur/presets/services/mbsync/mbsync.nix | 4 ++-- .../modules/nmasur/profiles/common.nix | 2 +- .../modules/nmasur/profiles/experimental.nix | 1 - .../services/daily-summary/daily-summary.nix | 4 ++-- 23 files changed, 48 insertions(+), 43 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 8dd143b3..cd87ef77 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -2,6 +2,12 @@ ## 2026-08-25 +- Fixed Nix evaluation warnings for `stdenv` deprecation and `gemini-cli`: + - Replaced deprecated `stdenv.isLinux` and `stdenv.isDarwin` checks across module presets and package definitions with `stdenv.hostPlatform.isLinux` and `stdenv.hostPlatform.isDarwin`. + - Replaced deprecated `pkgs.gemini-cli` with `pkgs.antigravity-cli` (and updated binary invocation to `agy`) in `experimental.nix` profile and `daily-summary.nix` launchd service. + +## 2026-08-25 + - Fixed multi-second hang and permanent typing latency in Fish after exiting TUIs inside Zellij and Ghostty: - Exported `fish_features = "no-query-term"` in `home.sessionVariables` and added `set -gx fish_features no-query-term` to Fish's top-level `shellInit`. Previous attempt (`set -a fish_features no-query-term` in `interactiveShellInit`) set a local variable inside an anonymous initialization function block that went out of scope immediately after startup. Furthermore, Fish reads `fish_features` at binary launch before interactive init functions run. Without `no-query-term` exported prior to Fish startup, Fish attempted terminal feature queries (Primary Device Attributes `DA1` / `\e[?c` and termcap) whenever a TUI (e.g. Neovim, Lazygit, Yazi) exited and returned control to Fish. Zellij drops or delays DA1 response sequences, causing Fish to block on a multi-second stdin timeout, followed by severe input reader desynchronization and typing latency on every subsequent keystroke. - Disabled `programs.ghostty.enableFishIntegration` and conditionally sourced Ghostty's shell integration script in `shellInit` only when NOT running inside a multiplexer (`not set -q ZELLIJ` and `not set -q TMUX`). Sourcing Ghostty's shell integration inside Zellij sent duplicate and conflicting OSC 133 prompt markers and DECSCUSR cursor escape sequences to Zellij's PTY parser. diff --git a/pkgs/applications/misc/volnoti/package.nix b/pkgs/applications/misc/volnoti/package.nix index 8697dfa6..9a150a56 100644 --- a/pkgs/applications/misc/volnoti/package.nix +++ b/pkgs/applications/misc/volnoti/package.nix @@ -1,7 +1,7 @@ # Fix: Volnoti error: 'volnoti' has been removed due to lack of maintenance upstream. { pkgs, lib, ... }: -if !pkgs.stdenv.isLinux then +if !pkgs.stdenv.hostPlatform.isLinux then null else pkgs.stdenv.mkDerivation { diff --git a/pkgs/slsk-batchdl/package.nix b/pkgs/slsk-batchdl/package.nix index 08a1e313..fddfa0c6 100644 --- a/pkgs/slsk-batchdl/package.nix +++ b/pkgs/slsk-batchdl/package.nix @@ -6,7 +6,7 @@ dotnetCorePackages, }: -if !stdenv.isLinux then +if !stdenv.hostPlatform.isLinux then null else buildDotnetModule rec { diff --git a/pkgs/tools/misc/installer/package.nix b/pkgs/tools/misc/installer/package.nix index 7b9dda72..9ff5fd55 100644 --- a/pkgs/tools/misc/installer/package.nix +++ b/pkgs/tools/misc/installer/package.nix @@ -3,7 +3,7 @@ # Inspired by https://github.com/cleverca22/nix-tests/blob/master/kexec/justdoit.nix # This script will partition and format drives; use at your own risk! -if !pkgs.stdenv.isLinux then +if !pkgs.stdenv.hostPlatform.isLinux then null else pkgs.writeShellScriptBin "installer" '' diff --git a/pkgs/tools/misc/rebuild/package.nix b/pkgs/tools/misc/rebuild/package.nix index acbe71a4..475a1912 100644 --- a/pkgs/tools/misc/rebuild/package.nix +++ b/pkgs/tools/misc/rebuild/package.nix @@ -2,7 +2,7 @@ pkgs.writeShellScriptBin "rebuild" '' echo ${pkgs.stdenv.hostPlatform.system} - SYSTEM=${if pkgs.stdenv.isDarwin then "darwin" else "linux"} + SYSTEM=${if pkgs.stdenv.hostPlatform.isDarwin then "darwin" else "linux"} if [ "$SYSTEM" == "darwin" ]; then sudo darwin-rebuild switch --flake ${builtins.toString ../../../../.} else diff --git a/platforms/home-manager/modules/nmasur/presets/programs/_1password.nix b/platforms/home-manager/modules/nmasur/presets/programs/_1password.nix index 4690ad51..b51c3e8c 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/_1password.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/_1password.nix @@ -23,7 +23,7 @@ in home.packages = [ pkgs._1password-cli ] - ++ (if pkgs.stdenv.isLinux then [ pkgs._1password-gui ] else [ ]); + ++ (if pkgs.stdenv.hostPlatform.isLinux then [ pkgs._1password-gui ] else [ ]); # # Firefox extension # programs.firefox.profiles.default.extensions.packages = [ diff --git a/platforms/home-manager/modules/nmasur/presets/programs/aerc.nix b/platforms/home-manager/modules/nmasur/presets/programs/aerc.nix index adca82b1..6cbf93ec 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/aerc.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/aerc.nix @@ -203,13 +203,13 @@ in }; # Used for macOS - xdg.enable = lib.mkIf pkgs.stdenv.isDarwin true; + xdg.enable = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin true; - xdg.desktopEntries.aerc = lib.mkIf (pkgs.stdenv.isLinux) { + xdg.desktopEntries.aerc = lib.mkIf (pkgs.stdenv.hostPlatform.isLinux) { name = "aerc"; exec = "${lib.getExe config.nmasur.presets.services.i3.terminal} -e aerc %u"; }; - xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux { + xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.hostPlatform.isLinux { "${config.xsession.windowManager.i3.config.modifier}+Shift+e" = let terminal = config.nmasur.presets.services.i3.terminal; diff --git a/platforms/home-manager/modules/nmasur/presets/programs/calibre.nix b/platforms/home-manager/modules/nmasur/presets/programs/calibre.nix index 75ca873a..50663803 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/calibre.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/calibre.nix @@ -14,12 +14,12 @@ in options.nmasur.presets.programs.calibre.enable = lib.mkEnableOption "Calibre e-book manager"; config = lib.mkIf cfg.enable { - home.packages = lib.mkIf pkgs.stdenv.isLinux [ pkgs.calibre ]; + home.packages = lib.mkIf pkgs.stdenv.hostPlatform.isLinux [ pkgs.calibre ]; home.sessionVariables = { CALIBRE_USE_DARK_PALETTE = 1; }; - home.file.".Brewfile".text = lib.mkIf pkgs.stdenv.isDarwin /* homebrew */ '' + home.file.".Brewfile".text = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin /* homebrew */ '' cask "calibre" # Nix package broken on macOS ''; diff --git a/platforms/home-manager/modules/nmasur/presets/programs/chawan.nix b/platforms/home-manager/modules/nmasur/presets/programs/chawan.nix index cb409ffd..bb296fbe 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/chawan.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/chawan.nix @@ -18,7 +18,7 @@ in programs.chawan = { enable = true; settings = { - external.copy-cmd = if pkgs.stdenv.isLinux then "xclip -selection clipboard -in" else "pbcopy"; + external.copy-cmd = if pkgs.stdenv.hostPlatform.isLinux then "xclip -selection clipboard -in" else "pbcopy"; }; }; diff --git a/platforms/home-manager/modules/nmasur/presets/programs/firefox.nix b/platforms/home-manager/modules/nmasur/presets/programs/firefox.nix index 309281ca..5a6bbad7 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/firefox.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/firefox.nix @@ -25,7 +25,7 @@ in enable = true; package = pkgs.firefox; # Use appropriate default path depending on the OS - configPath = if pkgs.stdenv.isDarwin then "Library/Application Support/Firefox" else ".mozilla/firefox"; + configPath = if pkgs.stdenv.hostPlatform.isDarwin then "Library/Application Support/Firefox" else ".mozilla/firefox"; profiles.default = { id = 0; name = "default"; @@ -57,7 +57,7 @@ in "app.update.auto" = false; "browser.aboutConfig.showWarning" = false; "browser.warnOnQuit" = false; - "browser.quitShortcut.disabled" = if pkgs.stdenv.isLinux then true else false; + "browser.quitShortcut.disabled" = if pkgs.stdenv.hostPlatform.isLinux then true else false; "browser.theme.dark-private-windows" = true; "browser.toolbars.bookmarks.visibility" = false; "browser.startup.page" = 3; # Restore previous session @@ -189,7 +189,7 @@ in }; - xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.isLinux { + xsession.windowManager.i3.config.keybindings = lib.mkIf pkgs.stdenv.hostPlatform.isLinux { "${config.xsession.windowManager.i3.config.modifier}+Shift+b" = "exec ${ # Don't name the script `firefox` or it will affect grep toString ( diff --git a/platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix b/platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix index 39457dab..1ed652c6 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/ghostty.nix @@ -21,7 +21,7 @@ in programs.ghostty = { enable = true; - package = if pkgs.stdenv.isDarwin then pkgs.ghostty-bin else pkgs.ghostty; + package = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.ghostty-bin else pkgs.ghostty; enableFishIntegration = false; # Handled conditionally below to avoid conflicts inside Zellij/TMUX enableBashIntegration = true; @@ -33,8 +33,8 @@ in macos-titlebar-style = "hidden"; window-decoration = false; macos-non-native-fullscreen = true; - quit-after-last-window-closed = lib.mkIf pkgs.stdenv.isDarwin true; - fullscreen = if pkgs.stdenv.isDarwin then true else false; + quit-after-last-window-closed = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin true; + fullscreen = if pkgs.stdenv.hostPlatform.isDarwin then true else false; keybind = [ "super+t=unbind" # Pass super-t to underlying tool (e.g. zellij tabs) "super+shift+]=unbind" diff --git a/platforms/home-manager/modules/nmasur/presets/programs/helix.nix b/platforms/home-manager/modules/nmasur/presets/programs/helix.nix index 291bd058..884d8fa6 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/helix.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/helix.nix @@ -723,7 +723,7 @@ in # Create a desktop option for launching Helix from a file manager # (Requires launching the terminal and then executing Helix) xdg.desktopEntries.helix = - lib.mkIf (pkgs.stdenv.isLinux && config.nmasur.presets.services.i3.enable) + lib.mkIf (pkgs.stdenv.hostPlatform.isLinux && config.nmasur.presets.services.i3.enable) { name = "Helix wrapper"; exec = ''sh -c "${lib.getExe config.nmasur.presets.services.i3.terminal} --command='hx \$1'" _ %F ''; # TODO: change to work for any terminal diff --git a/platforms/home-manager/modules/nmasur/presets/programs/kitty.nix b/platforms/home-manager/modules/nmasur/presets/programs/kitty.nix index 77958235..0e82c55a 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/kitty.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/kitty.nix @@ -18,7 +18,7 @@ in nmasur.presets.services.i3.terminal = pkgs.kitty; # Set the Rofi terminal for running programs - programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux (lib.mkDefault "${pkgs.kitty}/bin/kitty"); + programs.rofi.terminal = lib.mkIf pkgs.stdenv.hostPlatform.isLinux (lib.mkDefault "${pkgs.kitty}/bin/kitty"); # Display images in the terminal programs.fish.interactiveShellInit = # fish diff --git a/platforms/home-manager/modules/nmasur/presets/programs/neovim.nix b/platforms/home-manager/modules/nmasur/presets/programs/neovim.nix index 3c96470d..48367d7e 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/neovim.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/neovim.nix @@ -63,7 +63,7 @@ in # Create a desktop option for launching Neovim from a file manager # (Requires launching the terminal and then executing Neovim) xdg.desktopEntries.nvim = - lib.mkIf (pkgs.stdenv.isLinux && config.nmasur.presets.services.i3.enable) + lib.mkIf (pkgs.stdenv.hostPlatform.isLinux && config.nmasur.presets.services.i3.enable) { name = "Neovim wrapper"; exec = ''${lib.getExe config.nmasur.presets.services.i3.terminal} --command="nvim %F"''; # TODO: change to generic diff --git a/platforms/home-manager/modules/nmasur/presets/programs/nixpkgs-darwin.nix b/platforms/home-manager/modules/nmasur/presets/programs/nixpkgs-darwin.nix index 58a47129..500ab544 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/nixpkgs-darwin.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/nixpkgs-darwin.nix @@ -15,7 +15,7 @@ in description = "Nixpkgs tools for macOS"; default = config.nmasur.presets.programs.nixpkgs.enable - && pkgs.stdenv.isDarwin + && pkgs.stdenv.hostPlatform.isDarwin && config.nmasur.presets.programs.dotfiles.enable; }; diff --git a/platforms/home-manager/modules/nmasur/presets/programs/noti.nix b/platforms/home-manager/modules/nmasur/presets/programs/noti.nix index 4062b742..1e5e074d 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/noti.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/noti.nix @@ -13,7 +13,7 @@ in options.nmasur.presets.programs.noti.enable = lib.mkEnableOption "Noti CLI notifications"; - config = lib.mkIf (cfg.enable && (pkgs.stdenv.isDarwin || config.services.dunst.enable)) { + config = lib.mkIf (cfg.enable && (pkgs.stdenv.hostPlatform.isDarwin || config.services.dunst.enable)) { home.packages = [ pkgs.noti ]; programs.fish = { shellAbbrs = { diff --git a/platforms/home-manager/modules/nmasur/presets/programs/starship.nix b/platforms/home-manager/modules/nmasur/presets/programs/starship.nix index 51190ec0..c5f83bff 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/starship.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/starship.nix @@ -42,7 +42,7 @@ in }; cmd_duration = { min_time = 5001; - show_notifications = if pkgs.stdenv.isLinux then false else true; + show_notifications = if pkgs.stdenv.hostPlatform.isLinux then false else true; min_time_to_notify = 30000; format = "[$duration]($style) "; }; diff --git a/platforms/home-manager/modules/nmasur/presets/programs/wezterm.nix b/platforms/home-manager/modules/nmasur/presets/programs/wezterm.nix index 5495e40a..db828d14 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/wezterm.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/wezterm.nix @@ -105,7 +105,7 @@ in } config.font = wezterm.font('${cfg.font}', { weight = 'Bold'}) - config.font_size = ${if pkgs.stdenv.isLinux then "14.0" else "18.0"} + config.font_size = ${if pkgs.stdenv.hostPlatform.isLinux then "14.0" else "18.0"} -- Fix color blocks instead of text config.front_end = "WebGpu" @@ -114,7 +114,7 @@ in config.hide_tab_bar_if_only_one_tab = true config.window_frame = { font = wezterm.font('${cfg.font}', { weight = 'Bold'}), - font_size = ${if pkgs.stdenv.isLinux then "12.0" else "16.0"}, + font_size = ${if pkgs.stdenv.hostPlatform.isLinux then "12.0" else "16.0"}, } config.colors = { @@ -191,7 +191,7 @@ in -- super-t open new tab in new dir { key = 't', - mods = ${if pkgs.stdenv.isDarwin then "'SUPER'" else "'ALT'"}, + mods = ${if pkgs.stdenv.hostPlatform.isDarwin then "'SUPER'" else "'ALT'"}, action = wezterm.action.SpawnCommandInNewTab { cwd = wezterm.home_dir, }, diff --git a/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix b/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix index b8167894..ab2209dd 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/zellij.nix @@ -140,17 +140,17 @@ in show_startup_tips = false; keybinds = { - locked = lib.mkIf (pkgs.stdenv.isLinux && !config.programs.ghostty.enable) { + locked = lib.mkIf (pkgs.stdenv.hostPlatform.isLinux && !config.programs.ghostty.enable) { # For servers that I SSH into, use c-a-G to unlock - "bind \"Ctrl Alt G\"" = lib.mkIf (pkgs.stdenv.isLinux && !config.programs.ghostty.enable) { + "bind \"Ctrl Alt G\"" = lib.mkIf (pkgs.stdenv.hostPlatform.isLinux && !config.programs.ghostty.enable) { SwitchToMode = { _args = [ "normal" ]; }; }; }; - normal = lib.mkIf (pkgs.stdenv.isLinux && !config.programs.ghostty.enable) { + normal = lib.mkIf (pkgs.stdenv.hostPlatform.isLinux && !config.programs.ghostty.enable) { # For servers that I SSH into, use c-a-G to lock - "bind \"Ctrl Alt G\"" = lib.mkIf (pkgs.stdenv.isLinux && !config.programs.ghostty.enable) { + "bind \"Ctrl Alt G\"" = lib.mkIf (pkgs.stdenv.hostPlatform.isLinux && !config.programs.ghostty.enable) { SwitchToMode = { _args = [ "locked" ]; }; @@ -180,7 +180,7 @@ in "bind \"Alt Shift s\"" = { Run = { _args = - if pkgs.stdenv.isDarwin then + if pkgs.stdenv.hostPlatform.isDarwin then [ # "env" # "PATH=/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin" @@ -254,7 +254,7 @@ in "bind \"Alt Shift j\"" = { Run = { _args = - if pkgs.stdenv.isDarwin then + if pkgs.stdenv.hostPlatform.isDarwin then [ "env" "PATH=${config.home.homeDirectory}/.nix-profile/bin:/etc/profiles/per-user/${username}/bin:/usr/bin" @@ -295,24 +295,24 @@ in "bind \"Ctrl Shift Tab\"" = { GoToPreviousTab = { }; }; - "bind \"Super t\"" = lib.mkIf pkgs.stdenv.isDarwin { + "bind \"Super t\"" = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin { NewTab = { }; }; - "bind \"Alt t\"" = lib.mkIf pkgs.stdenv.isLinux { + "bind \"Alt t\"" = lib.mkIf pkgs.stdenv.hostPlatform.isLinux { NewTab = { }; }; - "bind \"Super k\"" = lib.mkIf pkgs.stdenv.isDarwin { + "bind \"Super k\"" = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin { SwitchToMode = { _args = [ "scroll" ]; }; }; - "bind \"Super Shift e\"" = lib.mkIf pkgs.stdenv.isDarwin { + "bind \"Super Shift e\"" = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin { EditScrollback = { }; SwitchToMode = { _args = [ "locked" ]; }; }; - "bind \"Alt Shift e\"" = lib.mkIf pkgs.stdenv.isLinux { + "bind \"Alt Shift e\"" = lib.mkIf pkgs.stdenv.hostPlatform.isLinux { EditScrollback = { }; SwitchToMode = { _args = [ "locked" ]; diff --git a/platforms/home-manager/modules/nmasur/presets/services/mbsync/mbsync.nix b/platforms/home-manager/modules/nmasur/presets/services/mbsync/mbsync.nix index 94052e9a..10c63886 100644 --- a/platforms/home-manager/modules/nmasur/presets/services/mbsync/mbsync.nix +++ b/platforms/home-manager/modules/nmasur/presets/services/mbsync/mbsync.nix @@ -43,14 +43,14 @@ in }; # Automatically check for mail and keep files synced locally - services.mbsync = lib.mkIf pkgs.stdenv.isLinux { + services.mbsync = lib.mkIf pkgs.stdenv.hostPlatform.isLinux { enable = true; frequency = "*:0/5"; postExec = "${lib.getExe pkgs.notmuch} new"; }; # Used to watch for new mail and trigger sync - services.imapnotify.enable = pkgs.stdenv.isLinux; + services.imapnotify.enable = pkgs.stdenv.hostPlatform.isLinux; # Allows sending email from CLI/sendmail programs.msmtp.enable = true; diff --git a/platforms/home-manager/modules/nmasur/profiles/common.nix b/platforms/home-manager/modules/nmasur/profiles/common.nix index 0d13731b..984d58cd 100644 --- a/platforms/home-manager/modules/nmasur/profiles/common.nix +++ b/platforms/home-manager/modules/nmasur/profiles/common.nix @@ -15,7 +15,7 @@ in home.username = config.nmasur.settings.username; home.homeDirectory = - if pkgs.stdenv.isDarwin then "/Users/${config.home.username}" else "/home/${config.home.username}"; + if pkgs.stdenv.hostPlatform.isDarwin then "/Users/${config.home.username}" else "/home/${config.home.username}"; home.packages = [ pkgs.dig # DNS lookup diff --git a/platforms/home-manager/modules/nmasur/profiles/experimental.nix b/platforms/home-manager/modules/nmasur/profiles/experimental.nix index 2b36633d..f6756845 100644 --- a/platforms/home-manager/modules/nmasur/profiles/experimental.nix +++ b/platforms/home-manager/modules/nmasur/profiles/experimental.nix @@ -40,7 +40,6 @@ in # LLM - pkgs.gemini-cli # AI LLM Agent pkgs.antigravity-cli # AI LLM Agent pkgs.pi-coding-agent # AI LLM Agent diff --git a/platforms/nix-darwin/modules/nmasur/presets/services/daily-summary/daily-summary.nix b/platforms/nix-darwin/modules/nmasur/presets/services/daily-summary/daily-summary.nix index cd4a7eea..b192823a 100644 --- a/platforms/nix-darwin/modules/nmasur/presets/services/daily-summary/daily-summary.nix +++ b/platforms/nix-darwin/modules/nmasur/presets/services/daily-summary/daily-summary.nix @@ -29,10 +29,10 @@ in # This replaces program and args entirely # script = '' # ${process_urls}/bin/process-urls /Users/${username}/Downloads/Sidebery/ - # GEMINI_API_KEY=$(cat /Users/${username}/.config/gemini/.gemini_api_key) ${pkgs.gemini-cli}/bin/gemini --allowed-tools all --yolo --include-directories /Users/${username}/Downloads/Sidebery/ --include-directories /Users/${username}/dev/personal/notes/ "${prompt}" + # GEMINI_API_KEY=$(cat /Users/${username}/.config/gemini/.gemini_api_key) ${pkgs.antigravity-cli}/bin/agy --allowed-tools all --yolo --include-directories /Users/${username}/Downloads/Sidebery/ --include-directories /Users/${username}/dev/personal/notes/ "${prompt}" # ''; script = '' - GEMINI_API_KEY=$(cat /Users/${username}/.config/gemini/.gemini_api_key) ${pkgs.gemini-cli}/bin/gemini --allowed-tools all --yolo --include-directories "/Users/${username}/Downloads/firefox-history/,/Users/${username}/dev/personal/notes/" "${prompt} | tee -a /Users/${username}/dev/personal/gemini-archive/daily-summary-logs/$(date +"%Y-%m-%d").log" + GEMINI_API_KEY=$(cat /Users/${username}/.config/gemini/.gemini_api_key) ${pkgs.antigravity-cli}/bin/agy --allowed-tools all --yolo --include-directories "/Users/${username}/Downloads/firefox-history/,/Users/${username}/dev/personal/notes/" "${prompt} | tee -a /Users/${username}/dev/personal/gemini-archive/daily-summary-logs/$(date +"%Y-%m-%d").log" ''; path = [