iterm service, remove spotifyd service, touchup overlays

home/darwin/launchd.nix

@@ -20,32 +20,5 @@
 
       };
     };
-
-    agents.spotifyd = {
-      enable = true;
-      config = {
-        ProgramArguments = [
-          "${pkgs.spotifyd}/bin/spotifyd"
-          "--no-daemon"
-          "--username-cmd"
-          "${pkgs.pass}/bin/pass 'music/spotify' | grep login | cut -f2 -d ' '"
-          "--password-cmd"
-          "${pkgs.pass}/bin/pass 'music/spotify' | head -n1"
-          "--backend"
-          "portaudio"
-          "--bitrate"
-          "320"
-          "--device-type"
-          "computer"
-          "--volume_controller"
-          "softvol"
-        ];
-        KeepAlive = true;
-        UserName = "${config.home.username}";
-        StandardOutPath = "${config.home.homeDirectory}/Library/Logs/spotifyd-stdout.log";
-        StandardErrorPath =
-          "${config.home.homeDirectory}/Library/Logs/spotifyd-stderr.log";
-      };
-    };
   };
 }

home/programs.nix

@@ -85,52 +85,8 @@
     starship = {
       enable = true;
       enableZshIntegration = true;
+      enableBashIntegration = true;
       package = pkgs.starship;
-      settings = {
-        format =
-          "$os[](fg:#979797 bg:#444444)$directory$git_branch$git_status[](fg:#444444)$fill[](fg:#444444)$cmd_duration$time$line_break$character";
-        fill = {
-          symbol = "·";
-          style = "fg:#505050";
-        };
-        cmd_duration = {
-          disabled = false;
-          min_time = 1500;
-          style = "fg:#979797 bg:#444444";
-          format = "[ $duration  ]($style)";
-        };
-        os = {
-          disabled = false;
-          style = "fg:#eaeaea bg:#444444";
-          format = "[ $symbol ]($style)";
-          symbols.Macos = "";
-        };
-        directory = {
-          disabled = false;
-          style = "fg:#149dff bg:#444444";
-          format = "[  $path ]($style)";
-          truncation_length = 3;
-          truncation_symbol = "";
-        };
-        git_branch = {
-          disabled = false;
-          symbol = "";
-          style = "fg:#53d306 bg:#444444";
-          format = "[[](fg:#979797 bg:#444444)  $symbol $branch ]($style)";
-        };
-        git_status = {
-          disabled = false;
-          style = "bg:#444444";
-          format =
-            "[[$staged](fg:#cca107 bg:#444444)[$modified](fg:#cca107 bg:#444444)[$untracked](fg:#149dff bg:#444444)[$conflicted](fg:#ed0505 bg:#444444)]($style)";
-        };
-        time = {
-          disabled = false;
-          style = "fg:#4d7573 bg:#444444";
-          format = "[ $time  ]($style)";
-          time_format = "%T";
-        };
-      };
     };
 
     zoxide = {
@@ -196,7 +152,6 @@
         np = "nix-shell -p";
         org = "z ${config.home.sessionVariables.ORGDIR}";
         ubc = "z ${config.home.sessionVariables.UBCDIR}";
-        nbpkgs = "nix-build --arg pkgs 'import <nixpkgs> {}'";
       };
     };
 

overlays/chromium-mac.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs ? import <nixpkgs> {} }:
 
 let
   versions = {

overlays/darwin-zsh-completions.nix

@@ -1,6 +1,6 @@
 # taken from nix-darwin repo
 # https://github.com/LnL7/nix-darwin/blob/87b9d090ad39b25b2400029c64825fc2a8868943/modules/examples/lnl.nix
-{ pkgs }:
+{ pkgs ? import <nixpkgs> {} }:
 
 pkgs.runCommand "darwin-zsh-completions-0.0.0"
 { preferLocalBuild = true; }

overlays/firefox-mac.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs ? import <nixpkgs> {} }:
 
 let
   version = "109.0.1";

overlays/freecad-mac.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs ? import <nixpkgs> {} }:
 
 let
   version = "0.20.2";

overlays/pinentry-mac.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs ? import <nixpkgs> {} }:
 
 pkgs.stdenv.mkDerivation {
   name = "pinentry-mac";

overlays/pinentry-touchid.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs ? import <nixpkgs> {} }:
 
 pkgs.stdenv.mkDerivation {
   name = "pinentry-touchid";

overlays/qbittorrent-mac.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs ? import <nixpkgs> {} }:
 
 let
   version = "4.4.5";

overlays/spotify-mac.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs ? import <nixpkgs> {} }:
 
 let
   appName = "Spotify";

overlays/vlc-mac.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs ? import <nixpkgs> {} }:
 
 let
   appName = "VLC";

system/darwin.nix

@@ -32,6 +32,14 @@
     vlc-mac
   ];
 
+  launchd.user.agents.iterm2 = {
+    command = "${pkgs.iterm2}/Applications/iTerm2.app/Contents/MacOS/iTerm2";
+    serviceConfig = {
+      KeepAlive = true;
+      ProcessType = "Adaptive";
+    };
+  };
+
   nix = {
     extraOptions = ''
       experimental-features = nix-command flakes