v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions

apply deadnix

Browse source
This commit is contained in:
Vivian 2023-05-04 13:06:08 +02:00
parent 18527ccbf5
commit f534687f65
55 changed files with 67 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.woodpecker.yml
View file

@ -5,4 +5,5 @@ pipeline:
- NIX_CONFIG=experimental-features = nix-command flakes - NIX_CONFIG=experimental-features = nix-command flakes
commands: commands:
- nix run 'nixpkgs#statix' check - nix run 'nixpkgs#statix' check
- nix run 'github:astro/deadnix' -- -f
- nix run 'nixpkgs#yamllint' . - nix run 'nixpkgs#yamllint' .

24
flake.lock generated
View file

@ -502,11 +502,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682977601, "lastModified": 1683153724,
"narHash": "sha256-F1Va/Uiw2tVNn27FLqWyBkiqDyIm/eCamw9wA/GK8Fw=", "narHash": "sha256-wiQ8pBYbbPklLngAz5w3VvwmpLqTNroKc7um56iCLHo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0e4c33d76006c9080d2f228ba1c2308e3e4d7be6", "rev": "514c0a71f47cb80282742d7e4b6913c2c0582c2d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -799,11 +799,11 @@
}, },
"nixpkgs_22-11": { "nixpkgs_22-11": {
"locked": { "locked": {
"lastModified": 1683028696, "lastModified": 1683103914,
"narHash": "sha256-saPKTDj+HB9aPvB59wGcJ64CifRuiIt2CHvSbh7UHz8=", "narHash": "sha256-Mbrst3sLaiL55eOlZOEL8kB+XTWffaQVfcI03YWiryg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5dab6490fe6d72b3f120ae8660181e20f396fbdf", "rev": "54495a4eafe99c537695a87fe04cb50bf17e651d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -815,11 +815,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1683151118, "lastModified": 1683186265,
"narHash": "sha256-BY35o9AEqG1ckxJ0RECdIMYR93t0Ox3oTxPpu3WZbw8=", "narHash": "sha256-XuGXnnF/mpM0CR4M4dbuMYsARgHLqtpolh5nPA9+040=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7d9242bd035c3f9f1c357101d49ffac11116fb06", "rev": "3428bdf3c93a7608615dddd44dec50c3df89b4be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -946,11 +946,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1683148483, "lastModified": 1683183829,
"narHash": "sha256-gdjZHh/SeUVA6YUI1ERRpvKnLmeIk4PbQ4hBf0bcKZs=", "narHash": "sha256-Ta7qCL+mWSBt3851GYtbJpuAcCfNvNxD+MqfK+Yj4RU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "c49d673b261c63732c651aacb99a309ffe95674b", "rev": "82a30341dc98d46808ea11ba932e95856e53452c",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
nixos/common/generic-vm.nix
View file

@ -1,4 +1,4 @@
{ lib, ... }: { _: {
networking.useDHCP = true; networking.useDHCP = true;
# Enable qemu guest agent # Enable qemu guest agent

2
nixos/common/modules/unpackerr.nix
View file

@ -258,7 +258,7 @@ in
after = [ "network.target" ]; after = [ "network.target" ];
description = "unpackerr system service"; description = "unpackerr system service";
# Filter out all unset variables else unpackerr complains # Filter out all unset variables else unpackerr complains
environment = filterAttrs (n: v: stringLength v > 0) environment = filterAttrs (_n: v: stringLength v > 0)
{ {
# General options # General options
UN_DEBUG = "${toString cfg.debug}"; UN_DEBUG = "${toString cfg.debug}";

2
nixos/common/users/default.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, inputs, ... }: { config, pkgs, lib, ... }:
{ {
imports = [ imports = [
./laura.nix ./laura.nix

2
nixos/hosts/hades/_template/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }: { pkgs, ... }:
{ {
imports = [ ]; imports = [ ];

2
nixos/hosts/hades/bastion/configuration.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
networking.interfaces.eth0.useDHCP = true; networking.interfaces.eth0.useDHCP = true;

2
nixos/hosts/hades/bazarr/configuration.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: _:
{ {
system.stateVersion = "22.11"; system.stateVersion = "22.11";
networking.interfaces.eth0.useDHCP = true; networking.interfaces.eth0.useDHCP = true;

2
nixos/hosts/hades/docker-registry-proxy/configuration.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { config, ... }:
let vs = config.vault-secrets.secrets; in let vs = config.vault-secrets.secrets; in
{ {
system.stateVersion = "22.05"; system.stateVersion = "22.05";

2
nixos/hosts/hades/docker-registry/configuration.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { config, ... }:
let vs = config.vault-secrets.secrets; in let vs = config.vault-secrets.secrets; in
{ {
system.stateVersion = "22.05"; system.stateVersion = "22.05";

2
nixos/hosts/hades/jackett/configuration.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: _:
{ {
system.stateVersion = "21.05"; system.stateVersion = "21.05";
networking.interfaces.eth0.useDHCP = true; networking.interfaces.eth0.useDHCP = true;

2
nixos/hosts/hades/lucy/hardware-configuration.nix
View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { lib, modulesPath, ... }:
{ {
imports = imports =

2
nixos/hosts/hades/minio/configuration.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { config, pkgs, ... }:
let let
vs = config.vault-secrets.secrets; vs = config.vault-secrets.secrets;
in { in {

2
nixos/hosts/hades/overseerr/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }: { ... }:
{ {
imports = [ ]; imports = [ ];

2
nixos/hosts/hades/pmm/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }: { pkgs, ... }:
let let
datadir = "/var/lib/pmm/config"; datadir = "/var/lib/pmm/config";
container = "meisnate12/plex-meta-manager:latest"; container = "meisnate12/plex-meta-manager:latest";

4
nixos/hosts/hades/prowlarr/configuration.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: _:
{ {
networking.interfaces.eth0.useDHCP = true; networking.interfaces.eth0.useDHCP = true;
system.stateVersion = "22.11"; system.stateVersion = "22.11";
@ -7,7 +7,7 @@
enable = true; enable = true;
openFirewall = true; openFirewall = true;
}; };
virtualisation.podman.enable = true; virtualisation.podman.enable = true;
virtualisation.oci-containers = { virtualisation.oci-containers = {

3
nixos/hosts/hades/radarr/configuration.nix
View file

@ -1,5 +1,4 @@
{ config, pkgs, ... }: _: {
{
system.stateVersion = "21.05"; system.stateVersion = "21.05";
networking.interfaces.eth0.useDHCP = true; networking.interfaces.eth0.useDHCP = true;

2
nixos/hosts/hades/sonarr/configuration.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: _:
{ {
system.stateVersion = "21.05"; system.stateVersion = "21.05";
networking.interfaces.eth0.useDHCP = true; networking.interfaces.eth0.useDHCP = true;

2
nixos/hosts/hades/tautulli/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }: { ... }:
{ {
imports = [ ]; imports = [ ];

2
nixos/hosts/olympus/_template/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }: { pkgs, ... }:
{ {
imports = [ ]; imports = [ ];

2
nixos/hosts/olympus/bastion/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ pkgs, lib, ... }: { pkgs, ... }:
let let
fix-vscode = pkgs.writeScriptBin "fix-vscode" '' fix-vscode = pkgs.writeScriptBin "fix-vscode" ''
#!${pkgs.stdenv.shell} #!${pkgs.stdenv.shell}

2
nixos/hosts/olympus/bastion/hardware-configuration.nix
View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { modulesPath, ... }:
{ {
imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];

2
nixos/hosts/olympus/bastion/home.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { _: {
programs.home-manager.enable = true; programs.home-manager.enable = true;
home.username = "victor"; home.username = "victor";
home.homeDirectory = "/home/victor"; home.homeDirectory = "/home/victor";

2
nixos/hosts/olympus/dhcp/configuration.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, flat_hosts, ... }: { config, flat_hosts, ... }:
let let
inherit (builtins) filter hasAttr; inherit (builtins) filter hasAttr;
hostToKea = { hostname, mac, ip, ... }: { hostToKea = { hostname, mac, ip, ... }: {

2
nixos/hosts/olympus/kubernetes/configuration.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, hosts, ... }: { { pkgs, ... }: {
# packages for administration tasks # packages for administration tasks
environment.systemPackages = with pkgs; [ kompose kubectl k9s k3s ]; environment.systemPackages = with pkgs; [ kompose kubectl k9s k3s ];

2
nixos/hosts/olympus/minecraft/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ lib, config, pkgs, inputs, ... }: { lib, pkgs, ... }:
{ {
imports = [ ]; imports = [ ];

2
nixos/hosts/olympus/minio/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, lib, ... }: { config, pkgs, ... }:
let let
vs = config.vault-secrets.secrets; vs = config.vault-secrets.secrets;
listenPort = 9000; listenPort = 9000;

2
nixos/hosts/olympus/nginx/configuration.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, nodes, ... }: { pkgs, ... }:
let let
proxy = url: { proxy = url: {
enableACME = true; enableACME = true;

2
nixos/hosts/olympus/ntfy/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }: { pkgs, ... }:
{ {
imports = [ ]; imports = [ ];

2
nixos/hosts/olympus/outline/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, ... }: { config, ... }:
let vs = config.vault-secrets.secrets; in let vs = config.vault-secrets.secrets; in
{ {
imports = [ ]; imports = [ ];

2
nixos/hosts/olympus/unifi/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
imports = [ ]; imports = [ ];

2
nixos/hosts/olympus/vault-0/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, hosts, ... }: { _: {
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave # on your system were taken. It‘s perfectly fine and recommended to leave

2
nixos/hosts/olympus/wireguard/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ lib, config, pkgs, inputs, ... }: { lib, config, pkgs, ... }:
let vs = config.vault-secrets.secrets; let vs = config.vault-secrets.secrets;
in { in {
imports = [ ]; imports = [ ];

2
nixos/hosts/thalassa/aoife/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ pkgs, inputs, ... }: { { inputs, ... }: {
imports = [ imports = [
../../../common/desktop ../../../common/desktop
./hardware-configuration.nix ./hardware-configuration.nix

2
nixos/hosts/thalassa/aoife/hardware-configuration.nix
View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, modulesPath, ... }:
{ {
imports = imports =

2
nixos/hosts/thalassa/eevee/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, inputs, ... }: { { pkgs, inputs, ... }: {
imports = [ imports = [
../../../common/desktop ../../../common/desktop
./hardware-configuration.nix ./hardware-configuration.nix

2
nixos/hosts/thalassa/eevee/hardware-configuration.nix
View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, modulesPath, ... }:
{ {
imports = imports =

8
nixos/hosts/thalassa/eevee/home/default.nix
View file

@ -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; programs.home-manager.enable = true;
home.username = "victor"; home.username = "victor";

2
nixos/hosts/thalassa/eevee/home/theme.nix
View file

@ -1,4 +1,4 @@
{ lib, pkgs, config, ... }: { pkgs, config, ... }:
let let
theme = "Catppuccin-Pink-Dark"; theme = "Catppuccin-Pink-Dark";
cursorTheme = config.home.pointerCursor.name; cursorTheme = config.home.pointerCursor.name;

2
nixos/hosts/thalassa/null/configuration.nix
View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’). # and in the NixOS manual (accessible by running ‘nixos-help’).
{ config, pkgs, lib, inputs, ... }: { pkgs, inputs, ... }:
let let
nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" '' nvidia-offload = pkgs.writeShellScriptBin "nvidia-offload" ''
export __NV_PRIME_RENDER_OFFLOAD=1 export __NV_PRIME_RENDER_OFFLOAD=1

2
nixos/hosts/thalassa/null/hardware-configuration.nix
View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { config, lib, modulesPath, ... }:
{ {
imports = imports =

2
nixos/hosts/thalassa/null/home/default.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, inputs, texlive, ... }: { config, pkgs, inputs, texlive, ... }:
let let
tex = pkgs.texlive.combine { tex = pkgs.texlive.combine {
inherit (pkgs.texlive) scheme-full; inherit (pkgs.texlive) scheme-full;

2
nixos/hosts/thalassa/null/home/hyprland.nix
View file

@ -1,4 +1,4 @@
{ pkgs, inputs, config, ... }: { { pkgs, config, ... }: {
home.file.".config/hypr/hyprpaper.conf".text = '' home.file.".config/hypr/hyprpaper.conf".text = ''
ipc = off ipc = off
preload = ~/cloud/Pictures/Wallpapers-Laptop/wallpaper-nix-pink.png preload = ~/cloud/Pictures/Wallpapers-Laptop/wallpaper-nix-pink.png

2
nixos/hosts/thalassa/null/home/neovim.nix
View file

@ -1,4 +1,4 @@
{ inputs, pkgs, lib, ... }: { { inputs, pkgs, ... }: {
imports = [ inputs.nixvim.homeManagerModules.nixvim ]; imports = [ inputs.nixvim.homeManagerModules.nixvim ];
programs.nixvim = { programs.nixvim = {
enable = true; enable = true;

2
nixos/hosts/thalassa/null/home/theme.nix
View file

@ -32,7 +32,7 @@ let
mantle = "292c3c"; mantle = "292c3c";
crust = "232634"; crust = "232634";
hex = mapAttrs (name: value: "#${value}") colour; hex = mapAttrs (_name: value: "#${value}") colour;
}; };
in { in {
home.file.".xsettingsd".text = '' home.file.".xsettingsd".text = ''

2
nixos/pkgs/default.nix
View file

@ -1,5 +1,5 @@
# nix-build -E 'with import <nixpkgs> {}; callPackage ./default.nix {}' # nix-build -E 'with import <nixpkgs> {}; callPackage ./default.nix {}'
final: prev: { _final: prev: {
v = { v = {
glitch-soc = prev.callPackage ./glitch-soc { }; glitch-soc = prev.callPackage ./glitch-soc { };

2
nixos/pkgs/dnd-5e-latex-template/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenvNoCC, fetchFromGitHub }: stdenvNoCC.mkDerivation rec { { stdenvNoCC, fetchFromGitHub }: stdenvNoCC.mkDerivation rec {
pname = "dnd-5e-latex-template"; pname = "dnd-5e-latex-template";
version = "0.8.0"; version = "0.8.0";
tlType = "run"; tlType = "run";

2
nixos/pkgs/gitea-agatheme/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenvNoCC, fetchurl }: stdenvNoCC.mkDerivation { { stdenvNoCC, fetchurl }: stdenvNoCC.mkDerivation {
pname = "gitea-agatheme"; pname = "gitea-agatheme";
version = "1.2"; version = "1.2";

2
nixos/pkgs/glitch-soc/default.nix
View file

@ -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 , yarn, callPackage, imagemagick, ffmpeg, file, ruby_3_0, writeShellScript
, fetchYarnDeps, fixup_yarn_lock , fetchYarnDeps, fixup_yarn_lock

3
nixos/pkgs/glitch-soc/update.nix
View file

@ -1,5 +1,4 @@
{ pkgs { runCommand
, runCommand
, lib , lib
, makeWrapper , makeWrapper
, yarn2nix , yarn2nix

2
nixos/pkgs/vscode-extensions/platformio.nix
View file

@ -1,4 +1,4 @@
{ vscode-utils, lib }: { vscode-utils }:
let inherit (vscode-utils) buildVscodeMarketplaceExtension; let inherit (vscode-utils) buildVscodeMarketplaceExtension;
in buildVscodeMarketplaceExtension { in buildVscodeMarketplaceExtension {
mktplcRef = { mktplcRef = {

2
nixos/templates/iso-graphical.nix
View file

@ -1,4 +1,4 @@
{ pkgs, modulesPath, lib, config, ... }: { { pkgs, modulesPath, lib, ... }: {
imports = [ imports = [
"${modulesPath}/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix" "${modulesPath}/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix"
]; ];

2
nixos/templates/proxmox-lxc.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { { lib, ... }: {
imports = [ ../common/common.nix ../common/generic-lxc.nix ]; imports = [ ../common/common.nix ../common/generic-lxc.nix ];
proxmoxLXC = { proxmoxLXC = {

2
nixos/templates/proxmox-vm.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { { lib, ... }: {
imports = [ ../common/common.nix ../common/generic-vm.nix ]; imports = [ ../common/common.nix ../common/generic-vm.nix ];
proxmox.qemuConf = { proxmox.qemuConf = {

3
nixos/util.nix
View file

@ -2,7 +2,6 @@
let let
inherit (builtins) filter attrValues concatMap mapAttrs; inherit (builtins) filter attrValues concatMap mapAttrs;
inherit (nixpkgs.lib.attrsets) mapAttrsToList; inherit (nixpkgs.lib.attrsets) mapAttrsToList;
inherit (nixpkgs.lib) nixosSystem;
base_imports = [ base_imports = [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
mailserver.nixosModules.mailserver mailserver.nixosModules.mailserver
@ -26,7 +25,7 @@ in {
inherit base_imports type_import resolve_imports; inherit base_imports type_import resolve_imports;
# Add to whatever realm a host belong to its list of tags # Add to whatever realm a host belong to its list of tags
add_realm_to_tags = mapAttrs (realm: add_realm_to_tags = mapAttrs (realm:
mapAttrs (hostname: mapAttrs (_hostname:
{ tags ? [ ], ... }@host: { tags ? [ ], ... }@host:
host // { host // {
tags = [ realm ] ++ tags; tags = [ realm ] ++ tags;