diff --git a/flake.lock b/flake.lock index 91194c0..5069180 100644 --- a/flake.lock +++ b/flake.lock @@ -138,6 +138,40 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1693377291, + "narHash": "sha256-vYGY9bnqEeIncNarDZYhm6KdLKgXMS+HA2mTRaWEc80=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e7f38be3775bab9659575f192ece011c033655f0", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "onelink": { + "inputs": { + "nixpkgs": "nixpkgs_4", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1694525330, + "narHash": "sha256-uunY4IwIDS2WCrnxF9ExFKzgIHRvEOx3OnfECnFhl0o=", + "owner": "Sigmanificient", + "repo": "1l.is", + "rev": "14caae300a8576b89858bac6832bd7442fe1bf19", + "type": "github" + }, + "original": { + "owner": "Sigmanificient", + "repo": "1l.is", + "type": "github" + } + }, "root": { "inputs": { "ecsls": "ecsls", @@ -145,7 +179,8 @@ "hosts": "hosts", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_3", + "onelink": "onelink" } }, "systems": { @@ -163,6 +198,21 @@ "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" + } + }, "utils": { "inputs": { "systems": "systems" @@ -180,6 +230,24 @@ "repo": "flake-utils", "type": "github" } + }, + "utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 9dcfed3..23d3d87 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,8 @@ hosts.url = "github:StevenBlack/hosts"; nixos-hardware.url = "github:NixOS/nixos-hardware"; + onelink.url = "github:Sigmanificient/1l.is"; + nix-index-database.url = "github:Mic92/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; @@ -23,6 +25,7 @@ , nix-index-database , nixos-hardware , home-manager + , onelink , hosts , ecsls , ... @@ -86,6 +89,20 @@ ./config/sigmachine.nix ]; }; + + Server = nixpkgs.lib.nixosSystem { + inherit system; + + modules = [ + hosts.nixosModule + { + services.onelink.enable = true; + } + + ./server/configuration.nix + ./server/hardware-configuration.nix + ]; + }; }; }; } diff --git a/server/configuration.nix b/server/configuration.nix index 8256e6c..812eed8 100644 --- a/server/configuration.nix +++ b/server/configuration.nix @@ -1,8 +1,6 @@ { ... }: { imports = [ ./hardware-configuration.nix - - ]; boot.cleanTmpDir = true;