diff --git a/flake.nix b/flake.nix index 6c4c2ac..e58402f 100644 --- a/flake.nix +++ b/flake.nix @@ -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; }; }) ]; }; diff --git a/images/flake-module.nix b/images/flake-module.nix index 9c257f2..a15ec60 100644 --- a/images/flake-module.nix +++ b/images/flake-module.nix @@ -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' , ... }: { diff --git a/machines/configurations.nix b/machines/configurations.nix index 640775b..c027a2f 100644 --- a/machines/configurations.nix +++ b/machines/configurations.nix @@ -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; diff --git a/machines/core/core.nix b/machines/core/core.nix index e7ccffd..4534440 100644 --- a/machines/core/core.nix +++ b/machines/core/core.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ pkgs, ... }: { # Packages environment.systemPackages = with pkgs; [ diff --git a/machines/core/modules.nix b/machines/core/modules.nix index d6f72b4..d6a6eac 100644 --- a/machines/core/modules.nix +++ b/machines/core/modules.nix @@ -1,5 +1,4 @@ -{ config, lib, pkgs, ... }: - +{ ... }: { boot.initrd = { availableKernelModules = [ diff --git a/machines/core/network.nix b/machines/core/network.nix index 7cb776c..e44b0a1 100644 --- a/machines/core/network.nix +++ b/machines/core/network.nix @@ -1,5 +1,4 @@ -{ config, lib, pkgs, ... }: - +{ ... }: { networking.networkmanager = { enable = true; diff --git a/machines/core/nix.nix b/machines/core/nix.nix index 525637c..595cb99 100644 --- a/machines/core/nix.nix +++ b/machines/core/nix.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, inputs, ... }: +{ config, pkgs, inputs, ... }: { nix = { daemonCPUSchedPolicy = "idle"; diff --git a/machines/core/users.nix b/machines/core/users.nix index 7ff4da2..5e0a3e3 100644 --- a/machines/core/users.nix +++ b/machines/core/users.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, ... }: { sops.secrets."users/felix/password".neededForUsers = true; sops.secrets."users/felix/password" = { }; diff --git a/machines/newton/boot.nix b/machines/newton/boot.nix index 387a8ea..f78087f 100644 --- a/machines/newton/boot.nix +++ b/machines/newton/boot.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: { boot.loader = { timeout = 1; diff --git a/machines/newton/configuration.nix b/machines/newton/configuration.nix index ac5eb72..5c1b0fa 100644 --- a/machines/newton/configuration.nix +++ b/machines/newton/configuration.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: { imports = [ ./boot.nix diff --git a/machines/newton/hardware-configuration.nix b/machines/newton/hardware-configuration.nix index 4aaa895..35a55d1 100644 --- a/machines/newton/hardware-configuration.nix +++ b/machines/newton/hardware-configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; diff --git a/machines/newton/network.nix b/machines/newton/network.nix index fc99512..887aa6a 100644 --- a/machines/newton/network.nix +++ b/machines/newton/network.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, ... }: let ifname = "ens18"; diff --git a/machines/newton/services.nix b/machines/newton/services.nix index d368fe4..1590d48 100644 --- a/machines/newton/services.nix +++ b/machines/newton/services.nix @@ -1,5 +1,5 @@ # Deployed services -{ config, lib, ... }: +{ config, ... }: let secrets = config.sops.secrets; in diff --git a/machines/newton/system.nix b/machines/newton/system.nix index 4f93b2e..f743629 100644 --- a/machines/newton/system.nix +++ b/machines/newton/system.nix @@ -1,8 +1,5 @@ # enabled system services -{ config, lib, ... }: -let - secrets = config.sops.secrets; -in +{ ... }: { my.system = { podman.enable = true; diff --git a/machines/serverle/configuration.nix b/machines/serverle/configuration.nix index fe1b734..7a59726 100644 --- a/machines/serverle/configuration.nix +++ b/machines/serverle/configuration.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: { imports = [ ./disko-config.nix diff --git a/machines/serverle/hardware-configuration.nix b/machines/serverle/hardware-configuration.nix index d8c8351..5f3580e 100644 --- a/machines/serverle/hardware-configuration.nix +++ b/machines/serverle/hardware-configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ ... }: { boot = { loader = { diff --git a/machines/serverle/network.nix b/machines/serverle/network.nix index fface95..3caf12e 100644 --- a/machines/serverle/network.nix +++ b/machines/serverle/network.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ ... }: { networking.firewall.allowedTCPPorts = [ 8080 # aria diff --git a/machines/serverle/services.nix b/machines/serverle/services.nix index 03c3c79..fe9e50f 100644 --- a/machines/serverle/services.nix +++ b/machines/serverle/services.nix @@ -1,5 +1,5 @@ # Deployed services -{ config, lib, ... }: +{ config, ... }: let secrets = config.sops.secrets; in diff --git a/machines/serverle/system.nix b/machines/serverle/system.nix index 36dd563..e0076d2 100644 --- a/machines/serverle/system.nix +++ b/machines/serverle/system.nix @@ -1,8 +1,5 @@ # enabled system services -{ config, lib, ... }: -let - secrets = config.sops.secrets; -in +{ ... }: { my.system = { avahi.enable = true; diff --git a/machines/serverle/wifi.nix b/machines/serverle/wifi.nix index 9d00d9b..e57c8c5 100644 --- a/machines/serverle/wifi.nix +++ b/machines/serverle/wifi.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { sops.secrets."wifi/bismarck" = { path = "/etc/NetworkManager/system-connections/Bismarck WLAN.nmconnection"; diff --git a/machines/thinkman/boot.nix b/machines/thinkman/boot.nix index 6aeea90..4c5304d 100644 --- a/machines/thinkman/boot.nix +++ b/machines/thinkman/boot.nix @@ -1,5 +1,4 @@ -{ config, lib, pkgs, ... }: - +{ ... }: { boot = { loader = { diff --git a/machines/thinkman/configuration.nix b/machines/thinkman/configuration.nix index acee48c..1552a63 100644 --- a/machines/thinkman/configuration.nix +++ b/machines/thinkman/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ ... }: { imports = [ ./boot.nix diff --git a/machines/thinkman/hardware-configuration.nix b/machines/thinkman/hardware-configuration.nix index f7fac78..f50c8e3 100644 --- a/machines/thinkman/hardware-configuration.nix +++ b/machines/thinkman/hardware-configuration.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ ... }: let cpuFlavor = "intel"; in diff --git a/machines/thinkman/network.nix b/machines/thinkman/network.nix index 7c8fafd..d6f7693 100644 --- a/machines/thinkman/network.nix +++ b/machines/thinkman/network.nix @@ -1,5 +1,5 @@ # network settings -{ config, lib, ... }: +{ ... }: { # hotfixes for dns settings networking.extraHosts = diff --git a/machines/thinkman/profiles.nix b/machines/thinkman/profiles.nix index 0d40845..67a0a7b 100644 --- a/machines/thinkman/profiles.nix +++ b/machines/thinkman/profiles.nix @@ -1,8 +1,5 @@ # enabled profiles -{ config, lib, ... }: -let - secrets = config.sops.secrets; -in +{ ... }: { my.profiles = { "3d-design".enable = true; diff --git a/machines/thinkman/services.nix b/machines/thinkman/services.nix index 9306651..c69a17a 100644 --- a/machines/thinkman/services.nix +++ b/machines/thinkman/services.nix @@ -1,5 +1,5 @@ # Deployed services -{ config, lib, ... }: +{ config, ... }: let secrets = config.sops.secrets; in diff --git a/machines/thinkman/system.nix b/machines/thinkman/system.nix index 517df06..a1e06d8 100644 --- a/machines/thinkman/system.nix +++ b/machines/thinkman/system.nix @@ -1,8 +1,5 @@ # enabled system services -{ config, lib, ... }: -let - secrets = config.sops.secrets; -in +{ ... }: { my.system = { avahi.enable = true; diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix index 5e1318f..7ea0b04 100644 --- a/modules/hardware/default.nix +++ b/modules/hardware/default.nix @@ -1,6 +1,5 @@ # Hardware-related modules { ... }: - { imports = [ ./bluetooth diff --git a/modules/hardware/drive-monitor/default.nix b/modules/hardware/drive-monitor/default.nix index e245aa7..09ab6f8 100644 --- a/modules/hardware/drive-monitor/default.nix +++ b/modules/hardware/drive-monitor/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.my.hardware.drive-monitor; in diff --git a/modules/hardware/firmware/default.nix b/modules/hardware/firmware/default.nix index 5d3f63d..7f46c77 100644 --- a/modules/hardware/firmware/default.nix +++ b/modules/hardware/firmware/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.my.hardware.firmware; in diff --git a/modules/services/bazarr/default.nix b/modules/services/bazarr/default.nix index 44a7b4d..4ca0c95 100644 --- a/modules/services/bazarr/default.nix +++ b/modules/services/bazarr/default.nix @@ -1,5 +1,5 @@ # manages and downloads subtitles -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.my.services.bazarr; domain = config.networking.domain; diff --git a/modules/services/blackbox/default.nix b/modules/services/blackbox/default.nix index 18ece89..f406957 100644 --- a/modules/services/blackbox/default.nix +++ b/modules/services/blackbox/default.nix @@ -2,7 +2,6 @@ { config, lib, pkgs, ... }: let cfg = config.my.services.blackbox; - domain = config.networking.domain; blackBoxConfig = { modules = { http_2xx = { diff --git a/modules/services/blocky/default.nix b/modules/services/blocky/default.nix index 2463161..b2f9923 100644 --- a/modules/services/blocky/default.nix +++ b/modules/services/blocky/default.nix @@ -2,7 +2,6 @@ { config, lib, pkgs, ... }: let cfg = config.my.services.blocky; - domain = config.networking.domain; in { options.my.services.blocky = with lib; { diff --git a/modules/services/dyndns/default.nix b/modules/services/dyndns/default.nix index afedb34..987d88c 100644 --- a/modules/services/dyndns/default.nix +++ b/modules/services/dyndns/default.nix @@ -1,5 +1,5 @@ # running dyndns updates -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.my.services.dyndns; domain = config.networking.domain; diff --git a/modules/services/exportarr/default.nix b/modules/services/exportarr/default.nix index d87bdcb..f6567ec 100644 --- a/modules/services/exportarr/default.nix +++ b/modules/services/exportarr/default.nix @@ -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."; }) diff --git a/modules/services/homepage/default.nix b/modules/services/homepage/default.nix index c689fec..0f57c79 100644 --- a/modules/services/homepage/default.nix +++ b/modules/services/homepage/default.nix @@ -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; diff --git a/modules/services/homer/config.nix b/modules/services/homer/config.nix index 37ae1dd..9828c86 100644 --- a/modules/services/homer/config.nix +++ b/modules/services/homer/config.nix @@ -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}/" ]; }; } diff --git a/modules/services/initrd-ssh/default.nix b/modules/services/initrd-ssh/default.nix index 2c85830..9523b63 100644 --- a/modules/services/initrd-ssh/default.nix +++ b/modules/services/initrd-ssh/default.nix @@ -1,5 +1,5 @@ # The Free Software Media System -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.my.services.initrd-ssh; in diff --git a/modules/services/jellyseerr/default.nix b/modules/services/jellyseerr/default.nix index 943ef3b..ff72222 100644 --- a/modules/services/jellyseerr/default.nix +++ b/modules/services/jellyseerr/default.nix @@ -1,5 +1,5 @@ # manages and downloads films -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.my.services.jellyseerr; domain = config.networking.domain; diff --git a/modules/services/loki/default.nix b/modules/services/loki/default.nix index c85be4c..13e6b61 100644 --- a/modules/services/loki/default.nix +++ b/modules/services/loki/default.nix @@ -2,7 +2,6 @@ { config, lib, pkgs, ... }: let cfg = config.my.services.loki; - domain = config.networking.domain; in { options.my.services.loki = with lib; { diff --git a/modules/services/matrix-bot/default.nix b/modules/services/matrix-bot/default.nix index db8a7c1..e293147 100644 --- a/modules/services/matrix-bot/default.nix +++ b/modules/services/matrix-bot/default.nix @@ -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; { diff --git a/modules/services/node-exporter/default.nix b/modules/services/node-exporter/default.nix index cc6f97d..d2c98a8 100644 --- a/modules/services/node-exporter/default.nix +++ b/modules/services/node-exporter/default.nix @@ -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 diff --git a/modules/services/octoprint/default.nix b/modules/services/octoprint/default.nix index d1167ee..bc7d81d 100644 --- a/modules/services/octoprint/default.nix +++ b/modules/services/octoprint/default.nix @@ -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."; diff --git a/modules/services/paperless/default.nix b/modules/services/paperless/default.nix index 4b4d4cc..87f51e5 100644 --- a/modules/services/paperless/default.nix +++ b/modules/services/paperless/default.nix @@ -1,5 +1,5 @@ # document management system -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.my.services.paperless; domain = config.networking.domain; diff --git a/modules/services/passworts/default.nix b/modules/services/passworts/default.nix index d395bf1..e689642 100644 --- a/modules/services/passworts/default.nix +++ b/modules/services/passworts/default.nix @@ -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; diff --git a/modules/services/photoprism/default.nix b/modules/services/photoprism/default.nix index 9de9e3a..e90ed1d 100644 --- a/modules/services/photoprism/default.nix +++ b/modules/services/photoprism/default.nix @@ -1,5 +1,5 @@ # self-hosted photo gallery -{ config, pkgs, lib, ... }: +{ config, lib, ... }: let cfg = config.my.services.photoprism; domain = config.networking.domain; diff --git a/modules/services/promtail/default.nix b/modules/services/promtail/default.nix index d24e06c..6896463 100644 --- a/modules/services/promtail/default.nix +++ b/modules/services/promtail/default.nix @@ -1,5 +1,5 @@ # # log forwarding -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.my.services.promtail; domain = config.networking.domain; diff --git a/modules/services/prowlarr/default.nix b/modules/services/prowlarr/default.nix index 548b8c9..0689277 100644 --- a/modules/services/prowlarr/default.nix +++ b/modules/services/prowlarr/default.nix @@ -1,5 +1,5 @@ # manages indexes -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.my.services.prowlarr; domain = config.networking.domain; diff --git a/modules/services/radarr/default.nix b/modules/services/radarr/default.nix index 6c95a36..57d4440 100644 --- a/modules/services/radarr/default.nix +++ b/modules/services/radarr/default.nix @@ -1,5 +1,5 @@ # manages and downloads films -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.my.services.radarr; domain = config.networking.domain; diff --git a/modules/services/sonarr/default.nix b/modules/services/sonarr/default.nix index ce20e60..a1736b8 100644 --- a/modules/services/sonarr/default.nix +++ b/modules/services/sonarr/default.nix @@ -1,5 +1,5 @@ # manages and downloads series -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.my.services.sonarr; domain = config.networking.domain; diff --git a/modules/system/avahi/default.nix b/modules/system/avahi/default.nix index beb8f93..4616591 100644 --- a/modules/system/avahi/default.nix +++ b/modules/system/avahi/default.nix @@ -1,5 +1,5 @@ # avahi related settings -{ config, inputs, lib, options, pkgs, ... }: +{ config, lib, options, ... }: let cfg = config.my.system.avahi; in diff --git a/modules/system/docker/default.nix b/modules/system/docker/default.nix index af1f368..bf95406 100644 --- a/modules/system/docker/default.nix +++ b/modules/system/docker/default.nix @@ -1,5 +1,5 @@ # Docker related settings -{ config, inputs, lib, options, pkgs, ... }: +{ config, lib, options, pkgs, ... }: let cfg = config.my.system.docker; in diff --git a/modules/system/podman/default.nix b/modules/system/podman/default.nix index 6f99dd9..f2858e3 100644 --- a/modules/system/podman/default.nix +++ b/modules/system/podman/default.nix @@ -1,5 +1,5 @@ # Podman related settings -{ config, inputs, lib, options, pkgs, ... }: +{ config, lib, options, pkgs, ... }: let cfg = config.my.system.podman; in diff --git a/overlays/default.nix b/overlays/default.nix index 389d35c..c8a37e2 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -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"; diff --git a/pkgs/default.nix b/pkgs/default.nix index 8f61f97..70a8552 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,4 +1,4 @@ -final: prev: +final: _prev: { homer = final.callPackage ./homer { }; grafana-dashboards = final.callPackage ./grafana-dashboards { }; diff --git a/pkgs/grafana-dashboards/default.nix b/pkgs/grafana-dashboards/default.nix index 423924d..5a04742 100644 --- a/pkgs/grafana-dashboards/default.nix +++ b/pkgs/grafana-dashboards/default.nix @@ -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 }); }) diff --git a/profiles/default.nix b/profiles/default.nix index a554935..101b214 100644 --- a/profiles/default.nix +++ b/profiles/default.nix @@ -1,5 +1,4 @@ # Configuration that spans across system and home, or are collections of modules -{ ... }: { imports = [ ./3d-design diff --git a/profiles/sway/autostart.nix b/profiles/sway/autostart.nix index b8678fa..494fc81 100644 --- a/profiles/sway/autostart.nix +++ b/profiles/sway/autostart.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.my.profiles.sway-autostart; in diff --git a/profiles/sway/location.nix b/profiles/sway/location.nix index bea5d1b..ffd3215 100644 --- a/profiles/sway/location.nix +++ b/profiles/sway/location.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let cfg = config.my.profiles.sway-location; in