From 84f07ef08f004d18d2994512f27940290d6351be Mon Sep 17 00:00:00 2001
From: Vivian <vivian@0x76.dev>
Date: Wed, 3 Jan 2024 15:49:32 +0100
Subject: [PATCH] fix infinite recursion

---
 common/default.nix               |  2 +-
 common/modules/default.nix       | 10 +++++++++-
 common/modules/gnome/default.nix |  6 +-----
 flake.nix                        |  6 +++---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/common/default.nix b/common/default.nix
index 8ead0247..2e742aed 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -21,7 +21,7 @@
   # https://src.fedoraproject.org/rpms/systemd/tree/acb90c49c42276b06375a66c73673ac3510255
   systemd.oomd = {
     enableRootSlice = true;
-    enableUserServices = true;
+    enableUserSlices = true;
   };
 
   # security.polkit.enable = lib.mkDefault true;
diff --git a/common/modules/default.nix b/common/modules/default.nix
index 66727027..a9acf0a0 100644
--- a/common/modules/default.nix
+++ b/common/modules/default.nix
@@ -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
+  ];
 }
diff --git a/common/modules/gnome/default.nix b/common/modules/gnome/default.nix
index 39fb375f..67a6c148 100644
--- a/common/modules/gnome/default.nix
+++ b/common/modules/gnome/default.nix
@@ -1,11 +1,7 @@
-{ config, pkgs, lib, inputs, ... }:
+{ config, pkgs, lib, ... }:
 with lib;
 let cfg = config.services.v.gnome;
 in {
-  imports = [
-    inputs.gnome-autounlock-keyring.nixosModules.default
-  ];
-
   options.services.v.gnome = {
     enable = mkEnableOption "v.gnome";
     hm = mkOption {
diff --git a/flake.nix b/flake.nix
index 566d1672..a619711b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,7 +54,7 @@
   };
 
   outputs = { self, nixpkgs, nixpkgs_stable, flake-utils-plus, nur, attic
-    , deploy, home-manager, ... }@inputs:
+    , deploy, home-manager, gnome-autounlock-keyring, ... }@inputs:
     let
       # fast-repl = pkgs.writeShellScriptBin "fast-repl" ''
       #   source /etc/set-environment
@@ -78,9 +78,9 @@
         system = "x86_64-linux";
         modules = [
           home-manager.nixosModules.home-manager
+          gnome-autounlock-keyring.nixosModules.default
           ./common
         ];
-        extraArgs = { inherit inputs; };
       };
 
       # hosts
@@ -107,7 +107,7 @@
 
       # Outputs
       outputsBuilder = channels: {
-        devShell = channels.nixpkgs.mkShell {
+        devShells.default = channels.nixpkgs.mkShell {
           name = "devShell";
           VAULT_ADDR = "http://vault.olympus:8200/";
           packages = with pkgs; [