Compare commits
4 commits
main
...
aluminium-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
da5ec69043 | ||
|
|
fd0c356289 | ||
|
|
9f1bb78aec | ||
|
|
8cbd4cf556 |
5 changed files with 99 additions and 6 deletions
83
flake.lock
generated
83
flake.lock
generated
|
|
@ -122,6 +122,27 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nix-github-actions": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"poetry2nix",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1698974481,
|
||||||
|
"narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nix-github-actions",
|
||||||
|
"rev": "4bb5e752616262457bc7ca5882192a564c0472d2",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nix-github-actions",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nix-pre-commit-hooks": {
|
"nix-pre-commit-hooks": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
|
|
@ -242,6 +263,32 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"poetry2nix": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": [
|
||||||
|
"flake-utils"
|
||||||
|
],
|
||||||
|
"nix-github-actions": "nix-github-actions",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"systems": "systems_2",
|
||||||
|
"treefmt-nix": "treefmt-nix"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1700836255,
|
||||||
|
"narHash": "sha256-GMqLhIKOqSG6Rd92d5PjpjGl7f81hHnEcMKc3zhP4nY=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "poetry2nix",
|
||||||
|
"rev": "c819fba7902996cac21a27c9090f3f61457e45f3",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "poetry2nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
|
|
@ -252,6 +299,7 @@
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nixpkgsMaster": "nixpkgsMaster",
|
"nixpkgsMaster": "nixpkgsMaster",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
|
"poetry2nix": "poetry2nix",
|
||||||
"sops-nix": "sops-nix"
|
"sops-nix": "sops-nix"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -290,6 +338,41 @@
|
||||||
"repo": "default",
|
"repo": "default",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"systems_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"id": "systems",
|
||||||
|
"type": "indirect"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"treefmt-nix": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"poetry2nix",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1699786194,
|
||||||
|
"narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "treefmt-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|
|
||||||
14
flake.nix
14
flake.nix
|
|
@ -37,16 +37,24 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
poetry2nix = {
|
||||||
|
url = "github:nix-community/poetry2nix";
|
||||||
|
inputs = {
|
||||||
|
flake-utils.follows = "flake-utils";
|
||||||
|
nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
outputs =
|
outputs =
|
||||||
{ self
|
{ self
|
||||||
, nixpkgs
|
|
||||||
, flake-utils
|
, flake-utils
|
||||||
, krops
|
|
||||||
, gomod2nix
|
, gomod2nix
|
||||||
, home-manager
|
, home-manager
|
||||||
, nur
|
, krops
|
||||||
, nix-pre-commit-hooks
|
, nix-pre-commit-hooks
|
||||||
|
, nixpkgs
|
||||||
|
, nur
|
||||||
|
, poetry2nix
|
||||||
, ...
|
, ...
|
||||||
}@inputs: flake-utils.lib.eachSystem [
|
}@inputs: flake-utils.lib.eachSystem [
|
||||||
"x86_64-linux"
|
"x86_64-linux"
|
||||||
|
|
|
||||||
|
|
@ -120,7 +120,7 @@ in
|
||||||
# this value at the release version of the first install of this system.
|
# this value at the release version of the first install of this system.
|
||||||
# Before changing this value read the documentation for this option
|
# Before changing this value read the documentation for this option
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
system.stateVersion = "22.05"; # Did you read the comment?
|
system.stateVersion = "23.11"; # Did you read the comment?
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,5 @@
|
||||||
username = "nouser";
|
username = "nouser";
|
||||||
passwordFile = config.sops.secrets.duckdns-secret.path;
|
passwordFile = config.sops.secrets.duckdns-secret.path;
|
||||||
domains = [ "jalr-k" ];
|
domains = [ "jalr-k" ];
|
||||||
ipv6 = false;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
final: prev:
|
final: prev:
|
||||||
let
|
let
|
||||||
inherit (prev) callPackage system;
|
inherit (prev) callPackage system;
|
||||||
|
poetry2nix = callPackage inputs.poetry2nix { };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
ariang = callPackage ./ariang { };
|
ariang = callPackage ./ariang { };
|
||||||
|
|
@ -13,7 +14,9 @@ in
|
||||||
docker-machine-gitlab = callPackage ./docker-machine-gitlab { };
|
docker-machine-gitlab = callPackage ./docker-machine-gitlab { };
|
||||||
fpvout = callPackage ./fpvout { };
|
fpvout = callPackage ./fpvout { };
|
||||||
mute-indicator = callPackage ./mute-indicator { };
|
mute-indicator = callPackage ./mute-indicator { };
|
||||||
myintercom-doorbell = callPackage ./myintercom-doorbell { };
|
myintercom-doorbell = callPackage ./myintercom-doorbell {
|
||||||
|
inherit poetry2nix;
|
||||||
|
};
|
||||||
pretix = callPackage ./pretix/pretix.nix { };
|
pretix = callPackage ./pretix/pretix.nix { };
|
||||||
pretix-banktool = callPackage ./pretix/pretix-banktool.nix { };
|
pretix-banktool = callPackage ./pretix/pretix-banktool.nix { };
|
||||||
pretix-static = callPackage ./pretix/pretix-static.nix { };
|
pretix-static = callPackage ./pretix/pretix-static.nix { };
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue