diff --git a/flake.lock b/flake.lock index 105f9e6..5c55214 100644 --- a/flake.lock +++ b/flake.lock @@ -38,7 +38,42 @@ "type": "github" } }, + "nix-software-center": { + "inputs": { + "nixpkgs": "nixpkgs", + "utils": "utils" + }, + "locked": { + "lastModified": 1693158194, + "narHash": "sha256-jDTKAmei9UgwoVHAskalRilTunWYlWOESNGY4BKscuU=", + "owner": "vlinkz", + "repo": "nix-software-center", + "rev": "8faa762f9b710520f8b7f81f4892a6e0aba749dc", + "type": "github" + }, + "original": { + "owner": "vlinkz", + "repo": "nix-software-center", + "type": "github" + } + }, "nixpkgs": { + "locked": { + "lastModified": 1692638711, + "narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "91a22f76cd1716f9d0149e8a5c68424bb691de15", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1701253981, "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", @@ -58,7 +93,8 @@ "inputs": { "disko": "disko", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nix-software-center": "nix-software-center", + "nixpkgs": "nixpkgs_2" } }, "systems": { @@ -75,6 +111,39 @@ "repo": "default", "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_2" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 3337b2e..b7fae72 100644 --- a/flake.nix +++ b/flake.nix @@ -8,9 +8,11 @@ url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-software-center.url = "github:vlinkz/nix-software-center"; + # waydroid-script = "casualsnek/waydroid_script"; }; - outputs = { self, flake-utils, disko, nixpkgs }@inputs: + outputs = { self, flake-utils, disko, nixpkgs, ... }@inputs: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; @@ -23,7 +25,7 @@ nixpkgs.lib.nixosSystem { inherit system; modules = [ - ./traits/base.nix + (import ./traits/base.nix { inherit pkgs; inherit system; inherit inputs; }) disko.nixosModules.disko ] ++ modules; }; diff --git a/traits/base.nix b/traits/base.nix index 1d45948..73fd664 100644 --- a/traits/base.nix +++ b/traits/base.nix @@ -2,7 +2,11 @@ # your system. Help is available in the configuration.nix(5) man page, on # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). -{ config, lib, pkgs, ... }: +{ pkgs +, system +, inputs +, ... +}: { # Use the systemd-boot EFI boot loader. @@ -85,6 +89,7 @@ environment.systemPackages = with pkgs; [ vim wget + inputs.nix-software-center.packages.${system}.nix-software-center ]; # Package manager @@ -93,6 +98,12 @@ extraOptions = '' experimental-features = flakes nix-command ''; + settings = { + substituters = [ "https://snowflakeos.cachix.org/" ]; + trusted-public-keys = [ + "snowflakeos.cachix.org-1:gXb32BL86r9bw1kBiw9AJuIkqN49xBvPd1ZW8YlqO70=" + ]; + }; }; # Internationalization