leon/nix-config
leon
/
nix-config
forked from c3d2/nix-config
1
0
Fork 0
Code Pull Requests Activity

Compare commits

base: leon:master
Branches Tags
leon:master
leon:overlord
leon:flake-update
leon:marenz-skyflake
leon:ds-future
leon:broken
leon:container/radius
c3d2:flake-update
c3d2:master
c3d2:gitea-actions-runner
c3d2:nixos-23.11
c3d2:ds-future
c3d2:container/radius
..
compare: leon:flake-update
Branches Tags
leon:overlord
leon:master
leon:flake-update
leon:marenz-skyflake
leon:ds-future
leon:broken
leon:container/radius
c3d2:flake-update
c3d2:master
c3d2:gitea-actions-runner
c3d2:nixos-23.11
c3d2:ds-future
c3d2:container/radius

1 Commits
master ... flake-upda

Author SHA1 Message Date
Astrobot 10aa102cba flake.lock: Update 
Flake lock file updates:

• Updated input 'nixos':
    'github:SuperSandro2000/nixpkgs/ce8783d28a1bc79007c9fa5616fd88bca4667300' (2023-05-19)
  → 'github:SuperSandro2000/nixpkgs/e00794431ab93ebef29bd15d61c3cada6b00d418' (2023-05-20)
• Updated input 'nixos-modules':
    'github:SuperSandro2000/nixos-modules/75c307d7e1f7fadf644e41cf173a8cacc68205da' (2023-05-16)
  → 'github:SuperSandro2000/nixos-modules/8571b315c056894ce170c4826d88adaf67b87218' (2023-05-21)
• Updated input 'openwrt-imagebuilder':
    'github:astro/nix-openwrt-imagebuilder/06d684e91397a5c14adb9b38e41869c67136276f' (2023-05-19)
  → 'github:astro/nix-openwrt-imagebuilder/03ee501041bc95dd753261016b1e0f02faf8c7ba' (2023-05-21)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/a376127bb5277cd2c337a9458744f370aaf2e08d' (2023-05-14)
  → 'github:Mic92/sops-nix/4ccdfb573f323a108a44c13bb7730e42baf962a9' (2023-05-21)
 2023-05-22 10:00:28 +02:00
2 changed files with 114 additions and 73 deletions
Show Stats Expand all files Collapse all files

138
flake.lock
View File

