mirror of
https://github.com/daylinmorgan/oizys.git
synced 2025-02-22 23:35:51 -06:00
lix-attic not ready
This commit is contained in:
parent
9e40305052
commit
9569bfe4ae
5 changed files with 7 additions and 116 deletions
106
flake.lock
generated
106
flake.lock
generated
|
@ -54,21 +54,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"crane": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1737689766,
|
|
||||||
"narHash": "sha256-ivVXYaYlShxYoKfSo5+y5930qMKKJ8CLcAoIBPQfJ6s=",
|
|
||||||
"owner": "ipetkov",
|
|
||||||
"repo": "crane",
|
|
||||||
"rev": "6fe74265bbb6d016d663b1091f015e2976c4a527",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "ipetkov",
|
|
||||||
"repo": "crane",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"f1multiviewer": {
|
"f1multiviewer": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -105,27 +90,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-parts": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs-lib": [
|
|
||||||
"lix-attic",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1738453229,
|
|
||||||
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": [
|
"systems": [
|
||||||
|
@ -532,38 +496,6 @@
|
||||||
"url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
|
"url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lix-attic": {
|
|
||||||
"inputs": {
|
|
||||||
"crane": "crane",
|
|
||||||
"flake-compat": [],
|
|
||||||
"flake-parts": "flake-parts",
|
|
||||||
"lix": [
|
|
||||||
"lix-module",
|
|
||||||
"lix"
|
|
||||||
],
|
|
||||||
"lix-module": [
|
|
||||||
"lix-module"
|
|
||||||
],
|
|
||||||
"nix-github-actions": "nix-github-actions",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1738514772,
|
|
||||||
"narHash": "sha256-ng38xM+7MfmoWYcQj6/Ejgt732nbFIDx14QvWVpG0d4=",
|
|
||||||
"ref": "refs/heads/main",
|
|
||||||
"rev": "b691dd3a7746afd73e944db98c0b000c1424cd5e",
|
|
||||||
"revCount": 362,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.lix.systems/nrabulinski/attic.git"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.lix.systems/nrabulinski/attic.git"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"lix-module": {
|
"lix-module": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": [
|
"flake-utils": [
|
||||||
|
@ -625,27 +557,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nix-github-actions": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"lix-attic",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1737420293,
|
|
||||||
"narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "nix-github-actions",
|
|
||||||
"rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "nix-github-actions",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nix-index-database": {
|
"nix-index-database": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
@ -743,22 +654,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1735563628,
|
|
||||||
"narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-24.05",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-wayland": {
|
"nixpkgs-wayland": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": [],
|
"flake-compat": [],
|
||||||
|
@ -845,7 +740,6 @@
|
||||||
"jj": "jj",
|
"jj": "jj",
|
||||||
"lib-aggregate": "lib-aggregate",
|
"lib-aggregate": "lib-aggregate",
|
||||||
"lix": "lix",
|
"lix": "lix",
|
||||||
"lix-attic": "lix-attic",
|
|
||||||
"lix-module": "lix-module",
|
"lix-module": "lix-module",
|
||||||
"my-nixpkgs": "my-nixpkgs",
|
"my-nixpkgs": "my-nixpkgs",
|
||||||
"nim2nix": "nim2nix",
|
"nim2nix": "nim2nix",
|
||||||
|
|
10
flake.nix
10
flake.nix
|
@ -17,11 +17,11 @@
|
||||||
};
|
};
|
||||||
lix-module.inputs.lix.follows = "lix";
|
lix-module.inputs.lix.follows = "lix";
|
||||||
|
|
||||||
lix-attic.url = "git+https://git.lix.systems/nrabulinski/attic.git";
|
# lix-attic.url = "git+https://git.lix.systems/nrabulinski/attic.git";
|
||||||
lix-attic.inputs.nixpkgs.follows = "nixpkgs";
|
# lix-attic.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
lix-attic.inputs.lix-module.follows = "lix-module";
|
# lix-attic.inputs.lix-module.follows = "lix-module";
|
||||||
lix-attic.inputs.lix.follows = "lix-module/lix";
|
# lix-attic.inputs.lix.follows = "lix-module/lix";
|
||||||
lix-attic.inputs.flake-compat.follows = "";
|
# lix-attic.inputs.flake-compat.follows = "";
|
||||||
|
|
||||||
# keep for when lix breaks :/
|
# keep for when lix breaks :/
|
||||||
# lix-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
|
# lix-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
enabled,
|
enabled,
|
||||||
flake,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
|
@ -28,11 +27,10 @@ in
|
||||||
security.polkit = enabled; # attic was looking for this...
|
security.polkit = enabled; # attic was looking for this...
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
(flake.pkgs "self").attic-client
|
pkgs.attic-client
|
||||||
];
|
];
|
||||||
|
|
||||||
services.atticd = enabled // {
|
services.atticd = enabled // {
|
||||||
package = (flake.pkgs "self").attic-server;
|
|
||||||
|
|
||||||
# Replace with absolute path to your credentials file
|
# Replace with absolute path to your credentials file
|
||||||
environmentFile = config.sops.secrets."atticd-env".path;
|
environmentFile = config.sops.secrets."atticd-env".path;
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
flake,
|
|
||||||
enabled,
|
enabled,
|
||||||
|
|
||||||
...
|
...
|
||||||
|
@ -32,6 +31,5 @@
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pkgs.stable.quarto
|
pkgs.stable.quarto
|
||||||
(flake.pkgs "self").attic-client
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,3 +10,4 @@ charm-freeze
|
||||||
# pandoc -> texmath -> typst-symbols?
|
# pandoc -> texmath -> typst-symbols?
|
||||||
# quarto
|
# quarto
|
||||||
calibre
|
calibre
|
||||||
|
attic-client
|
||||||
|
|
Loading…
Add table
Reference in a new issue