diff --git a/flake.nix b/flake.nix index 0154081..a7aeeff 100644 --- a/flake.nix +++ b/flake.nix @@ -64,7 +64,7 @@ outputs = { self, nixpkgs, ... }@inputs: let lib = nixpkgs.lib.extend (import ./lib inputs); - machines_plats = lib.mapAttrsToList (name: value: value.arch) (lib.filterAttrs (n: v: builtins.hasAttr "arch" v) lib.luj.machines); + machines_plats = lib.mapAttrsToList (_name: value: value.arch) (lib.filterAttrs (_n: v: builtins.hasAttr "arch" v) lib.luj.machines); mkMachine = import ./lib/mkmachine.nix inputs lib; nixpkgs_plats = builtins.listToAttrs (builtins.map @@ -118,7 +118,7 @@ (plat: { name = plat; value = - (lib.filterAttrs (name: value: (!lib.hasAttrByPath [ "meta" "platforms" ] value) || builtins.elem plat value.meta.platforms) + (lib.filterAttrs (_name: value: (!lib.hasAttrByPath [ "meta" "platforms" ] value) || builtins.elem plat value.meta.platforms) (builtins.listToAttrs (builtins.map (e: { name = e; diff --git a/home-manager-modules/alacritty/default.nix b/home-manager-modules/alacritty/default.nix index e1a4f12..2e957d5 100644 --- a/home-manager-modules/alacritty/default.nix +++ b/home-manager-modules/alacritty/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: let cfg = config.luj.programs.alacritty; in diff --git a/home-manager-modules/dunst/default.nix b/home-manager-modules/dunst/default.nix index 0693e8f..c8a1289 100644 --- a/home-manager-modules/dunst/default.nix +++ b/home-manager-modules/dunst/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: let cfg = config.luj.programs.dunst; in diff --git a/home-manager-modules/emacs/default.nix b/home-manager-modules/emacs/default.nix index ceb8f5d..dc81ec9 100644 --- a/home-manager-modules/emacs/default.nix +++ b/home-manager-modules/emacs/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: let cfg = config.luj.programs.emacs; in diff --git a/home-manager-modules/hyprland/default.nix b/home-manager-modules/hyprland/default.nix index 8b78215..fba4238 100644 --- a/home-manager-modules/hyprland/default.nix +++ b/home-manager-modules/hyprland/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, inputs, ... }: +{ config, pkgs, lib, ... }: let cfg = config.luj.programs.hyprland; terminal = "${pkgs.kitty}/bin/kitty"; diff --git a/home-manager-modules/ssh-client/default.nix b/home-manager-modules/ssh-client/default.nix index 09f48fa..db5b507 100644 --- a/home-manager-modules/ssh-client/default.nix +++ b/home-manager-modules/ssh-client/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: let cfg = config.luj.programs.ssh-client; in diff --git a/lib/default.nix b/lib/default.nix index f00995d..68bfe12 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,9 +1,9 @@ -inputs: final: prev: +inputs: final: _prev: with builtins; { - importConfig = path: (mapAttrs (name: value: import (path + "/${name}/default.nix")) (final.filterAttrs (_: v: v == "directory") (readDir path))); + importConfig = path: (mapAttrs (name: _value: import (path + "/${name}/default.nix")) (final.filterAttrs (_: v: v == "directory") (readDir path))); mkSubdomain = name: port: { luj.nginx.enable = true; diff --git a/lib/mkmachine.nix b/lib/mkmachine.nix index a04b60b..fa67840 100644 --- a/lib/mkmachine.nix +++ b/lib/mkmachine.nix @@ -1,7 +1,7 @@ inputs: lib: let - overlay-unstable = arch: final: prev: + overlay-unstable = arch: _final: _prev: let nixpkgs-patched-src = (import inputs.nixpkgs { system = arch; }).applyPatches { name = "nixpkgs-patches"; @@ -16,7 +16,7 @@ let }; in -{ host, host-config, modules, nixpkgs ? inputs.nixpkgs, system ? "x86_64-linux", home-manager ? inputs.home-manager }: +{ host-config, modules, nixpkgs ? inputs.nixpkgs, system ? "x86_64-linux", home-manager ? inputs.home-manager }: nixpkgs.lib.nixosSystem { inherit system; lib = (nixpkgs.lib.extend (import ./default.nix inputs)); @@ -43,7 +43,7 @@ nixpkgs.lib.nixosSystem { nixpkgs.overlays = [ inputs.nur.overlay (overlay-unstable system) - (final: prev: + (_final: prev: { waybar = prev.waybar.overrideAttrs (oldAttrs: { mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; diff --git a/machines/base.nix b/machines/base.nix index e1d0955..bf2be2d 100644 --- a/machines/base.nix +++ b/machines/base.nix @@ -1,4 +1,4 @@ -{ config, pkgs, sops-nix, lib, ... }: +{ pkgs, lib, ... }: { diff --git a/machines/core-data/default.nix b/machines/core-data/default.nix index f1ee580..8202365 100644 --- a/machines/core-data/default.nix +++ b/machines/core-data/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ pkgs, lib, ... }: { imports = diff --git a/machines/core-data/hardware.nix b/machines/core-data/hardware.nix index 091faba..09a7919 100644 --- a/machines/core-data/hardware.nix +++ b/machines/core-data/hardware.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, modulesPath, ... }: +{ lib, modulesPath, ... }: { imports = diff --git a/machines/core-data/home-julien.nix b/machines/core-data/home-julien.nix index fe8d093..8ace50c 100644 --- a/machines/core-data/home-julien.nix +++ b/machines/core-data/home-julien.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: +{ ... }: { luj.hmgr.julien = { }; } diff --git a/machines/core-security/home-julien.nix b/machines/core-security/home-julien.nix index fe8d093..8ace50c 100644 --- a/machines/core-security/home-julien.nix +++ b/machines/core-security/home-julien.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: +{ ... }: { luj.hmgr.julien = { }; } diff --git a/machines/enigma/default.nix b/machines/enigma/default.nix index acc6dc7..e990450 100644 --- a/machines/enigma/default.nix +++ b/machines/enigma/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, inputs, ... }: +{ config, pkgs, lib, ... }: { imports = diff --git a/machines/enigma/hardware.nix b/machines/enigma/hardware.nix index 592b4b6..457cf14 100644 --- a/machines/enigma/hardware.nix +++ b/machines/enigma/hardware.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/machines/enigma/home-julien.nix b/machines/enigma/home-julien.nix index 14b94b6..8a8e7e7 100644 --- a/machines/enigma/home-julien.nix +++ b/machines/enigma/home-julien.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, inputs, ... }: +{ pkgs, ... }: { luj.hmgr.julien = diff --git a/machines/fischer/default.nix b/machines/fischer/default.nix index ca0d245..da04311 100644 --- a/machines/fischer/default.nix +++ b/machines/fischer/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, inputs, ... }: +{ config, pkgs, lib, ... }: { imports = [ ./hardware.nix diff --git a/machines/fischer/hardware.nix b/machines/fischer/hardware.nix index 0743e4c..a5ee88f 100644 --- a/machines/fischer/hardware.nix +++ b/machines/fischer/hardware.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/machines/fischer/home-julien.nix b/machines/fischer/home-julien.nix index d556d75..11e0940 100644 --- a/machines/fischer/home-julien.nix +++ b/machines/fischer/home-julien.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: +{ pkgs, ... }: { luj.hmgr.julien = diff --git a/machines/lambda/default.nix b/machines/lambda/default.nix index f38a8c5..2165baf 100644 --- a/machines/lambda/default.nix +++ b/machines/lambda/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ pkgs, ... }: { imports = diff --git a/machines/lambda/hardware.nix b/machines/lambda/hardware.nix index 054d8a0..356cb1d 100644 --- a/machines/lambda/hardware.nix +++ b/machines/lambda/hardware.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/machines/lambda/home-julien.nix b/machines/lambda/home-julien.nix index 121e8e7..2c6ed81 100644 --- a/machines/lambda/home-julien.nix +++ b/machines/lambda/home-julien.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: +{ ... }: { luj.hmgr.julien = { home.stateVersion = "22.11"; diff --git a/machines/lisa/default.nix b/machines/lisa/default.nix index 9be3009..42a48b9 100644 --- a/machines/lisa/default.nix +++ b/machines/lisa/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, modulesPath, ... }: +{ pkgs, modulesPath, ... }: { imports = [ diff --git a/machines/lisa/hardware.nix b/machines/lisa/hardware.nix index a078df1..8d1b79e 100644 --- a/machines/lisa/hardware.nix +++ b/machines/lisa/hardware.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: +{ pkgs, ... }: { boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sd_mod" "sr_mod" ]; boot.kernelPackages = pkgs.linuxPackages_5_15; diff --git a/machines/lisa/home-julien.nix b/machines/lisa/home-julien.nix index 6aba01b..80b18e5 100644 --- a/machines/lisa/home-julien.nix +++ b/machines/lisa/home-julien.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: +{ ... }: { sops.secrets.ssh-lisa-pub = { diff --git a/machines/tower/default.nix b/machines/tower/default.nix index 6511823..fceba5a 100644 --- a/machines/tower/default.nix +++ b/machines/tower/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ pkgs, lib, ... }: { imports = diff --git a/machines/tower/hardware.nix b/machines/tower/hardware.nix index bac3e6b..e786b3b 100644 --- a/machines/tower/hardware.nix +++ b/machines/tower/hardware.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/machines/tower/home-julien.nix b/machines/tower/home-julien.nix index 2a69225..50b8159 100644 --- a/machines/tower/home-julien.nix +++ b/machines/tower/home-julien.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: +{ pkgs, ... }: { diff --git a/machines/x2100/default.nix b/machines/x2100/default.nix index 7c8edff..d852c87 100644 --- a/machines/x2100/default.nix +++ b/machines/x2100/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, inputs, nixpkgs-patched, ... }: +{ config, pkgs, lib, ... }: { imports = diff --git a/machines/x2100/home-julien.nix b/machines/x2100/home-julien.nix index 773ad9c..18dd231 100644 --- a/machines/x2100/home-julien.nix +++ b/machines/x2100/home-julien.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: +{ pkgs, ... }: { luj.hmgr.julien = diff --git a/modules/bruit/default.nix b/modules/bruit/default.nix index fa83ed2..68747f3 100644 --- a/modules/bruit/default.nix +++ b/modules/bruit/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, config, ... }: with lib; let cfg = config.luj.bruit; diff --git a/modules/buildbot/default.nix b/modules/buildbot/default.nix index 4f2f344..4f564b2 100644 --- a/modules/buildbot/default.nix +++ b/modules/buildbot/default.nix @@ -2,11 +2,6 @@ with lib; let cfg = config.luj.buildbot; - port = "1810"; - package = pkgs.buildbot-worker; - python = package.pythonModule; - home = "/var/lib/buildbot-worker"; - buildbotDir = "${home}/worker"; in { diff --git a/modules/deluge/default.nix b/modules/deluge/default.nix index ef2acf3..4d3c528 100644 --- a/modules/deluge/default.nix +++ b/modules/deluge/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, config, ... }: with lib; let cfg = config.luj.deluge; diff --git a/modules/deployment/default.nix b/modules/deployment/default.nix index 7884dfe..00ff41d 100644 --- a/modules/deployment/default.nix +++ b/modules/deployment/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, config, ... }: with lib; let cfg = config.luj.deployment; diff --git a/modules/docs/default.nix b/modules/docs/default.nix index 4033b96..ec2b14a 100644 --- a/modules/docs/default.nix +++ b/modules/docs/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, config, ... }: with lib; let cfg = config.luj.docs; diff --git a/modules/hmgr/default.nix b/modules/hmgr/default.nix index 1935663..f2bc27a 100644 --- a/modules/hmgr/default.nix +++ b/modules/hmgr/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, inputs, ... }: +{ config, lib, ... }: let cfg = config.luj.hmgr; in diff --git a/modules/homepage/default.nix b/modules/homepage/default.nix index 8b0c1e6..6b2e7fa 100644 --- a/modules/homepage/default.nix +++ b/modules/homepage/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, inputs, config, ... }: +{ lib, inputs, config, ... }: with lib; let cfg = config.luj.homepage; diff --git a/modules/homer/default.nix b/modules/homer/default.nix index e6c4760..30c2871 100644 --- a/modules/homer/default.nix +++ b/modules/homer/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, inputs, config, ... }: +{ lib, config, ... }: with lib; let cfg = config.luj.homer; diff --git a/modules/hydra/default.nix b/modules/hydra/default.nix index 914cc05..2362fa4 100644 --- a/modules/hydra/default.nix +++ b/modules/hydra/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, config, ... }: with lib; let cfg = config.luj.hydra; diff --git a/modules/influxdb/default.nix b/modules/influxdb/default.nix index 0c7b63c..783d799 100644 --- a/modules/influxdb/default.nix +++ b/modules/influxdb/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, config, ... }: with lib; let cfg = config.luj.influxdb; diff --git a/modules/irc/default.nix b/modules/irc/default.nix index d9876d2..a56d4f8 100644 --- a/modules/irc/default.nix +++ b/modules/irc/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, config, ... }: with lib; let cfg = config.luj.irc; diff --git a/modules/jackett/default.nix b/modules/jackett/default.nix index 437d4b0..aa3ff6b 100644 --- a/modules/jackett/default.nix +++ b/modules/jackett/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, config, ... }: with lib; let cfg = config.luj.jackett; diff --git a/modules/jellyfin/default.nix b/modules/jellyfin/default.nix index aae3c7f..578f1a2 100644 --- a/modules/jellyfin/default.nix +++ b/modules/jellyfin/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, config, ... }: with lib; let cfg = config.luj.jellyfin; diff --git a/modules/lidarr/default.nix b/modules/lidarr/default.nix index edc7121..7104b32 100644 --- a/modules/lidarr/default.nix +++ b/modules/lidarr/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, config, ... }: with lib; let cfg = config.luj.lidarr; diff --git a/modules/mailserver/default.nix b/modules/mailserver/default.nix index 6a3dd4b..1e27c48 100644 --- a/modules/mailserver/default.nix +++ b/modules/mailserver/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, inputs, ... }: +{ config, lib, ... }: let cfg = config.luj.mailserver; in diff --git a/modules/mediaserver/default.nix b/modules/mediaserver/default.nix index 5f7b37d..94731dd 100644 --- a/modules/mediaserver/default.nix +++ b/modules/mediaserver/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, config, ... }: with lib; let cfg = config.luj.mediaserver; in diff --git a/modules/mosh/default.nix b/modules/mosh/default.nix index 844fcc6..50c1ee7 100644 --- a/modules/mosh/default.nix +++ b/modules/mosh/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, inputs, ... }: +{ config, lib, ... }: let cfg = config.luj.programs.mosh; in diff --git a/modules/navidrome/default.nix b/modules/navidrome/default.nix index 04bd686..0b09562 100644 --- a/modules/navidrome/default.nix +++ b/modules/navidrome/default.nix @@ -3,7 +3,6 @@ with lib; let cfg = config.luj.navidrome; port = 4533; - settingsFormat = pkgs.formats.json { }; in { diff --git a/modules/nginx/default.nix b/modules/nginx/default.nix index 18c0960..0f3e009 100644 --- a/modules/nginx/default.nix +++ b/modules/nginx/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, config, ... }: with lib; let cfg = config.luj.nginx; in diff --git a/modules/paperless/default.nix b/modules/paperless/default.nix index 61cf599..d3d9007 100644 --- a/modules/paperless/default.nix +++ b/modules/paperless/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, config, ... }: with lib; let cfg = config.luj.paperless; diff --git a/modules/radarr/default.nix b/modules/radarr/default.nix index 73bccdb..a389090 100644 --- a/modules/radarr/default.nix +++ b/modules/radarr/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, config, ... }: with lib; let cfg = config.luj.radarr; diff --git a/modules/secrets/default.nix b/modules/secrets/default.nix index 0c46ae1..2a5d491 100644 --- a/modules/secrets/default.nix +++ b/modules/secrets/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, inputs, ... }: +{ config, lib, ... }: let cfg = config.luj.secrets; in diff --git a/modules/sonarr/default.nix b/modules/sonarr/default.nix index da10bb3..2437d76 100644 --- a/modules/sonarr/default.nix +++ b/modules/sonarr/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, config, ... }: with lib; let cfg = config.luj.sonarr; diff --git a/modules/ssh-server/default.nix b/modules/ssh-server/default.nix index 5843a3a..c3d8a7b 100644 --- a/modules/ssh-server/default.nix +++ b/modules/ssh-server/default.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, inputs, ... }: +{ config, lib, ... }: let cfg = config.luj.ssh-server; in diff --git a/modules/transmission/default.nix b/modules/transmission/default.nix index e98000d..c1c180c 100644 --- a/modules/transmission/default.nix +++ b/modules/transmission/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, config, ... }: with lib; let cfg = config.luj.transmission; diff --git a/share.nix b/share.nix index e79a71c..3f237a8 100644 --- a/share.nix +++ b/share.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ pkgs, ... }: let # bash script to let dbus know about important env variables and # propagate them to relevent services run at the end of sway config diff --git a/users/julien.nix b/users/julien.nix index ae9ba74..0ab9f2e 100644 --- a/users/julien.nix +++ b/users/julien.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: { +{ config, pkgs, ... }: { sops.secrets.user-julien-password.neededForUsers = true; diff --git a/users/status.nix b/users/status.nix index b374a64..baf2f9b 100644 --- a/users/status.nix +++ b/users/status.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: { +{ pkgs, ... }: { users.users.status = { isNormalUser = true;