From 770090564755dcdee7f6a1c39422d58e692dd7b0 Mon Sep 17 00:00:00 2001 From: geemili Date: Sun, 4 Feb 2024 13:41:42 -0700 Subject: [PATCH] remove remaining references to glauth --- flake.nix | 14 +------- services/glauth.nix | 79 --------------------------------------------- 2 files changed, 1 insertion(+), 92 deletions(-) delete mode 100644 services/glauth.nix diff --git a/flake.nix b/flake.nix index 5fd19e8..8e101a4 100644 --- a/flake.nix +++ b/flake.nix @@ -9,18 +9,9 @@ url = "github:juanfont/headscale/v0.23.0-alpha2"; inputs.nixpkgs.follows = "nixpkgs"; }; - - glauth = { - url = "github:leroycep/glauth"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - glauth-sqlite = { - url = "github:leroycep/glauth-sqlite"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; - outputs = { self, nixpkgs, agenix, juanfont-headscale, glauth, glauth-sqlite }: { + outputs = { self, nixpkgs, agenix, juanfont-headscale }: { packages.x86_64-linux = let pkgs = import nixpkgs { system = "x86_64-linux"; }; in rec { cockpit-tailscale = pkgs.callPackage ./pkgs/cockpit-tailscale.nix {}; cockpit-zfs-manager = pkgs.callPackage ./pkgs/cockpit-zfs-manager.nix {}; @@ -32,15 +23,12 @@ ({config, pkgs, ...}: { nixpkgs.overlays = [ (final: prev: { juanfont-headscale = juanfont-headscale.packages.${prev.system}; - glauth = glauth.packages.${prev.system}.glauth.v2; - glauth-sqlite = glauth-sqlite.packages.${prev.system}.glauth-sqlite; cockpit-tailscale = self.packages.${prev.system}.cockpit-tailscale; cockpit-zfs-manager = self.packages.${prev.system}.cockpit-zfs-manager; })]; }) ./agenix-config-module.nix ./configuration.nix - ./services/glauth.nix ./services/komga.nix agenix.nixosModules.default ]; diff --git a/services/glauth.nix b/services/glauth.nix deleted file mode 100644 index 2af761b..0000000 --- a/services/glauth.nix +++ /dev/null @@ -1,79 +0,0 @@ -{config, pkgs, lib, ...}: -let - cfg = config.services.glauth; - settingsFormat = pkgs.formats.toml {}; -in - -with lib; - -{ - options = { - services.glauth = { - enable = mkOption { - default = false; - type = with types; bool; - description = '' - Enable the glauth system service - ''; - }; - - package = mkPackageOption pkgs "glauth" { }; - - dataDir = mkOption { - type = types.path; - default = "/var/lib/glauth"; - }; - - user = mkOption { - default = "glauth"; - type = types.str; - description = '' - Name of the user. - ''; - }; - - group = mkOption { - default = "glauth"; - type = types.str; - description = '' - Name of the group. - ''; - }; - - settings = mkOption { - type = settingsFormat.type; - default = {}; - description = '' - Configuration for glauth.cfg, see -