From 3dfe40e4e218e00462a4d323099414c3ec27800d Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 4 May 2023 13:06:08 +0200 Subject: [PATCH] apply deadnix --- .woodpecker.yml | 1 + flake.lock | 24 +++++++++---------- nixos/common/generic-vm.nix | 2 +- nixos/common/modules/unpackerr.nix | 2 +- nixos/common/users/default.nix | 2 +- nixos/hosts/hades/_template/configuration.nix | 2 +- nixos/hosts/hades/bastion/configuration.nix | 2 +- nixos/hosts/hades/bazarr/configuration.nix | 2 +- .../docker-registry-proxy/configuration.nix | 2 +- .../hades/docker-registry/configuration.nix | 2 +- nixos/hosts/hades/jackett/configuration.nix | 2 +- .../hades/lucy/hardware-configuration.nix | 2 +- nixos/hosts/hades/minio/configuration.nix | 2 +- nixos/hosts/hades/overseerr/configuration.nix | 2 +- nixos/hosts/hades/pmm/configuration.nix | 2 +- nixos/hosts/hades/prowlarr/configuration.nix | 4 ++-- nixos/hosts/hades/radarr/configuration.nix | 3 +-- nixos/hosts/hades/sonarr/configuration.nix | 2 +- nixos/hosts/hades/tautulli/configuration.nix | 2 +- .../hosts/olympus/_template/configuration.nix | 2 +- nixos/hosts/olympus/bastion/configuration.nix | 2 +- .../bastion/hardware-configuration.nix | 2 +- nixos/hosts/olympus/bastion/home.nix | 2 +- nixos/hosts/olympus/dhcp/configuration.nix | 2 +- .../olympus/kubernetes/configuration.nix | 2 +- .../hosts/olympus/minecraft/configuration.nix | 2 +- nixos/hosts/olympus/minio/configuration.nix | 2 +- nixos/hosts/olympus/nginx/configuration.nix | 2 +- nixos/hosts/olympus/ntfy/configuration.nix | 2 +- nixos/hosts/olympus/outline/configuration.nix | 2 +- nixos/hosts/olympus/unifi/configuration.nix | 2 +- nixos/hosts/olympus/vault-0/configuration.nix | 2 +- .../hosts/olympus/wireguard/configuration.nix | 2 +- nixos/hosts/thalassa/aoife/configuration.nix | 2 +- .../thalassa/aoife/hardware-configuration.nix | 2 +- nixos/hosts/thalassa/eevee/configuration.nix | 2 +- .../thalassa/eevee/hardware-configuration.nix | 2 +- nixos/hosts/thalassa/eevee/home/default.nix | 8 +------ nixos/hosts/thalassa/eevee/home/theme.nix | 2 +- nixos/hosts/thalassa/null/configuration.nix | 2 +- .../thalassa/null/hardware-configuration.nix | 2 +- nixos/hosts/thalassa/null/home/default.nix | 2 +- nixos/hosts/thalassa/null/home/hyprland.nix | 2 +- nixos/hosts/thalassa/null/home/neovim.nix | 2 +- nixos/hosts/thalassa/null/home/theme.nix | 2 +- nixos/pkgs/default.nix | 2 +- nixos/pkgs/dnd-5e-latex-template/default.nix | 2 +- nixos/pkgs/gitea-agatheme/default.nix | 2 +- nixos/pkgs/glitch-soc/default.nix | 2 +- nixos/pkgs/glitch-soc/update.nix | 3 +-- nixos/pkgs/vscode-extensions/platformio.nix | 2 +- nixos/templates/iso-graphical.nix | 2 +- nixos/templates/proxmox-lxc.nix | 2 +- nixos/templates/proxmox-vm.nix | 2 +- nixos/util.nix | 3 +-- 55 files changed, 67 insertions(+), 75 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index cdd77d85..0a8e125e 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -5,4 +5,5 @@ pipeline: - NIX_CONFIG=experimental-features = nix-command flakes commands: - nix run 'nixpkgs#statix' check + - nix run 'github:astro/deadnix' -- -f - nix run 'nixpkgs#yamllint' . diff --git a/flake.lock b/flake.lock index 206b6ede..113ab593 100644 --- a/flake.lock +++ b/flake.lock @@ -502,11 +502,11 @@ ] }, "locked": { - "lastModified": 1682977601, - "narHash": "sha256-F1Va/Uiw2tVNn27FLqWyBkiqDyIm/eCamw9wA/GK8Fw=", + "lastModified": 1683153724, + "narHash": "sha256-wiQ8pBYbbPklLngAz5w3VvwmpLqTNroKc7um56iCLHo=", "owner": "nix-community", "repo": "home-manager", - "rev": "0e4c33d76006c9080d2f228ba1c2308e3e4d7be6", + "rev": "514c0a71f47cb80282742d7e4b6913c2c0582c2d", "type": "github" }, "original": { @@ -799,11 +799,11 @@ }, "nixpkgs_22-11": { "locked": { - "lastModified": 1683028696, - "narHash": "sha256-saPKTDj+HB9aPvB59wGcJ64CifRuiIt2CHvSbh7UHz8=", + "lastModified": 1683103914, + "narHash": "sha256-Mbrst3sLaiL55eOlZOEL8kB+XTWffaQVfcI03YWiryg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5dab6490fe6d72b3f120ae8660181e20f396fbdf", + "rev": "54495a4eafe99c537695a87fe04cb50bf17e651d", "type": "github" }, "original": { @@ -815,11 +815,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1683151118, - "narHash": "sha256-BY35o9AEqG1ckxJ0RECdIMYR93t0Ox3oTxPpu3WZbw8=", + "lastModified": 1683186265, + "narHash": "sha256-XuGXnnF/mpM0CR4M4dbuMYsARgHLqtpolh5nPA9+040=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7d9242bd035c3f9f1c357101d49ffac11116fb06", + "rev": "3428bdf3c93a7608615dddd44dec50c3df89b4be", "type": "github" }, "original": { @@ -946,11 +946,11 @@ }, "nur": { "locked": { - "lastModified": 1683148483, - "narHash": "sha256-gdjZHh/SeUVA6YUI1ERRpvKnLmeIk4PbQ4hBf0bcKZs=", + "lastModified": 1683183829, + "narHash": "sha256-Ta7qCL+mWSBt3851GYtbJpuAcCfNvNxD+MqfK+Yj4RU=", "owner": "nix-community", "repo": "NUR", - "rev": "c49d673b261c63732c651aacb99a309ffe95674b", + "rev": "82a30341dc98d46808ea11ba932e95856e53452c", "type": "github" }, "original": { diff --git a/nixos/common/generic-vm.nix b/nixos/common/generic-vm.nix index 856a8b37..086bf638 100644 --- a/nixos/common/generic-vm.nix +++ b/nixos/common/generic-vm.nix @@ -1,4 +1,4 @@ -{ lib, ... }: { +_: { networking.useDHCP = true; # Enable qemu guest agent diff --git a/nixos/common/modules/unpackerr.nix b/nixos/common/modules/unpackerr.nix index 36f522b5..4a8043ba 100644 --- a/nixos/common/modules/unpackerr.nix +++ b/nixos/common/modules/unpackerr.nix @@ -258,7 +258,7 @@ in after = [ "network.target" ]; description = "unpackerr system service"; # Filter out all unset variables else unpackerr complains - environment = filterAttrs (n: v: stringLength v > 0) + environment = filterAttrs (_n: v: stringLength v > 0) { # General options UN_DEBUG = "${toString cfg.debug}"; diff --git a/nixos/common/users/default.nix b/nixos/common/users/default.nix index 0155aa07..f5152cbc 100644 --- a/nixos/common/users/default.nix +++ b/nixos/common/users/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, inputs, ... }: +{ config, pkgs, lib, ... }: { imports = [ ./laura.nix diff --git a/nixos/hosts/hades/_template/configuration.nix b/nixos/hosts/hades/_template/configuration.nix index 7b6c670d..0947f389 100644 --- a/nixos/hosts/hades/_template/configuration.nix +++ b/nixos/hosts/hades/_template/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ pkgs, ... }: { imports = [ ]; diff --git a/nixos/hosts/hades/bastion/configuration.nix b/nixos/hosts/hades/bastion/configuration.nix index a2a6cd00..0d80fa25 100644 --- a/nixos/hosts/hades/bastion/configuration.nix +++ b/nixos/hosts/hades/bastion/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ pkgs, lib, ... }: { networking.interfaces.eth0.useDHCP = true; diff --git a/nixos/hosts/hades/bazarr/configuration.nix b/nixos/hosts/hades/bazarr/configuration.nix index 628d5f02..9a679ddb 100644 --- a/nixos/hosts/hades/bazarr/configuration.nix +++ b/nixos/hosts/hades/bazarr/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +_: { system.stateVersion = "22.11"; networking.interfaces.eth0.useDHCP = true; diff --git a/nixos/hosts/hades/docker-registry-proxy/configuration.nix b/nixos/hosts/hades/docker-registry-proxy/configuration.nix index 75c381d1..7574924c 100644 --- a/nixos/hosts/hades/docker-registry-proxy/configuration.nix +++ b/nixos/hosts/hades/docker-registry-proxy/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, ... }: let vs = config.vault-secrets.secrets; in { system.stateVersion = "22.05"; diff --git a/nixos/hosts/hades/docker-registry/configuration.nix b/nixos/hosts/hades/docker-registry/configuration.nix index d7f91171..1f7cd156 100644 --- a/nixos/hosts/hades/docker-registry/configuration.nix +++ b/nixos/hosts/hades/docker-registry/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, ... }: let vs = config.vault-secrets.secrets; in { system.stateVersion = "22.05"; diff --git a/nixos/hosts/hades/jackett/configuration.nix b/nixos/hosts/hades/jackett/configuration.nix index e749d648..2ccfd137 100644 --- a/nixos/hosts/hades/jackett/configuration.nix +++ b/nixos/hosts/hades/jackett/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +_: { system.stateVersion = "21.05"; networking.interfaces.eth0.useDHCP = true; diff --git a/nixos/hosts/hades/lucy/hardware-configuration.nix b/nixos/hosts/hades/lucy/hardware-configuration.nix index 650e74b6..b658cbc2 100644 --- a/nixos/hosts/hades/lucy/hardware-configuration.nix +++ b/nixos/hosts/hades/lucy/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ lib, modulesPath, ... }: { imports = diff --git a/nixos/hosts/hades/minio/configuration.nix b/nixos/hosts/hades/minio/configuration.nix index 5d2f7555..8e2e335e 100644 --- a/nixos/hosts/hades/minio/configuration.nix +++ b/nixos/hosts/hades/minio/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, ... }: let vs = config.vault-secrets.secrets; in { diff --git a/nixos/hosts/hades/overseerr/configuration.nix b/nixos/hosts/hades/overseerr/configuration.nix index 6810d75f..669ce1c0 100644 --- a/nixos/hosts/hades/overseerr/configuration.nix +++ b/nixos/hosts/hades/overseerr/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ ... }: { imports = [ ]; diff --git a/nixos/hosts/hades/pmm/configuration.nix b/nixos/hosts/hades/pmm/configuration.nix index 44b112cd..844c60d5 100644 --- a/nixos/hosts/hades/pmm/configuration.nix +++ b/nixos/hosts/hades/pmm/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ pkgs, ... }: let datadir = "/var/lib/pmm/config"; container = "meisnate12/plex-meta-manager:latest"; diff --git a/nixos/hosts/hades/prowlarr/configuration.nix b/nixos/hosts/hades/prowlarr/configuration.nix index 9c0d325b..f22d49e0 100644 --- a/nixos/hosts/hades/prowlarr/configuration.nix +++ b/nixos/hosts/hades/prowlarr/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +_: { networking.interfaces.eth0.useDHCP = true; system.stateVersion = "22.11"; @@ -7,7 +7,7 @@ enable = true; openFirewall = true; }; - + virtualisation.podman.enable = true; virtualisation.oci-containers = { diff --git a/nixos/hosts/hades/radarr/configuration.nix b/nixos/hosts/hades/radarr/configuration.nix index 1ba806c7..5a3b874b 100644 --- a/nixos/hosts/hades/radarr/configuration.nix +++ b/nixos/hosts/hades/radarr/configuration.nix @@ -1,5 +1,4 @@ -{ config, pkgs, ... }: -{ +_: { system.stateVersion = "21.05"; networking.interfaces.eth0.useDHCP = true; diff --git a/nixos/hosts/hades/sonarr/configuration.nix b/nixos/hosts/hades/sonarr/configuration.nix index d9d9ce4a..c74c9205 100644 --- a/nixos/hosts/hades/sonarr/configuration.nix +++ b/nixos/hosts/hades/sonarr/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +_: { system.stateVersion = "21.05"; networking.interfaces.eth0.useDHCP = true; diff --git a/nixos/hosts/hades/tautulli/configuration.nix b/nixos/hosts/hades/tautulli/configuration.nix index 84ef8337..9976ee2a 100644 --- a/nixos/hosts/hades/tautulli/configuration.nix +++ b/nixos/hosts/hades/tautulli/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ ... }: { imports = [ ]; diff --git a/nixos/hosts/olympus/_template/configuration.nix b/nixos/hosts/olympus/_template/configuration.nix index 7b6c670d..0947f389 100644 --- a/nixos/hosts/olympus/_template/configuration.nix +++ b/nixos/hosts/olympus/_template/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ pkgs, ... }: { imports = [ ]; diff --git a/nixos/hosts/olympus/bastion/configuration.nix b/nixos/hosts/olympus/bastion/configuration.nix index 0c340d75..d1575759 100644 --- a/nixos/hosts/olympus/bastion/configuration.nix +++ b/nixos/hosts/olympus/bastion/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ pkgs, lib, ... }: +{ pkgs, ... }: let fix-vscode = pkgs.writeScriptBin "fix-vscode" '' #!${pkgs.stdenv.shell} diff --git a/nixos/hosts/olympus/bastion/hardware-configuration.nix b/nixos/hosts/olympus/bastion/hardware-configuration.nix index 9c6082ba..85ea04d7 100644 --- a/nixos/hosts/olympus/bastion/hardware-configuration.nix +++ b/nixos/hosts/olympus/bastion/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ modulesPath, ... }: { imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; diff --git a/nixos/hosts/olympus/bastion/home.nix b/nixos/hosts/olympus/bastion/home.nix index dcfdd22e..fad23ec8 100644 --- a/nixos/hosts/olympus/bastion/home.nix +++ b/nixos/hosts/olympus/bastion/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: { +_: { programs.home-manager.enable = true; home.username = "victor"; home.homeDirectory = "/home/victor"; diff --git a/nixos/hosts/olympus/dhcp/configuration.nix b/nixos/hosts/olympus/dhcp/configuration.nix index dcafb0ac..13b002ba 100644 --- a/nixos/hosts/olympus/dhcp/configuration.nix +++ b/nixos/hosts/olympus/dhcp/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, flat_hosts, ... }: +{ config, flat_hosts, ... }: let inherit (builtins) filter hasAttr; hostToKea = { hostname, mac, ip, ... }: { diff --git a/nixos/hosts/olympus/kubernetes/configuration.nix b/nixos/hosts/olympus/kubernetes/configuration.nix index a241cb2d..fe5dd43a 100644 --- a/nixos/hosts/olympus/kubernetes/configuration.nix +++ b/nixos/hosts/olympus/kubernetes/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, hosts, ... }: { +{ pkgs, ... }: { # packages for administration tasks environment.systemPackages = with pkgs; [ kompose kubectl k9s k3s ]; diff --git a/nixos/hosts/olympus/minecraft/configuration.nix b/nixos/hosts/olympus/minecraft/configuration.nix index 35a58446..83bcd573 100644 --- a/nixos/hosts/olympus/minecraft/configuration.nix +++ b/nixos/hosts/olympus/minecraft/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ lib, config, pkgs, inputs, ... }: +{ lib, pkgs, ... }: { imports = [ ]; diff --git a/nixos/hosts/olympus/minio/configuration.nix b/nixos/hosts/olympus/minio/configuration.nix index 95187b2b..eae48e54 100644 --- a/nixos/hosts/olympus/minio/configuration.nix +++ b/nixos/hosts/olympus/minio/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, ... }: +{ config, pkgs, ... }: let vs = config.vault-secrets.secrets; listenPort = 9000; diff --git a/nixos/hosts/olympus/nginx/configuration.nix b/nixos/hosts/olympus/nginx/configuration.nix index 1a05a8c6..5d21f764 100644 --- a/nixos/hosts/olympus/nginx/configuration.nix +++ b/nixos/hosts/olympus/nginx/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, nodes, ... }: +{ pkgs, ... }: let proxy = url: { enableACME = true; diff --git a/nixos/hosts/olympus/ntfy/configuration.nix b/nixos/hosts/olympus/ntfy/configuration.nix index 7dcb516b..97827045 100644 --- a/nixos/hosts/olympus/ntfy/configuration.nix +++ b/nixos/hosts/olympus/ntfy/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ pkgs, ... }: { imports = [ ]; diff --git a/nixos/hosts/olympus/outline/configuration.nix b/nixos/hosts/olympus/outline/configuration.nix index 452fabdb..d9f9382b 100644 --- a/nixos/hosts/olympus/outline/configuration.nix +++ b/nixos/hosts/olympus/outline/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ config, ... }: let vs = config.vault-secrets.secrets; in { imports = [ ]; diff --git a/nixos/hosts/olympus/unifi/configuration.nix b/nixos/hosts/olympus/unifi/configuration.nix index 5a0adb17..e2c08ed4 100644 --- a/nixos/hosts/olympus/unifi/configuration.nix +++ b/nixos/hosts/olympus/unifi/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, ... }: +{ pkgs, lib, ... }: { imports = [ ]; diff --git a/nixos/hosts/olympus/vault-0/configuration.nix b/nixos/hosts/olympus/vault-0/configuration.nix index 774544ed..359751a9 100644 --- a/nixos/hosts/olympus/vault-0/configuration.nix +++ b/nixos/hosts/olympus/vault-0/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, hosts, ... }: { +_: { # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/nixos/hosts/olympus/wireguard/configuration.nix b/nixos/hosts/olympus/wireguard/configuration.nix index efeb580e..9b5ed7e1 100644 --- a/nixos/hosts/olympus/wireguard/configuration.nix +++ b/nixos/hosts/olympus/wireguard/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ lib, config, pkgs, inputs, ... }: +{ lib, config, pkgs, ... }: let vs = config.vault-secrets.secrets; in { imports = [ ]; diff --git a/nixos/hosts/thalassa/aoife/configuration.nix b/nixos/hosts/thalassa/aoife/configuration.nix index 29ed1f3c..7699dccb 100644 --- a/nixos/hosts/thalassa/aoife/configuration.nix +++ b/nixos/hosts/thalassa/aoife/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ pkgs, inputs, ... }: { +{ inputs, ... }: { imports = [ ../../../common/desktop ./hardware-configuration.nix diff --git a/nixos/hosts/thalassa/aoife/hardware-configuration.nix b/nixos/hosts/thalassa/aoife/hardware-configuration.nix index 99593b99..13bc8c9a 100644 --- a/nixos/hosts/thalassa/aoife/hardware-configuration.nix +++ b/nixos/hosts/thalassa/aoife/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/nixos/hosts/thalassa/eevee/configuration.nix b/nixos/hosts/thalassa/eevee/configuration.nix index 9adf13c8..1c713a82 100644 --- a/nixos/hosts/thalassa/eevee/configuration.nix +++ b/nixos/hosts/thalassa/eevee/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, inputs, ... }: { +{ pkgs, inputs, ... }: { imports = [ ../../../common/desktop ./hardware-configuration.nix diff --git a/nixos/hosts/thalassa/eevee/hardware-configuration.nix b/nixos/hosts/thalassa/eevee/hardware-configuration.nix index 1e1afb23..536e2b04 100644 --- a/nixos/hosts/thalassa/eevee/hardware-configuration.nix +++ b/nixos/hosts/thalassa/eevee/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/nixos/hosts/thalassa/eevee/home/default.nix b/nixos/hosts/thalassa/eevee/home/default.nix index cbc0a038..ce2eaae2 100644 --- a/nixos/hosts/thalassa/eevee/home/default.nix +++ b/nixos/hosts/thalassa/eevee/home/default.nix @@ -1,10 +1,4 @@ -{ lib, config, pkgs, inputs, ... }: -let - tex = pkgs.texlive.combine { - inherit (pkgs.texlive) scheme-full; - dnd-5e-latex-template = { pkgs = [ pkgs.v.dnd-5e-latex-template ]; }; - }; -in { +_: { programs.home-manager.enable = true; home.username = "victor"; diff --git a/nixos/hosts/thalassa/eevee/home/theme.nix b/nixos/hosts/thalassa/eevee/home/theme.nix index 8aca1e7c..aa462fc9 100644 --- a/nixos/hosts/thalassa/eevee/home/theme.nix +++ b/nixos/hosts/thalassa/eevee/home/theme.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ pkgs, config, ... }: let theme = "Catppuccin-Pink-Dark"; cursorTheme = config.home.pointerCursor.name; diff --git a/nixos/hosts/thalassa/null/configuration.nix b/nixos/hosts/thalassa/null/configuration.nix index 826b71d6..4b40a89a 100644 --- a/nixos/hosts/thalassa/null/configuration.nix +++ b/nixos/hosts/thalassa/null/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, lib, inputs, ... }: +{ pkgs, inputs, ... }: let nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" '' export __NV_PRIME_RENDER_OFFLOAD=1 diff --git a/nixos/hosts/thalassa/null/hardware-configuration.nix b/nixos/hosts/thalassa/null/hardware-configuration.nix index 79e4113e..d9de3caf 100644 --- a/nixos/hosts/thalassa/null/hardware-configuration.nix +++ b/nixos/hosts/thalassa/null/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/nixos/hosts/thalassa/null/home/default.nix b/nixos/hosts/thalassa/null/home/default.nix index 9e9dc39a..f1285906 100644 --- a/nixos/hosts/thalassa/null/home/default.nix +++ b/nixos/hosts/thalassa/null/home/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, inputs, texlive, ... }: +{ config, pkgs, inputs, texlive, ... }: let tex = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-full; diff --git a/nixos/hosts/thalassa/null/home/hyprland.nix b/nixos/hosts/thalassa/null/home/hyprland.nix index 7329a2f5..6dac363f 100644 --- a/nixos/hosts/thalassa/null/home/hyprland.nix +++ b/nixos/hosts/thalassa/null/home/hyprland.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, config, ... }: { +{ pkgs, config, ... }: { home.file.".config/hypr/hyprpaper.conf".text = '' ipc = off preload = ~/cloud/Pictures/Wallpapers-Laptop/wallpaper-nix-pink.png diff --git a/nixos/hosts/thalassa/null/home/neovim.nix b/nixos/hosts/thalassa/null/home/neovim.nix index eecb152d..ac51ba65 100644 --- a/nixos/hosts/thalassa/null/home/neovim.nix +++ b/nixos/hosts/thalassa/null/home/neovim.nix @@ -1,4 +1,4 @@ -{ inputs, pkgs, lib, ... }: { +{ inputs, pkgs, ... }: { imports = [ inputs.nixvim.homeManagerModules.nixvim ]; programs.nixvim = { enable = true; diff --git a/nixos/hosts/thalassa/null/home/theme.nix b/nixos/hosts/thalassa/null/home/theme.nix index b75113c5..128cd75e 100644 --- a/nixos/hosts/thalassa/null/home/theme.nix +++ b/nixos/hosts/thalassa/null/home/theme.nix @@ -32,7 +32,7 @@ let mantle = "292c3c"; crust = "232634"; - hex = mapAttrs (name: value: "#${value}") colour; + hex = mapAttrs (_name: value: "#${value}") colour; }; in { home.file.".xsettingsd".text = '' diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix index d87e5646..df261330 100644 --- a/nixos/pkgs/default.nix +++ b/nixos/pkgs/default.nix @@ -1,5 +1,5 @@ # nix-build -E 'with import {}; callPackage ./default.nix {}' -final: prev: { +_final: prev: { v = { glitch-soc = prev.callPackage ./glitch-soc { }; diff --git a/nixos/pkgs/dnd-5e-latex-template/default.nix b/nixos/pkgs/dnd-5e-latex-template/default.nix index de795c6e..3114dc73 100644 --- a/nixos/pkgs/dnd-5e-latex-template/default.nix +++ b/nixos/pkgs/dnd-5e-latex-template/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: stdenvNoCC.mkDerivation rec { +{ stdenvNoCC, fetchFromGitHub }: stdenvNoCC.mkDerivation rec { pname = "dnd-5e-latex-template"; version = "0.8.0"; tlType = "run"; diff --git a/nixos/pkgs/gitea-agatheme/default.nix b/nixos/pkgs/gitea-agatheme/default.nix index 2a87ad71..ad6460c3 100644 --- a/nixos/pkgs/gitea-agatheme/default.nix +++ b/nixos/pkgs/gitea-agatheme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl }: stdenvNoCC.mkDerivation { +{ stdenvNoCC, fetchurl }: stdenvNoCC.mkDerivation { pname = "gitea-agatheme"; version = "1.2"; diff --git a/nixos/pkgs/glitch-soc/default.nix b/nixos/pkgs/glitch-soc/default.nix index 1ffb5b7e..5db9bd6c 100644 --- a/nixos/pkgs/glitch-soc/default.nix +++ b/nixos/pkgs/glitch-soc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, nodejs-slim, mkYarnPackage, fetchFromGitHub, bundlerEnv, nixosTests +{ lib, stdenv, nodejs-slim, bundlerEnv, nixosTests , yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript , fetchYarnDeps, fixup_yarn_lock diff --git a/nixos/pkgs/glitch-soc/update.nix b/nixos/pkgs/glitch-soc/update.nix index 1bd557a7..2db78f14 100644 --- a/nixos/pkgs/glitch-soc/update.nix +++ b/nixos/pkgs/glitch-soc/update.nix @@ -1,5 +1,4 @@ -{ pkgs -, runCommand +{ runCommand , lib , makeWrapper , yarn2nix diff --git a/nixos/pkgs/vscode-extensions/platformio.nix b/nixos/pkgs/vscode-extensions/platformio.nix index cbee23ec..98d5d7cd 100644 --- a/nixos/pkgs/vscode-extensions/platformio.nix +++ b/nixos/pkgs/vscode-extensions/platformio.nix @@ -1,4 +1,4 @@ -{ vscode-utils, lib }: +{ vscode-utils }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; in buildVscodeMarketplaceExtension { mktplcRef = { diff --git a/nixos/templates/iso-graphical.nix b/nixos/templates/iso-graphical.nix index c73a7748..23630f39 100644 --- a/nixos/templates/iso-graphical.nix +++ b/nixos/templates/iso-graphical.nix @@ -1,4 +1,4 @@ -{ pkgs, modulesPath, lib, config, ... }: { +{ pkgs, modulesPath, lib, ... }: { imports = [ "${modulesPath}/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix" ]; diff --git a/nixos/templates/proxmox-lxc.nix b/nixos/templates/proxmox-lxc.nix index d1313a04..2d1502bd 100644 --- a/nixos/templates/proxmox-lxc.nix +++ b/nixos/templates/proxmox-lxc.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: { +{ lib, ... }: { imports = [ ../common/common.nix ../common/generic-lxc.nix ]; proxmoxLXC = { diff --git a/nixos/templates/proxmox-vm.nix b/nixos/templates/proxmox-vm.nix index b1cdda83..268bcc78 100644 --- a/nixos/templates/proxmox-vm.nix +++ b/nixos/templates/proxmox-vm.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: { +{ lib, ... }: { imports = [ ../common/common.nix ../common/generic-vm.nix ]; proxmox.qemuConf = { diff --git a/nixos/util.nix b/nixos/util.nix index 798913ef..e36ec67c 100644 --- a/nixos/util.nix +++ b/nixos/util.nix @@ -2,7 +2,6 @@ let inherit (builtins) filter attrValues concatMap mapAttrs; inherit (nixpkgs.lib.attrsets) mapAttrsToList; - inherit (nixpkgs.lib) nixosSystem; base_imports = [ home-manager.nixosModules.home-manager mailserver.nixosModules.mailserver @@ -26,7 +25,7 @@ in { inherit base_imports type_import resolve_imports; # Add to whatever realm a host belong to its list of tags add_realm_to_tags = mapAttrs (realm: - mapAttrs (hostname: + mapAttrs (_hostname: { tags ? [ ], ... }@host: host // { tags = [ realm ] ++ tags;