1 files changed, 19 insertions, 8 deletions

diff --git a/flake.nix b/flake.nix
index c6eaab47..4e119e98 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,20 +4,20 @@
   nixConfig = {
     extra-substituters = [
       "https://nix-community.cachix.org"
+      "https://niri.cachix.org"
     ];
     extra-trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      "niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964="
     ];
   };
 
   inputs = {
     nixpkgs = {
       type = "github";
-      # owner = "NixOS";
+      owner = "NixOS";
       repo = "nixpkgs";
-      # ref = "nixos-unstable";
-      owner = "gkleen";
-      ref = "fix/matrix-synapse";
+      ref = "nixos-unstable";
     };
     nixpkgs-pgbackrest = {
       type = "github";
@@ -172,7 +172,7 @@
       type = "github";
       owner = "gkleen";
       repo = "Waybar";
-      ref = "feat/privacy-ignore";
+      ref = "feat/niri-workspaces-hide";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-compat.follows = "flake-compat";
@@ -184,9 +184,19 @@
       repo = "NixVirt";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    niri-flake = {
+      type = "github";
+      owner = "sodiboo";
+      repo = "niri-flake";
+      ref = "main";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        # niri-unstable.url = "github:gkleen/niri";
+      };
+    };
   };
 
-  outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, nvfetcher, ... }@inputs:
+  outputs = { self, nixpkgs, home-manager, sops-nix, deploy-rs, nvfetcher, niri-flake, ... }@inputs:
     let
       inherit (builtins) attrNames attrValues elemAt toJSON isNull pathExists;
       inherit (nixpkgs) lib;
@@ -269,9 +279,10 @@
       mkAccountModule = dir: path: accountName:
         let
           userName = accountUserName accountName;
+          hostName = accountHostName accountName;
         in overrideModule
              (import (dir + "/${path}"))
-             (inputs: inputs // { inherit userName; })
+             (inputs: inputs // { inherit userName hostName; })
              (outputs: { _file = dir + "/${path}"; }
                       // outputs
                       // { imports = [self.nixosModules.users.${userName} or ({...}: { imports = defaultUserProfiles userName; })] ++ (outputs.imports or []); });
@@ -324,7 +335,7 @@
         nixosConfigurations = installerNixosConfigurations // nixImport rec { dir = ./hosts; _import = mkNixosConfiguration [] dir; };
 
         homeModules = nixImport rec { dir = ./home-modules; };
-        homeConfigurations = listToAttrs (concatLists (mapAttrsToList (hostname: nixosConfig: mapAttrsToList (username: configuration: nameValuePair "${username}@${hostname}" { inherit (configuration.home) activationPackage; }) nixosConfig.config.home-manager.users) self.nixosConfigurations));
+        homeConfigurations = listToAttrs (concatLists (mapAttrsToList (hostname: nixosConfig: mapAttrsToList (username: nameValuePair "${username}@${hostname}") nixosConfig.config.home-manager.users) self.nixosConfigurations));
 
         overlays = mapAttrs (_name: path: mkOverlay path) overlayPaths;