fix infinite recursion
This commit is contained in:
parent
96a07f14dd
commit
84f07ef08f
4 changed files with 14 additions and 10 deletions
|
@ -21,7 +21,7 @@
|
||||||
# https://src.fedoraproject.org/rpms/systemd/tree/acb90c49c42276b06375a66c73673ac3510255
|
# https://src.fedoraproject.org/rpms/systemd/tree/acb90c49c42276b06375a66c73673ac3510255
|
||||||
systemd.oomd = {
|
systemd.oomd = {
|
||||||
enableRootSlice = true;
|
enableRootSlice = true;
|
||||||
enableUserServices = true;
|
enableUserSlices = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# security.polkit.enable = lib.mkDefault true;
|
# security.polkit.enable = lib.mkDefault true;
|
||||||
|
|
|
@ -1,3 +1,11 @@
|
||||||
{ ... }: {
|
{ ... }: {
|
||||||
imports = [ ./meta.nix ./nginx.nix ./dns.nix ./flood.nix ./gnome ./unpackerr.nix ./vault.nix ];
|
imports = [
|
||||||
|
./meta.nix
|
||||||
|
./nginx.nix
|
||||||
|
./dns.nix
|
||||||
|
./flood.nix
|
||||||
|
./gnome
|
||||||
|
./unpackerr.nix
|
||||||
|
./vault.nix
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,7 @@
|
||||||
{ config, pkgs, lib, inputs, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
with lib;
|
with lib;
|
||||||
let cfg = config.services.v.gnome;
|
let cfg = config.services.v.gnome;
|
||||||
in {
|
in {
|
||||||
imports = [
|
|
||||||
inputs.gnome-autounlock-keyring.nixosModules.default
|
|
||||||
];
|
|
||||||
|
|
||||||
options.services.v.gnome = {
|
options.services.v.gnome = {
|
||||||
enable = mkEnableOption "v.gnome";
|
enable = mkEnableOption "v.gnome";
|
||||||
hm = mkOption {
|
hm = mkOption {
|
||||||
|
|
|
@ -54,7 +54,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nixpkgs_stable, flake-utils-plus, nur, attic
|
outputs = { self, nixpkgs, nixpkgs_stable, flake-utils-plus, nur, attic
|
||||||
, deploy, home-manager, ... }@inputs:
|
, deploy, home-manager, gnome-autounlock-keyring, ... }@inputs:
|
||||||
let
|
let
|
||||||
# fast-repl = pkgs.writeShellScriptBin "fast-repl" ''
|
# fast-repl = pkgs.writeShellScriptBin "fast-repl" ''
|
||||||
# source /etc/set-environment
|
# source /etc/set-environment
|
||||||
|
@ -78,9 +78,9 @@
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
|
gnome-autounlock-keyring.nixosModules.default
|
||||||
./common
|
./common
|
||||||
];
|
];
|
||||||
extraArgs = { inherit inputs; };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# hosts
|
# hosts
|
||||||
|
@ -107,7 +107,7 @@
|
||||||
|
|
||||||
# Outputs
|
# Outputs
|
||||||
outputsBuilder = channels: {
|
outputsBuilder = channels: {
|
||||||
devShell = channels.nixpkgs.mkShell {
|
devShells.default = channels.nixpkgs.mkShell {
|
||||||
name = "devShell";
|
name = "devShell";
|
||||||
VAULT_ADDR = "http://vault.olympus:8200/";
|
VAULT_ADDR = "http://vault.olympus:8200/";
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
|
|
Loading…
Add table
Reference in a new issue