1 files changed, 29 insertions, 21 deletions

diff --git a/flake.nix b/flake.nix
index 0745d37c..db0c6991 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,13 +29,13 @@
       type = "github";
       owner = "NixOS";
       repo = "nixpkgs";
-      ref = "24.05";
+      ref = "25.05";
     };
     nixpkgs-eostre = {
       type = "github";
       owner = "NixOS";
       repo = "nixpkgs";
-      ref = "23.11";
+      ref = "25.05";
     };
     home-manager = {
       type = "github";
@@ -53,7 +53,7 @@
       type = "github";
       owner = "gkleen";
       repo = "home-manager";
-      ref = "nixos-late-start-23.11";
+      ref = "nixos-late-start-25.05";
       inputs = {
         nixpkgs.follows = "nixpkgs-eostre";
       };
@@ -108,7 +108,7 @@
     };
     nix-index-database = {
       type = "github";
-      owner = "Mic92";
+      owner = "nix-community";
       repo = "nix-index-database";
       ref = "main";
       inputs = {
@@ -145,20 +145,23 @@
       type = "gitlab";
       owner = "gkleen";
       repo = "ca";
-      ref = "v3.1.3";
+      ref = "v3.1.5";
       inputs = {
+        pyproject-nix.follows = "pyproject-nix";
+        uv2nix.follows = "uv2nix";
         nixpkgs.follows = "nixpkgs";
-        poetry2nix.follows = "poetry2nix";
       };
     };
     backup-utils = {
       type = "gitlab";
       owner = "gkleen";
       repo = "backup-utils";
-      ref = "v0.1.6";
+      ref = "v0.1.7";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        poetry2nix.follows = "poetry2nix";
+        pyproject-nix.follows = "pyproject-nix";
+        uv2nix.follows = "uv2nix";
+        pyproject-build-systems.follows = "pyproject-build-systems";
       };
     };
     prometheus-borg-exporter = {
@@ -183,16 +186,6 @@
       repo = "impermanence";
       ref = "master";
     };
-    waybar = {
-      type = "github";
-      owner = "gkleen";
-      repo = "Waybar";
-      ref = "feat/niri-workspaces-hide";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        flake-compat.follows = "flake-compat";
-      };
-    };
     nixVirt = {
       type = "github";
       owner = "AshleyYakeley";
@@ -206,7 +199,12 @@
       ref = "main";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        # niri-unstable.url = "github:gkleen/niri";
+        niri-unstable = {
+          type = "github";
+          owner = "gkleen";
+          repo = "niri";
+          ref = "fix/locked-monitor-control";
+        };
       };
     };
     nix-monitored = {
@@ -218,6 +216,14 @@
         nixpkgs.follows = "nixpkgs";
       };
     };
+    lanzaboote = {
+      type = "github";
+      owner = "nix-community";
+      repo = "lanzaboote";
+      ref = "v0.4.3";
+
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, nvfetcher, niri-flake, ... }@inputs:
@@ -363,7 +369,7 @@
 
         overlays = mapAttrs (_name: path: mkOverlay path) overlayPaths;
 
-        packages = forAllSystems (system: systemPkgs: nixImport rec { dir = ./tools; _import = _path: name: import "${toString dir}/${name}" ({ inherit system; } // inputs); });
+        packages = forAllSystems (system: systemPkgs: nixImport rec { dir = ./tools; _import = name: _base: import (dir + "/${name}") ({ inherit system; } // inputs); });
 
         # packages = mapAttrs (_name: filterAttrs (_name: isDerivation)) packages;
         # packages' = mapAttrs (_name: filterAttrs (_name: value: !(isDerivation value))) packages;
@@ -375,6 +381,8 @@
           activateNixosConfigurations activateHomeManagerConfigurations
         ];
 
+        lib = nixImport rec { dir = ./lib; _import = name: _base: import (dir + "/${name}") inputs; };
+
         devShells = forAllSystems (system: systemPkgs: { default = import ./shell.nix ({ inherit system; } // inputs); } // installerShells system systemPkgs);
 
         templates.default = {
@@ -398,7 +406,7 @@
             #   path = activateHomeManager (self.nixosConfigurations.${hostname}.config.nixpkgs.system) usercfg.home;
             # }) self.nixosConfigurations.${hostname}.config.home-manager.users);
           }) (nixImport { dir = ./hosts; _import = (_path: name: name); });
-          overrides = if pathExists ./deploy then nixImport { dir = ./deploy; _import = path: _name: import (./deploy + "/${path}") inputs; } else {};
+          overrides = if pathExists ./deploy then nixImport rec { dir = ./deploy; _import = path: _name: import (dir + "/${path}") inputs; } else {};
           filterEnabled = attrs: mapAttrs (_n: v: filterAttrs (n: _v: n != "enabled") v) (filterAttrs (_n: v: v.enabled or true) attrs);
         in mapAttrs (_n: v: if v ? "profiles" then v // { profiles = filterEnabled v.profiles; } else v) (filterEnabled (recursiveUpdate defaults overrides));