EXCLUSIVE: After six years on NBC’s 30 Rock, executive producer John Riggi is leaving the series for an overall deal at Warner Bros. TV. Under the rich two-year deal, Riggi will develop new projects for the studio and also work on an existing WBTV series. Riggi has been on 30 Rock since after the pilot, starting off as a co-executive producer. He shared in the series’ three Emmy wins for best comedies. Before 30 Rock, Riggi worked on Will & Grace, The Bernie Mac Show, The Comeback and The Larry Sanders Show. UTA-repped Riggi is the latest upper-level 30 Rock writer-producer to segue into an overall deal as the comedy series is nearing its end — expected to return for an abbreviated seventh and final season. In the past two weeks Matt Hubbard signed with Universal TV, Kay Cannon inked with 20th TV. Josh Siegal and Dylan Morgan just landed at Sony Pictures TV but will return for the final batch of 13-14 episodes of 30 Rock as co-executive producers. In addition to serving as a writer and executive producer, Riggi also has directed a dozen episodes of 30 Rock. While as a writer-producer he will work on projects under his WBTV deal, Riggi may go back to helm one or more episodes of 30 Rock‘s final season.