diff --git a/flake.nix b/flake.nix
index 7d479bf..d68e60a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,7 @@
       };
     };
 
-  outputs = inputs@{ self, pkgs, digga, nixos, ci-agent, home, nixos-hardware, nur, ... }:
+  outputs = inputs@{ self, pkgs, digga, nixos, ci-agent, home, nixos-hardware, nur, nixosPersistence, ... }:
     digga.lib.mkFlake {
       inherit self inputs;
 
@@ -65,6 +65,7 @@
             { _module.args.ourLib = self.lib; }
             ci-agent.nixosModules.agent-profile
             home.nixosModules.home-manager
+            nixosPersistence.nixosModules.impermanence
             ./modules/customBuilds.nix
           ];
         };
@@ -75,8 +76,9 @@
           NixOS = { };
         };
         profiles = [ ./profiles ./users ];
-        suites = { profiles, users, ... }: with profiles; rec {
-          base = [ core users.nixos users.root ];
+        suites = { profiles, users, ... }: with profiles; {
+          base = [ cachix core users.root ];
+          work = [ users.patriot develop ];
         };
       };
 
@@ -84,8 +86,8 @@
         modules = ./users/modules/module-list.nix;
         externalModules = [ ];
         profiles = [ ./users/profiles ];
-        suites = { profiles, ... }: with profiles; rec {
-          base = [ direnv git ];
+        suites = { profiles, ... }: with profiles; {
+          base = [ direnv git starship ];
         };
       };
 
diff --git a/lib/default.nix b/lib/default.nix
index 2356e1f..bb93938 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,2 +1,4 @@
 { lib }:
-lib.makeExtensible (self: { })
+lib.makeExtensible (self: {
+  pkgBinNoDep = pkgs: name: "${pkgs.${name}}/bin/${name}";
+})
diff --git a/profiles/core/default.nix b/profiles/core/default.nix
index 9416334..40687b0 100644
--- a/profiles/core/default.nix
+++ b/profiles/core/default.nix
@@ -1,9 +1,7 @@
-{ self, config, pkgs, ... }:
+{ self, config, pkgs, lib, ... }:
 let
-  lib = pkgs.lib;
-
   inherit (lib) fileContents mkIf;
-  pkgBin = lib.dev.pkgBinNoDep pkgs;
+  pkgBin = pkgs.ourlib.pkgBinNoDep pkgs;
 
   coreBin = v: "${pkgs.coreutils}/bin/${v}";
   nixBin = "${config.nix.package}/bin/nix";
diff --git a/users/patriot/default.nix b/users/patriot/default.nix
index 920c20b..810b1a4 100644
--- a/users/patriot/default.nix
+++ b/users/patriot/default.nix
@@ -1,10 +1,8 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 let
-  lib = pkgs.lib;
-
   inherit (lib) mapAttrs' nameValuePair;
   inherit (builtins) readDir fetchGit;
-  pkgBin = lib.dev.pkgBinNoDep pkgs;
+  pkgBin = pkgs.ourlib.pkgBinNoDep pkgs;
 
   nixosConfig = config;
 in