1
0
Fork 0

Compare commits

...

4 commits

Author SHA1 Message Date
4632441b21
flake: remove nur
All checks were successful
Build / build-amd64-linux (push) Successful in 27s
Build / build-arm64-linux (push) Successful in 1m9s
2024-03-28 12:13:26 +01:00
6833c43a87
attic: related updates 2024-03-28 12:09:37 +01:00
3002f43f7f
attic: remove overrides 2024-03-28 12:09:37 +01:00
00f935e074
updates 2024-03-28 12:09:37 +01:00
9 changed files with 13 additions and 35 deletions

View file

@ -436,21 +436,6 @@
"type": "github"
}
},
"nurpkgs": {
"locked": {
"lastModified": 1711597179,
"narHash": "sha256-k3TekWyk8RH7Td9xS3sHIrvDXmO/OBoNC770Oec25q4=",
"owner": "nix-community",
"repo": "NUR",
"rev": "2d22add691c4187f5d629c2c42b7cb602d37d156",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"pre-commit-hooks-nix": {
"inputs": {
"flake-compat": "flake-compat_2",
@ -489,7 +474,6 @@
"nixos-hardware": "nixos-hardware",
"nixos-unstable": "nixos-unstable",
"nixpkgs": "nixpkgs",
"nurpkgs": "nurpkgs",
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
"treefmt-nix": "treefmt-nix"
}

View file

@ -39,8 +39,6 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
nurpkgs.url = "github:nix-community/NUR";
agenix = {
url = "github:ryantm/agenix";
inputs = {

View file

@ -3,7 +3,7 @@
{
matchBlocks = {
"git.app.nedeco.de" = {
port = 20022;
port = 22;
user = "git";
identityFile = "~/.ssh/nedeco_gitlab.pub";
identitiesOnly = true;

View file

@ -1,14 +1,5 @@
{ pkgs, lib, ... }:
{ pkgs, ... }:
let
inherit (pkgs) stdenv;
attic = pkgs.attic-client.overrideAttrs (_: _: {
env = lib.optionalAttrs stdenv.cc.isClang {
NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}";
};
});
in
{
environment.systemPackages = [ attic ];
environment.systemPackages = [ pkgs.attic-client ];
}

View file

@ -9,7 +9,6 @@ let
nixpkgsConfig = {
overlays = [
overlay-x86
inputs.nurpkgs.overlay
agenix.overlays.default
inputs.attic.overlays.default
overlay-mkalias

View file

@ -3,12 +3,10 @@
let
default-system = "aarch64-linux";
overlay-attic = inputs.attic.overlays.default;
overlay-nifoc = inputs.nifoc-overlay.overlay;
nixpkgsConfig = {
overlays = [
overlay-attic
overlay-nifoc
];

View file

@ -3,12 +3,10 @@
let
default-system = "aarch64-linux";
overlay-attic = inputs.attic.overlays.default;
overlay-nifoc = inputs.nifoc-overlay.overlay;
nixpkgsConfig = {
overlays = [
overlay-attic
overlay-nifoc
];

View file

@ -83,6 +83,16 @@ in
systemd.network = {
enable = true;
netdevs = {
"20-vlan10" = {
netdevConfig = {
Kind = "vlan";
Name = "vlan51";
};
vlanConfig.Id = 51;
};
};
networks = {
"10-lan" = {
matchConfig.Name = "end0";