diff --git a/configuration.nix b/configuration.nix index 513f854..70a6dc6 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,8 +1,4 @@ -{ config, pkgs, lib, ... }: -let - url-overlay = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nix-repo/archive/22-11.tar.gz"; - nix-overlay = (import (builtins.fetchTarball url-overlay)); -in +{ selfprivacy-overlay, config, pkgs, lib, ... }: { imports = [ ./hardware-configuration.nix @@ -28,7 +24,9 @@ in ./git/gitea.nix ]; - nixpkgs.overlays = [ (nix-overlay) ]; + nixpkgs.overlays = [ (import selfprivacy-overlay) ]; + # this should be specified in hardware-configuration.nix? + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; services.redis.servers.sp-api = { enable = true; diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..9c16ef1 --- /dev/null +++ b/flake.lock @@ -0,0 +1,43 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs", + "selfprivacy-overlay": "selfprivacy-overlay" + } + }, + "selfprivacy-overlay": { + "locked": { + "lastModified": 1689468120, + "narHash": "sha256-bgQQbUkU0Q4hTwj2RYrGAwwHZ5hmR6cEv87kYn7JjrU=", + "ref": "refs/heads/flakes", + "rev": "636a941969553db2d704734ccaf8684b69271d0f", + "revCount": 31, + "type": "git", + "url": "file:///data/selfprivacy/selfprivacy-nix-repo" + }, + "original": { + "type": "git", + "url": "file:///data/selfprivacy/selfprivacy-nix-repo" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..d8f4818 --- /dev/null +++ b/flake.nix @@ -0,0 +1,26 @@ +{ + description = "Selfprivacy NixOS configuration flake"; + + inputs = { + #nixpkgs.url = "https://github.com/NixOS/nixpkgs/archive/eef86b8a942913a828b9ef13722835f359deef29.tar.gz"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11"; + # selfprivacy-overlay.url = "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-nix-repo/archive/22-11.tar.gz"; + selfprivacy-overlay.url = "git+file:///data/selfprivacy/selfprivacy-nix-repo"; + }; + + outputs = { self, nixpkgs, selfprivacy-overlay }: + let + system = "x86_64-linux"; + + pkgs = import nixpkgs { inherit system; }; + in + { + nixosConfigurations = { + just-nixos = nixpkgs.lib.nixosSystem { + specialArgs = { inherit system; }; + + modules = [ ./configuration.nix ]; + }; + }; + }; +}