pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

infra: fix deploy-rs + collabora container #256

Merged
b12f merged 4 commits from infra-fix-deploy-collabora into infra 2023-10-13 09:26:44 +00:00
Conversation 0 Commits 4 Files changed 5 +2 -10
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7715a89401 - Show all commits

10
flake.nix
View file

@ -69,14 +69,6 @@
channels = { channels = {
nixos = { nixos = {
imports = [(digga.lib.importOverlays ./overlays)]; imports = [(digga.lib.importOverlays ./overlays)];
overlays = [
(self: super: {
deploy-rs = {
inherit (inputs.nixos.legacyPackages.x86_64-linux) deploy-rs;
lib = inputs.deploy.lib.x86_64-linux;
};
})
];
}; };
latest = {}; latest = {};
fork = {}; fork = {};
@ -182,7 +174,7 @@
profilesOrder = ["system" "direnv"]; profilesOrder = ["system" "direnv"];
profiles.direnv = { profiles.direnv = {
user = "barkeeper"; user = "barkeeper";
path = self.pkgs.x86_64-linux.nixos.deploy-rs.lib.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.barkeeper; path = deploy.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.barkeeper;
}; };
}; };
#example = { #example = {

2
shell/devos.nix
View file

@ -59,6 +59,6 @@ in {
] ]
++ lib.optionals (pkgs.stdenv.hostPlatform.isLinux && !pkgs.stdenv.buildPlatform.isDarwin) [ ++ lib.optionals (pkgs.stdenv.hostPlatform.isLinux && !pkgs.stdenv.buildPlatform.isDarwin) [
(devos nixos-generators) (devos nixos-generators)
(devos deploy-rs.deploy-rs) (devos inputs.deploy.packages.${pkgs.system}.deploy-rs)
]; ];
} }