Merge branch 'main' into modules

This commit is contained in:
Sam Nystrom 2023-04-14 09:15:42 -04:00 committed by GitHub
commit 3b8f45af24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 47 additions and 3 deletions

10
default.nix Normal file
View file

@ -0,0 +1,10 @@
(import
(
let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
fetchTarball {
url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
sha256 = lock.nodes.flake-compat.locked.narHash;
}
)
{ src = ./.; }
).defaultNix

27
flake.lock Normal file
View file

@ -0,0 +1,27 @@
{
"nodes": {
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"root": {
"inputs": {
"flake-compat": "flake-compat"
}
}
},
"root": "root",
"version": 7
}

View file

@ -1,7 +1,14 @@
{
description = "Soothing pastel theme for Nix";
outputs = { self }: {
nixosModules.catppuccin = import ./modules/nixos;
homeManagerModules.catppuccin = import ./modules/home-manager;
inputs = {
flake-compat = {
url = "github:edolstra/flake-compat";
flake = false;
};
};
outputs = _: {
nixosModules.catppuccin = import ./nixos;
homeManagerModules.catppuccin = import ./home-manager;
};
}