my NixOS and nix-darwin config

fixed stuff for da thing

+12 -12
+1 -1
flake.nix
··· 40 40 }; 41 41 modules = [ 42 42 ./hosts/Khaos 43 - home-manager.darwinModules.home-manager 43 + home-manager.nixosModules.home-manager 44 44 { nixpkgs.overlays = overlays; } 45 45 { 46 46 home-manager = {
+1 -1
modules/home/apps/orbstack.nix
··· 4 4 in { 5 5 options.nyx.orbstack = { enable = mkEnableOption "Orbstack "; }; 6 6 7 - config = mkIf (cfg.enable) { 7 + config = mkIf (cfg.enable && pkgs.stdenv.isDarwin) { 8 8 9 9 home.packages = [ pkgs.orbstack ]; 10 10
+1 -5
modules/home/shells/zsh/default.nix
··· 84 84 export PATH="/opt/homebrew/opt/libiconv/bin:$PATH" 85 85 export PATH="/Users/suri/.cargo/bin:$PATH" 86 86 87 - if [ "$TERM_PROGRAM" != "Apple_Terminal" ]; then 88 - # WE USE ${pkgs.oh-my-posh} HERE 89 - # This ensures we use the exact binary installed by Nix 90 - eval "$(${pkgs.oh-my-posh}/bin/oh-my-posh init zsh --config ${config.home.homeDirectory}/.config/oh-my-posh/theme.toml)" 91 - fi 87 + eval "$(${pkgs.oh-my-posh}/bin/oh-my-posh init zsh --config ${config.home.homeDirectory}/.config/oh-my-posh/theme.toml)" 92 88 93 89 94 90 '';
+5 -5
modules/home/tools/zellij/default.nix
··· 4 4 let 5 5 cfg = config.nyx.zellij; 6 6 7 - suri_zellij_session_helper = 7 + suri_zellij_session_helper = 8 8 pkgs.writeShellScriptBin "suri_zellij_session_helper" '' 9 - ZELLIJ_SESSIONS=$(${pkgs.zellij}/bin/zellij ls | sed 's/\x1b\[[0-9;]*m//g' | cut -d ' ' -f 1) 10 - NUM_SESSIONS=$(echo "''${ZELLIJ_SESSIONS}" | wc -l ) 9 + ZELLIJ_SESSIONS=$(${pkgs.zellij}/bin/zellij ls | ${pkgs.gnused}/bin/sed 's/\x1b\[[0-9;]*m//g' | ${pkgs.coreutils}/bin/cut -d ' ' -f 1) 10 + NUM_SESSIONS=$(${pkgs.coreutils}/bin/echo "''${ZELLIJ_SESSIONS}" | ${pkgs.coreutils}/bin/wc -l ) 11 11 if [ "''${NUM_SESSIONS}" -ge 1 ]; then 12 - SESSION="$(echo "''${ZELLIJ_SESSIONS}" | ${pkgs.fzf}/bin/fzf)" 12 + SESSION="$(${pkgs.coreutils}/bin/echo "''${ZELLIJ_SESSIONS}" | ${pkgs.fzf}/bin/fzf)" 13 13 ${pkgs.zellij}/bin/zellij a ''${SESSION} 14 14 else 15 15 ${pkgs.zellij}/bin/zellij attach -c 16 16 fi 17 - ''; 17 + ''; 18 18 in { 19 19 20 20 options.nyx.zellij = { enable = mkEnableOption "Zellij"; };
+4
users/suri/Khaos.nix
··· 2 2 { 3 3 imports = [ ./common.nix ]; 4 4 5 + nyx.oh-my-posh.enable = true; 6 + nyx.zsh.enable = true; 7 + nyx.zellij.enable = true; 8 + 5 9 }