@ -335,17 +335,56 @@
"type": "github"
}
},
"naersk_2": {
"inputs": {
"nixpkgs": [
"skyflake",
"nix-cache-cut",
"nixpkgs"
]
},
"locked": {
"lastModified": 1671096816,
"narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=",
"owner": "nix-community",
"repo": "naersk",
"rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "naersk",
"type": "github"
}
},
"naersk_3": {
"inputs": {
"nixpkgs": [
"ticker",
"nixpkgs"
]
},
"locked": {
"lastModified": 1659610603,
"narHash": "sha256-LYgASYSPYo7O71WfeUOaEUzYfzuXm8c8eavJcel+pfI=",
"owner": "nix-community",
"repo": "naersk",
"rev": "c6a45e4277fa58abd524681466d3450f896dc094",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"rev": "c6a45e4277fa58abd524681466d3450f896dc094",
"type": "github"
}
},
"nix-cache-cut": {
"inputs": {
"naersk": [
"naersk"
],
"nixpkgs": [
"nixos"
],
"utils": [
"flake-utils"
]
"naersk": "naersk_2",
"nixpkgs": "nixpkgs",
"utils": "utils"
},
"locked": {
"lastModified": 1677107143,
@ -363,11 +402,11 @@
},
"nixos": {
"locked": {
"lastModified": 1684533630,
"narHash": "sha256-akvMq9xjy/EuDrsP8D9zUuktKoRg/UzIUMFATA6JQPw=",
"lastModified": 1684595036,
"narHash": "sha256-LFvKqwuQatKGfSVV9txUOd237Nbwpoq/q+bguOX54pk=",
"owner": "SuperSandro2000",
"repo": "nixpkgs",
"rev": "ce8783d28a1bc79007c9fa5616fd88bca4667300",
"rev": "e00794431ab93ebef29bd15d61c3cada6b00d418",
"type": "github"
},
"original": {
@ -377,22 +416,6 @@
"type": "github"
}
},
"nixos-23-05": {
"locked": {
"lastModified": 1684796928,
"narHash": "sha256-GxF+TX2UsuiIj0rdLkovBBWnMdAccWmw/T9p6S00etU=",
"owner": "SuperSandro2000",
"repo": "nixpkgs",
"rev": "7582acc515fa86fb0c5797970ea987f3872a8ad6",
"type": "github"
},
"original": {
"owner": "SuperSandro2000",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1684169666,
@ -415,11 +438,11 @@
]
},
"locked": {
"lastModified": 1684273519,
"narHash": "sha256-TGpB+DV3WJdn4OnS0F9C8DxfFzp74GQK5DfRLy0H94Q=",
"lastModified": 1684695397,
"narHash": "sha256-3SM2abyPWa10g2Z0xi+N/Aqbd/+MLTC2Aol+xNGYTao=",
"owner": "SuperSandro2000",
"repo": "nixos-modules",
"rev": "75c307d7e1f7fadf644e41cf173a8cacc68205da",
"rev": "8571b315c056894ce170c4826d88adaf67b87218",
"type": "github"
},
"original": {
@ -428,6 +451,22 @@
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1676790509,
"narHash": "sha256-W9uWAWokgS8US8rJf79qBLS2M+ZgIscfoz+KsNE7VGQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a1291d0d020a200c7ce3c48e96090bfa4890a475",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"oparl-scraper": {
"flake": false,
"locked": {
@ -469,11 +508,11 @@
]
},
"locked": {
"lastModified": 1684494012,
"narHash": "sha256-Q+8j1rMAi/AXl3FIM+OALJ8gIEqVS1NHZk4cenCE/6o=",
"lastModified": 1684662183,
"narHash": "sha256-00lMZoLz2W6hb0EnAAcBGKvuBzgwRZomgyUazYt6y/A=",
"owner": "astro",
"repo": "nix-openwrt-imagebuilder",
"rev": "06d684e91397a5c14adb9b38e41869c67136276f",
"rev": "03ee501041bc95dd753261016b1e0f02faf8c7ba",
"type": "github"
},
"original": {
@ -498,9 +537,7 @@
"heliwatch": "heliwatch",
"microvm": "microvm",
"naersk": "naersk",
"nix-cache-cut": "nix-cache-cut",
"nixos": "nixos",
"nixos-23-05": "nixos-23-05",
"nixos-hardware": "nixos-hardware",
"nixos-modules": "nixos-modules",
"oparl-scraper": "oparl-scraper",
@ -597,9 +634,7 @@
"microvm": [
"microvm"
],
"nix-cache-cut": [
"nix-cache-cut"
],
"nix-cache-cut": "nix-cache-cut",
"nixpkgs": [
"nixos"
]
@ -628,11 +663,11 @@
]
},
"locked": {
"lastModified": 1684032930,
"narHash": "sha256-ueeSYDii2e5bkKrsSdP12JhkW9sqgYrUghLC8aDfYGQ=",
"lastModified": 1684637723,
"narHash": "sha256-0vAxL7MVMhGbTkAyvzLvleELHjVsaS43p+PR1h9gzNQ=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "a376127bb5277cd2c337a9458744f370aaf2e08d",
"rev": "4ccdfb573f323a108a44c13bb7730e42baf962a9",
"type": "github"
},
"original": {
@ -707,9 +742,7 @@
"fenix": [
"fenix"
],
"naersk": [
"naersk"
],
"naersk": "naersk_3",
"nixpkgs": [
"nixos"
],
@ -773,6 +806,21 @@
"url": "https://gitea.c3d2.de/astro/tracer"
}
},
"utils": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"yammat": {
"inputs": {
"nixpkgs": [

49
flake.nix
View File

@ -9,8 +9,10 @@
inputs = {
# use sandro's fork full with cherry-picked fixes
nixos.url = "github:SuperSandro2000/nixpkgs/nixos-22.11";
nixos-23-05.url = "github:SuperSandro2000/nixpkgs/nixos-23.05";
# nixos-mobilizon.url = "github:minijackson/nixpkgs/init-mobilizon";
nixos-hardware.url = "github:nixos/nixos-hardware";
# nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# nixos-unstable-simd.url = "github:SuperSandro2000/nixpkgs/nixos-unstable-simd";
affection-src = {
url = "git+https://gitea.nek0.eu/nek0/affection";
@ -110,14 +112,6 @@
nixpkgs.follows = "nixos";
};
};
nix-cache-cut = {
url = "github:astro/nix-cache-cut";
inputs = {
naersk.follows = "naersk";
nixpkgs.follows = "nixos";
utils.follows = "flake-utils";
};
};
nixos-modules = {
url = "github:SuperSandro2000/nixos-modules";
inputs.nixpkgs-lib.follows = "nixos";
@ -152,7 +146,6 @@
inputs = {
microvm.follows = "microvm";
nixpkgs.follows = "nixos";
nix-cache-cut.follows = "nix-cache-cut";
};
};
sshlogd = {
@ -181,7 +174,8 @@
url = "git+https://gitea.c3d2.de/astro/ticker.git";
inputs = {
fenix.follows = "fenix";
naersk.follows = "naersk";
# causes build failure
# naersk.follows = "naersk";
nixpkgs.follows = "nixos";
utils.follows = "flake-utils";
};
@ -213,7 +207,7 @@
};
};
outputs = inputs@{ self, alert2muc, c3d2-user-module, deployment, disko, fenix, heliwatch, microvm, naersk, nixos, nixos-23-05, nixos-hardware, nixos-modules, buzzrelay, caveman, oparl-scraper, scrapers, secrets, skyflake, sshlogd, sops-nix, spacemsg, ticker, tigger, yammat, zentralwerk, ... }:
outputs = inputs@{ self, alert2muc, c3d2-user-module, deployment, disko, fenix, heliwatch, microvm, naersk, nixos, nixos-hardware, nixos-modules, buzzrelay, caveman, oparl-scraper, scrapers, secrets, skyflake, sshlogd, sops-nix, spacemsg, ticker, tigger, yammat, zentralwerk, ... }:
let
inherit (nixos) lib;
@ -231,12 +225,11 @@
# Our custom NixOS builder
nixosSystem' =
{ nixos ? inputs.nixos
, modules
{ modules
, system ? "x86_64-linux"
}@args:
{ inherit args; } // nixos.lib.nixosSystem {
{ inherit args; } // lib.nixosSystem {
inherit system;
modules = [
@ -832,19 +825,19 @@
in
lib.mapAttrs getBuildEntryPoint self.nixosConfigurations
# NOTE: left here to have the code as reference if we need something like in the future, eg. on a stable update
// lib.mapAttrs' (hostname: nixosSystem: let
hostname' = hostname + "-23-05";
in lib.nameValuePair
hostname' # job display name
(getBuildEntryPoint hostname' (nixosSystem' (nixosSystem.args // (with nixosSystem.args; {
modules = modules ++ [
# {
# simd.enable = lib.mkForce true;
# }
];
nixos = nixos-23-05;
}))))
) self.nixosConfigurations
# // lib.mapAttrs' (hostname: nixosSystem: lib.nameValuePair
# # job display name
# (hostname + "-nox")
# (getBuildEntryPoint null (nixosSystem' (nixosSystem.args // (with nixosSystem.args; {
# modules = modules ++ [
# {
# # simd.enable = lib.mkForce true;
# environment.noXlibs = true;
# }
# ];
# # nixpkgs = nixos-unstable-simd;
# }))))
# ) self.nixosConfigurations
// nixos.lib.filterAttrs (name: attr:
(builtins.match ".+-tftproot" name != null && lib.isDerivation attr)
) self.packages.aarch64-linux