Luj/snowfield
1
0
Fork 0
mirror of https://github.com/JulienMalka/snowfield.git synced 2025-03-23 20:30:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

statix fixes

Browse source
This commit is contained in:
Julien Malka 2024-03-30 20:21:59 +01:00
parent 0ebde53e83
commit 021928e760
Signed by: Luj
GPG key ID: 6FC74C847011FD83
19 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.nix
View file

@ -118,20 +118,20 @@
(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;
value = nixpkgs_plats.${plat}.callPackage (./packages + "/${e}") { };
})
(builtins.attrNames (builtins.readDir ./packages)))));
(builtins.attrNames (builtins.readDir ./packages))));
})
machines_plats);
machines = lib.luj.machines;
inherit (lib.luj) machines;
checks = {
packages = packages;
inherit packages;
machines = lib.mapAttrs (_: v: v.config.system.build.toplevel) self.nixosConfigurations;
};
};

6
home-manager-modules/sway/default.nix
View file

@ -1,7 +1,7 @@
{ config, pkgs, lib, ... }:
let
cfg = config.luj.programs.sway;
modifier = cfg.modifier;
inherit (cfg) modifier;
terminal = "kitty";
in
with lib;
@ -22,7 +22,7 @@ with lib;
enable = true;
package = pkgs.swayfx;
config = {
terminal = terminal;
inherit terminal;
output =
{
DP-6 = {
@ -35,7 +35,7 @@ with lib;
};
};
modifier = cfg.modifier;
inherit (cfg) modifier;
input = {
"*" = {
xkb_layout = "fr";

2
home-manager-modules/zsh/default.nix
View file

@ -1,7 +1,7 @@
{ config, pkgs, lib, ... }:
let
cfg = config.luj.programs.zsh;
fetchFromGitHub = pkgs.fetchFromGitHub;
inherit (pkgs) fetchFromGitHub;
in
with lib;
{

16
lib/mkmachine.nix
View file

@ -19,7 +19,7 @@ in
{ 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));
lib = nixpkgs.lib.extend (import ./default.nix inputs);
specialArgs =
{
inherit inputs;
@ -49,20 +49,20 @@ nixpkgs.lib.nixosSystem {
mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ];
});
tinystatus = prev.pkgs.callPackage ../packages/tinystatus { };
jackett = prev.unstable.jackett;
radarr = prev.unstable.radarr;
inherit (prev.unstable) jackett;
inherit (prev.unstable) radarr;
htpdate = prev.pkgs.callPackage ../packages/htpdate { };
authelia = prev.pkgs.callPackage ../packages/authelia { };
paperless-ng = prev.pkgs.callPackage ../packages/paperless-ng { };
tailscale = prev.unstable.tailscale;
nodePackages = prev.unstable.nodePackages;
inherit (prev.unstable) tailscale;
inherit (prev.unstable) nodePackages;
hydrasect = prev.pkgs.callPackage ../packages/hydrasect { };
mosh = prev.unstable.mosh;
inherit (prev.unstable) mosh;
attic = inputs.attic.packages.${system}.default;
colmena = inputs.colmena.packages.${system}.colmena;
inherit (inputs.colmena.packages.${system}) colmena;
keycloak-keywind = prev.pkgs.callPackage ../packages/keycloak-keywind { };
nix-rfc-92 = inputs.nix-rfc-92.packages.${system}.default;
bcachefs-tools = prev.unstable.bcachefs-tools;
inherit (prev.unstable) bcachefs-tools;
zotero = inputs.zotero-nix.packages.${system}.default;
})
];

2
machines/core-data/home-julien.nix
View file

@ -1,4 +1,4 @@
{ ... }:
_:
{
luj.hmgr.julien = { };
}

2
machines/core-security/home-julien.nix
View file

@ -1,4 +1,4 @@
{ ... }:
_:
{
luj.hmgr.julien = { };
}

2
machines/lambda/home-julien.nix
View file

@ -1,4 +1,4 @@
{ ... }:
_:
{
luj.hmgr.julien = {
home.stateVersion = "22.11";

2
machines/lisa/home-julien.nix
View file

@ -1,4 +1,4 @@
{ ... }:
_:
{
sops.secrets.ssh-lisa-pub = {

4
modules/deluge/default.nix
View file

@ -39,8 +39,8 @@ in
services.deluge = {
enable = true;
user = cfg.user;
group = cfg.group;
inherit (cfg) user;
inherit (cfg) group;
openFirewall = true;
declarative = true;
authFile = "/run/secrets/deluge";

2
modules/docs/default.nix
View file

@ -21,7 +21,7 @@ in
services.hedgedoc = {
enable = true;
settings = {
port = port;
inherit port;
db = {
dialect = "postgres";
host = "/run/postgresql";

2
modules/gitlab-runner/default.nix
View file

@ -92,7 +92,7 @@ in
--service gitlab-runner \
--config ${cfg.registrationConfigFile}
'';
} // optionalAttrs (cfg.gracefulTermination) {
} // optionalAttrs cfg.gracefulTermination {
TimeoutStopSec = "${cfg.gracefulTimeout}";
KillSignal = "SIGQUIT";
KillMode = "process";

2
modules/hydra/default.nix
View file

@ -20,7 +20,7 @@ in
services.hydra = {
enable = true;
notificationSender = "hydra@localhost";
port = port;
inherit port;
buildMachinesFiles = [ ];
useSubstitutes = true;
};

4
modules/jackett/default.nix
View file

@ -32,8 +32,8 @@ in
mkMerge [{
services.jackett = {
enable = true;
user = cfg.user;
group = cfg.group;
inherit (cfg) user;
inherit (cfg) group;
};
}

4
modules/jellyfin/default.nix
View file

@ -32,8 +32,8 @@ in
mkMerge [{
services.jellyfin = {
enable = true;
user = cfg.user;
group = cfg.group;
inherit (cfg) user;
inherit (cfg) group;
};
# services.nginx.appendHttpConfig = ''

4
modules/lidarr/default.nix
View file

@ -33,8 +33,8 @@ in
mkMerge [{
services.lidarr = {
enable = true;
user = cfg.user;
group = cfg.group;
inherit (cfg) user;
inherit (cfg) group;
};
}

2
modules/paperless/default.nix
View file

@ -26,7 +26,7 @@ in
mkMerge [{
services.paperless = {
enable = true;
user = cfg.user;
inherit (cfg) user;
mediaDir = "/home/julien/papers";
extraConfig = {
PAPERLESS_OCR_LANGUAGE = "fra+eng";

4
modules/radarr/default.nix
View file

@ -33,8 +33,8 @@ in
mkMerge [{
services.radarr = {
enable = true;
user = cfg.user;
group = cfg.group;
inherit (cfg) user;
inherit (cfg) group;
};
}

4
modules/sonarr/default.nix
View file

@ -33,8 +33,8 @@ in
mkMerge [{
services.sonarr = {
enable = true;
user = cfg.user;
group = cfg.group;
inherit (cfg) user;
inherit (cfg) group;
};
}

4
modules/transmission/default.nix
View file

@ -39,8 +39,8 @@ in
services.transmission = {
enable = true;
user = cfg.user;
group = cfg.group;
inherit (cfg) user;
inherit (cfg) group;
credentialsFile = "/run/secrets/transmission";
downloadDirPermissions = "770";
settings = {