mirror of
https://github.com/Stunkymonkey/nixos.git
synced 2025-05-24 09:54:40 +02:00
treewide: fix deadnix errors
This commit is contained in:
parent
a36dccb271
commit
46881de8eb
59 changed files with 70 additions and 93 deletions
|
@ -61,7 +61,7 @@
|
|||
# prevent rebuilding deploy-rs everytime when nixpkgs changes
|
||||
overlays = [
|
||||
deploy-rs.overlay
|
||||
(self: super: { deploy-rs = { inherit (pkgs) deploy-rs; lib = super.deploy-rs.lib; }; })
|
||||
(_self: super: { deploy-rs = { inherit (pkgs) deploy-rs; lib = super.deploy-rs.lib; }; })
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ self, lib, ... }:
|
||||
{ self, ... }:
|
||||
let
|
||||
inherit (self.inputs) nixos-generators nur;
|
||||
defaultModule = { ... }: {
|
||||
inherit (self.inputs) nixos-generators;
|
||||
defaultModule = {
|
||||
imports = [
|
||||
./base-config.nix
|
||||
];
|
||||
|
@ -11,7 +11,6 @@ in
|
|||
{
|
||||
perSystem =
|
||||
{ pkgs
|
||||
, self'
|
||||
, ...
|
||||
}:
|
||||
{
|
||||
|
|
|
@ -10,7 +10,7 @@ let
|
|||
disko
|
||||
;
|
||||
nixosSystem = nixpkgs.lib.makeOverridable nixpkgs.lib.nixosSystem;
|
||||
overlay-unstable = final: prev: {
|
||||
overlay-unstable = final: _prev: {
|
||||
unstable = import nixpkgs-unstable {
|
||||
inherit (final) system;
|
||||
config.allowUnfree = true;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
# Packages
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{ ... }:
|
||||
{
|
||||
boot.initrd = {
|
||||
availableKernelModules = [
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{ ... }:
|
||||
{
|
||||
networking.networkmanager = {
|
||||
enable = true;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, inputs, ... }:
|
||||
{ config, pkgs, inputs, ... }:
|
||||
{
|
||||
nix = {
|
||||
daemonCPUSchedPolicy = "idle";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{ config, ... }:
|
||||
{
|
||||
sops.secrets."users/felix/password".neededForUsers = true;
|
||||
sops.secrets."users/felix/password" = { };
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
boot.loader = {
|
||||
timeout = 1;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./boot.nix
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, lib, modulesPath, ... }:
|
||||
{ config, lib, modulesPath, ... }:
|
||||
{
|
||||
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ config, ... }:
|
||||
|
||||
let
|
||||
ifname = "ens18";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# Deployed services
|
||||
{ config, lib, ... }:
|
||||
{ config, ... }:
|
||||
let
|
||||
secrets = config.sops.secrets;
|
||||
in
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
# enabled system services
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
secrets = config.sops.secrets;
|
||||
in
|
||||
{ ... }:
|
||||
{
|
||||
my.system = {
|
||||
podman.enable = true;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./disko-config.nix
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
boot = {
|
||||
loader = {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
8080 # aria
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# Deployed services
|
||||
{ config, lib, ... }:
|
||||
{ config, ... }:
|
||||
let
|
||||
secrets = config.sops.secrets;
|
||||
in
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
# enabled system services
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
secrets = config.sops.secrets;
|
||||
in
|
||||
{ ... }:
|
||||
{
|
||||
my.system = {
|
||||
avahi.enable = true;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
sops.secrets."wifi/bismarck" = {
|
||||
path = "/etc/NetworkManager/system-connections/Bismarck WLAN.nmconnection";
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{ ... }:
|
||||
{
|
||||
boot = {
|
||||
loader = {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./boot.nix
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, ... }:
|
||||
{ ... }:
|
||||
let
|
||||
cpuFlavor = "intel";
|
||||
in
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# network settings
|
||||
{ config, lib, ... }:
|
||||
{ ... }:
|
||||
{
|
||||
# hotfixes for dns settings
|
||||
networking.extraHosts =
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
# enabled profiles
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
secrets = config.sops.secrets;
|
||||
in
|
||||
{ ... }:
|
||||
{
|
||||
my.profiles = {
|
||||
"3d-design".enable = true;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# Deployed services
|
||||
{ config, lib, ... }:
|
||||
{ config, ... }:
|
||||
let
|
||||
secrets = config.sops.secrets;
|
||||
in
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
# enabled system services
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
secrets = config.sops.secrets;
|
||||
in
|
||||
{ ... }:
|
||||
{
|
||||
my.system = {
|
||||
avahi.enable = true;
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
# Hardware-related modules
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./bluetooth
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.hardware.drive-monitor;
|
||||
in
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.hardware.firmware;
|
||||
in
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# manages and downloads subtitles
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.services.bazarr;
|
||||
domain = config.networking.domain;
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.my.services.blackbox;
|
||||
domain = config.networking.domain;
|
||||
blackBoxConfig = {
|
||||
modules = {
|
||||
http_2xx = {
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.my.services.blocky;
|
||||
domain = config.networking.domain;
|
||||
in
|
||||
{
|
||||
options.my.services.blocky = with lib; {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# running dyndns updates
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.services.dyndns;
|
||||
domain = config.networking.domain;
|
||||
|
|
|
@ -73,7 +73,7 @@ in
|
|||
};
|
||||
'';
|
||||
type = lib.types.attrsOf (lib.types.submodule (
|
||||
{ name, config, ... }: {
|
||||
{ ... }: {
|
||||
options = {
|
||||
# enable = lib.mkEnableOption "exportarr-${name}";
|
||||
port = lib.mkOption {
|
||||
|
@ -119,7 +119,7 @@ in
|
|||
|
||||
config = lib.mkIf (cfg != { }) {
|
||||
assertions = lib.mapAttrsToList
|
||||
(name: config: {
|
||||
(name: _config: {
|
||||
assertion = builtins.elem name [ "sonarr" "radarr" "lidarr" "prowlarr" "readarr" "sabnzbd" ];
|
||||
message = "exportarr does not support this service.";
|
||||
})
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# My own personal homepage
|
||||
{ config, lib, pkgs, inputs, ... }:
|
||||
{ config, lib, inputs, ... }:
|
||||
let
|
||||
cfg = config.my.services.homepage;
|
||||
domain = config.networking.domain;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
|
||||
{
|
||||
options.webapps = {
|
||||
|
@ -124,6 +124,6 @@
|
|||
});
|
||||
}
|
||||
);
|
||||
my.services.blackbox.http_endpoints = lib.mapAttrsToList (key: value: value.dashboard.link) config.webapps.apps ++ [ "https://${config.networking.domain}/" ];
|
||||
my.services.blackbox.http_endpoints = lib.mapAttrsToList (_key: value: value.dashboard.link) config.webapps.apps ++ [ "https://${config.networking.domain}/" ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# The Free Software Media System
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.services.initrd-ssh;
|
||||
in
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# manages and downloads films
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.services.jellyseerr;
|
||||
domain = config.networking.domain;
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.my.services.loki;
|
||||
domain = config.networking.domain;
|
||||
in
|
||||
{
|
||||
options.my.services.loki = with lib; {
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
# adjusted from: https://github.com/NixOS/nixos-org-configurations/blob/master/delft/eris/alertmanager-matrix-forwarder.nix
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.services.matrix-bot;
|
||||
domain = config.networking.domain;
|
||||
in
|
||||
{
|
||||
options.my.services.matrix-bot = with lib; {
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
{ config, lib, pkgs, inputs, ... }:
|
||||
let
|
||||
cfg = config.my.services.node-exporter;
|
||||
domain = config.networking.domain;
|
||||
in
|
||||
{
|
||||
options.my.services.node-exporter = with lib; {
|
||||
|
@ -57,7 +56,7 @@ in
|
|||
let
|
||||
inputsWithDate = lib.filterAttrs (_: input: input ? lastModified) inputs;
|
||||
flakeAttrs = input: (lib.mapAttrsToList (n: v: ''${n}="${v}"'')
|
||||
(lib.filterAttrs (n: v: (builtins.typeOf v) == "string") input));
|
||||
(lib.filterAttrs (_n: v: (builtins.typeOf v) == "string") input));
|
||||
lastModified = name: input: ''
|
||||
flake_input_last_modified{input="${name}",${lib.concatStringsSep "," (flakeAttrs input)}} ${toString input.lastModified}'';
|
||||
in
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# 3d-printing software
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.services.octoprint;
|
||||
in
|
||||
|
@ -9,7 +9,7 @@ in
|
|||
|
||||
plugins = mkOption {
|
||||
type = types.functionTo (types.listOf types.package);
|
||||
default = plugins: [ ];
|
||||
default = [ ];
|
||||
defaultText = literalExpression "plugins: []";
|
||||
example = literalExpression "plugins: with plugins; [ themeify stlviewer ]";
|
||||
description = lib.mdDoc "Additional plugins to be used. Available plugins are passed through the plugins input.";
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# document management system
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.services.paperless;
|
||||
domain = config.networking.domain;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# a password-generator using the marokov model
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.services.passworts;
|
||||
domain = config.networking.domain;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# self-hosted photo gallery
|
||||
{ config, pkgs, lib, ... }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.services.photoprism;
|
||||
domain = config.networking.domain;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# # log forwarding
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.services.promtail;
|
||||
domain = config.networking.domain;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# manages indexes
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.services.prowlarr;
|
||||
domain = config.networking.domain;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# manages and downloads films
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.services.radarr;
|
||||
domain = config.networking.domain;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# manages and downloads series
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.services.sonarr;
|
||||
domain = config.networking.domain;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# avahi related settings
|
||||
{ config, inputs, lib, options, pkgs, ... }:
|
||||
{ config, lib, options, ... }:
|
||||
let
|
||||
cfg = config.my.system.avahi;
|
||||
in
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# Docker related settings
|
||||
{ config, inputs, lib, options, pkgs, ... }:
|
||||
{ config, lib, options, pkgs, ... }:
|
||||
let
|
||||
cfg = config.my.system.docker;
|
||||
in
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# Podman related settings
|
||||
{ config, inputs, lib, options, pkgs, ... }:
|
||||
{ config, lib, options, pkgs, ... }:
|
||||
let
|
||||
cfg = config.my.system.podman;
|
||||
in
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
# overlays for nixpkgs
|
||||
self: super:
|
||||
_self: _super:
|
||||
{
|
||||
# freshrss = super.freshrss.overrideAttrs (old: {
|
||||
# freshrss = _super.freshrss.overrideAttrs (old: {
|
||||
# version = "1.21.0";
|
||||
# src = super.fetchFromGitHub {
|
||||
# src = _super.fetchFromGitHub {
|
||||
# owner = "FreshRSS";
|
||||
# repo = "FreshRSS";
|
||||
# rev = "1.21.0";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
final: prev:
|
||||
final: _prev:
|
||||
{
|
||||
homer = final.callPackage ./homer { };
|
||||
grafana-dashboards = final.callPackage ./grafana-dashboards { };
|
||||
|
|
|
@ -6,7 +6,7 @@ let
|
|||
inherit (pkgs) stdenv fetchurl;
|
||||
in
|
||||
|
||||
lib.makeScope pkgs.newScope (self:
|
||||
lib.makeScope pkgs.newScope (_self:
|
||||
let
|
||||
buildGrafanaDashboard = args: stdenv.mkDerivation (args // {
|
||||
pname = "grafana-dashboard-${args.pname}-${toString args.id}";
|
||||
|
@ -38,7 +38,7 @@ in
|
|||
pname = "node-systemd";
|
||||
version = "1";
|
||||
hash = "sha256-MEWU5rIqlbaGu3elqdSoMZfbk67WDnH0VWuC8FqZ8v8=";
|
||||
}).overrideAttrs (self: super: {
|
||||
}).overrideAttrs (_: {
|
||||
src = ./node-systemd.json; # sadly only imported dashboards work
|
||||
});
|
||||
|
||||
|
@ -54,7 +54,7 @@ in
|
|||
pname = "nextcloud";
|
||||
version = "1";
|
||||
hash = "sha256-Z28Q/sMg3jxglkszAs83IpL8f4p9loNnTQzjc3S/SAQ=";
|
||||
}).overrideAttrs (self: super: {
|
||||
}).overrideAttrs (_: {
|
||||
src = ./nextcloud.json; # sadly only imported dashboards work
|
||||
});
|
||||
|
||||
|
@ -70,7 +70,7 @@ in
|
|||
pname = "navidrome";
|
||||
version = "1";
|
||||
hash = "sha256-MU890UAEI9wrnVIC/R0HkYwFa6mJ8Y7ESAWuaSQ8FQ8=";
|
||||
}).overrideAttrs (self: super: {
|
||||
}).overrideAttrs (_: {
|
||||
src = ./navidrome.json; # sadly data source is not detected
|
||||
});
|
||||
|
||||
|
@ -80,7 +80,7 @@ in
|
|||
pname = "hedgedoc";
|
||||
version = "1";
|
||||
hash = lib.fakeSha256;
|
||||
}).overrideAttrs (self: super: {
|
||||
}).overrideAttrs (_: {
|
||||
src = ./hedgedoc.json; # sadly data source is not detected
|
||||
});
|
||||
|
||||
|
@ -96,7 +96,7 @@ in
|
|||
pname = "loki";
|
||||
version = "1";
|
||||
hash = "sha256-1sxTDSEwi2O/Ce+rWqqhMvsYEJeELBfkb9W2R6cDjcU=";
|
||||
}).overrideAttrs (self: super: {
|
||||
}).overrideAttrs (_: {
|
||||
src = ./loki.json; # sadly not yet updated to latest grafana
|
||||
});
|
||||
|
||||
|
@ -112,7 +112,7 @@ in
|
|||
pname = "gitea";
|
||||
version = "1";
|
||||
hash = "sha256-IAaI/HvMxcWE3PGQFK8avNjgj88DgcDvkWRcDAWSejM=";
|
||||
}).overrideAttrs (self: super: {
|
||||
}).overrideAttrs (_: {
|
||||
src = ./gitea.json; # sadly not yet updated to latest grafana
|
||||
});
|
||||
|
||||
|
@ -121,7 +121,7 @@ in
|
|||
pname = "prometheus";
|
||||
version = "2";
|
||||
hash = "sha256-+nsi8/dYNvGVGV+ftfO1gSAQbO5GpZwW480T5mHMM4Q=";
|
||||
}).overrideAttrs (self: super: {
|
||||
}).overrideAttrs (_: {
|
||||
src = ./prometheus.json; # sadly only imported dashboards work
|
||||
});
|
||||
|
||||
|
@ -129,7 +129,7 @@ in
|
|||
id = 3590;
|
||||
pname = "grafana";
|
||||
version = "3";
|
||||
}).overrideAttrs (self: super: {
|
||||
}).overrideAttrs (_: {
|
||||
src = ./grafana.json; # sadly only imported dashboards work
|
||||
});
|
||||
|
||||
|
@ -138,7 +138,7 @@ in
|
|||
pname = "blackbox";
|
||||
version = "1";
|
||||
hash = "sha256-nnBFWFDAqKUqTOYxOrkRPlVla4ioQZ6rqEqakdzUj1Q=";
|
||||
}).overrideAttrs (self: super: {
|
||||
}).overrideAttrs (_: {
|
||||
src = ./blackbox.json; # sadly only imported dashboards work
|
||||
});
|
||||
})
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
# Configuration that spans across system and home, or are collections of modules
|
||||
{ ... }:
|
||||
{
|
||||
imports = [
|
||||
./3d-design
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.profiles.sway-autostart;
|
||||
in
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
let
|
||||
cfg = config.my.profiles.sway-location;
|
||||
in
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue