diff --git a/flake.lock b/flake.lock index 1e23999..6a18226 100644 --- a/flake.lock +++ b/flake.lock @@ -215,24 +215,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -268,32 +250,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nuschtos", - "flake-utils" - ], - "nixpkgs": [ - "nuschtos", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737371634, - "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.7", - "repo": "ixx", - "type": "github" - } - }, "nether": { "inputs": { "clan-core": "clan-core", @@ -463,28 +419,6 @@ "type": "indirect" } }, - "nuschtos": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1745046075, - "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", - "owner": "NuschtOS", - "repo": "search", - "rev": "066afe8643274470f4a294442aadd988356a478f", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "root": { "inputs": { "disko": "disko", @@ -496,7 +430,6 @@ "nixos-facter-modules": "nixos-facter-modules_2", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nuschtos": "nuschtos", "snm": "snm", "sops-nix": "sops-nix_2", "srvos": "srvos" @@ -606,21 +539,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index ff46d99..b72e86b 100644 --- a/flake.nix +++ b/flake.nix @@ -32,10 +32,6 @@ url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; inputs.nixpkgs.follows = "nixpkgs"; }; - nuschtos = { - url = "github:NuschtOS/search"; - inputs.nixpkgs.follows = "nixpkgs"; - }; # Packages firefox-addons = { diff --git a/nixos-modules/keyboard/default.nix b/nixos-modules/keyboard/default.nix index 852759e..c1378f4 100644 --- a/nixos-modules/keyboard/default.nix +++ b/nixos-modules/keyboard/default.nix @@ -14,7 +14,7 @@ in layout = lib.mkOption { type = lib.types.str; default = "us"; - description = lib.mdDoc "Keyboard Layout."; + description = "Keyboard Layout."; }; }; diff --git a/systems/hetzner/nginx.nix b/systems/hetzner/nginx.nix index cf2179a..a89c405 100644 --- a/systems/hetzner/nginx.nix +++ b/systems/hetzner/nginx.nix @@ -66,65 +66,6 @@ locations."/".proxyPass = "http://${config.services.nix-serve.bindAddress}:${toString config.services.nix-serve.port}"; }; - "nix.missing.ninja" = { - forceSSL = true; - enableACME = true; - locations."/".root = self.inputs.nuschtos.packages.${pkgs.stdenv.system}.mkMultiSearch { - scopes = [ - { - modules = [ self.inputs.disko.nixosModules.default ]; - name = "Disko"; - specialArgs.modulesPath = pkgs.path + "/nixos/modules"; - urlPrefix = "https://github.com/nix-community/disko/blob/master/"; - } - { - modules = [ - self.inputs.snm.nixosModules.default - { - mailserver = { - fqdn = "mx.example.com"; - domains = [ "example.com" ]; - dmarcReporting = { - organizationName = "Example Corp"; - domain = "example.com"; - }; - }; - } - ]; - name = "Simple NixOS Mailserver"; - urlPrefix = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/blob/master/"; - } - { - optionsJSON = - (import "${self.inputs.nixpkgs}/nixos/release.nix" { }).options + /share/doc/nixos/options.json; - name = "NixOS"; - urlPrefix = "https://github.com/NixOS/nixpkgs/tree/master/"; - } - { - optionsJSON = - self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-html.passthru.home-manager-options.nixos - + /share/doc/nixos/options.json; - name = "Home Manager NixOS"; - urlPrefix = "https://github.com/nix-community/home-manager/tree/master/"; - } - { - optionsJSON = - self.inputs.home-manager.packages.${pkgs.stdenv.system}.docs-json - + /share/doc/home-manager/options.json; - optionsPrefix = "home-manager.users."; - name = "Home Manager"; - urlPrefix = "https://github.com/nix-community/home-manager/tree/master/"; - } - { - optionsJSON = - self.inputs.nixvim.packages.${pkgs.stdenv.system}.options-json + /share/doc/nixos/options.json; - optionsPrefix = "programs.nixvim"; - name = "NixVim"; - urlPrefix = "https://github.com/nix-community/nixvim/tree/main/"; - } - ]; - }; - }; "hetzner" = { forceSSL = false; enableACME = false;