this will be brittle for sure

This commit is contained in:
Daylin Morgan 2025-01-20 13:48:24 -06:00
parent 05861c8a88
commit 09bd1b398c
Signed by: daylin
GPG key ID: 950D13E9719334AD
6 changed files with 37 additions and 7 deletions

View file

@ -25,13 +25,13 @@ in
};
security.polkit = enabled; # attic was looking for this...
environment.systemPackages = [ pkgs.attic-client ];
environment.systemPackages = [ (flake.pkgs "self").attic-client ];
# allow docker to forward the request to the host running attic
# https://discourse.nixos.org/t/docker-container-not-resolving-to-host/30259/6
# networking.firewall.extraCommands = "iptables -A INPUT -p tcp --destination-port ${atticPort} -s 172.16.0.0/12 -j ACCEPT";
services.atticd = enabled // {
package = (flake.pkgs "lix-attic").attic-server;
package = (flake.pkgs "self").attic-server;
# Replace with absolute path to your credentials file
# TODO: replace with sops-secret!

View file

@ -29,7 +29,7 @@
};
environment.systemPackages = [
(flake.pkgs "lix-attic").attic-client
(flake.pkgs "self").attic-client
];
}

View file

@ -67,7 +67,7 @@ let
iso = mkIso.config.system.build.isoImage;
# nimlangserver = pkgs.callPackage ../pkgs/nim/nimlangserver { };
}
// (import ../pkgs { inherit pkgs lib; })
// (import ../pkgs { inherit pkgs lib inputs; })
);
devShells = forAllSystems (pkgs: {

View file

@ -49,6 +49,22 @@ let
]
++ (selfModules ''oizys'')
++ (nixosModules ''lix-module|sops-nix'')
++ [
(
{ ... }:
{
nixpkgs.overlays = [
(final: prev: {
# override what the lix-module set
# make sure attic is using this lix
nix = inputs.self.${final.system}.lix;
})
];
}
)
]
++ (hostFiles hostName);
specialArgs = commonSpecialArgs // {

View file

@ -4,6 +4,11 @@
inputs.nim2nix.overlays.default # adds buildNimPackage
(final: prev: {
# make sure attic is using this lix
nix = inputs.self.packages.${final.system}.lix;
stable = import inputs.stable {
system = final.system;
config.allowUnfree = true;

View file

@ -6,6 +6,15 @@
let
inherit (lib) flakeFromSystem;
flake = flakeFromSystem pkgs.system;
lix = pkgs.callPackage ./lix { inherit flake; };
# make attic also use the "no check lix"
atticPackages = pkg: {
"${pkg}" = (flake.pkgs "lix-attic").${pkg}.overrideAttrs (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ lix ];
});
};
in
{
nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
@ -16,10 +25,10 @@ in
llm-with-plugins = pkgs.callPackage ./llm/llm-with-plugins { };
attic-client = (flake.pkgs "lix-attic").attic-client;
attic-server = (flake.pkgs "lix-attic").attic-server;
lix = pkgs.callPackage ./lix { inherit flake; };
lix = lix;
}
// (atticPackages "attic-client")
// (atticPackages "attic-server")
// (flake.toPackageAttrs [
"pixi"
"f1multiviewer"