Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<a href="https://nixos.wiki/wiki/Flakes" target="_blank"><img alt="Nix Flakes Ready" src="https://img.shields.io/static/v1?logo=nixos&logoColor=d8dee9&label=Nix%20Flakes&labelColor=5e81ac&message=Ready&color=d8dee9&style=for-the-badge"></a>
<a href="https://github.com/snowfallorg/lib" target="_blank"><img alt="Built With Snowfall" src="https://img.shields.io/static/v1?logoColor=d8dee9&label=Built%20With&labelColor=5e81ac&message=Snowfall&color=d8dee9&style=for-the-badge"></a>

# Solaar-Flake
This Repo is a Flake of [Solaar](https://github.com/pwr-Solaar/Solaar) for NixOS.
Expand Down
102 changes: 23 additions & 79 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 22 additions & 20 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,31 @@

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
utils.url = "github:gytis-ivaskevicius/flake-utils-plus?rev=afcb15b845e74ac5e998358709b2b5fe42a948d1";
};

snowfall-lib = {
url = "github:snowfallorg/lib?ref=v3.0.3";
inputs.nixpkgs.follows = "nixpkgs";
};
outputs = inputs@{ self, nixpkgs, utils, ... }:
let
inherit (utils.lib) exportOverlays exportPackages exportModules;
in
utils.lib.mkFlake {
inherit self inputs;

sharedOverlays = [
(import ./packages)
];

flake-compat = {
url = "github:edolstra/flake-compat";
flake = false;
nixosModules = exportModules [
./modules/nixos/solaar
./modules/nixos/solaar/default.nix
];

overlays = exportOverlays {
inherit (self) pkgs inputs;
};
};

outputs = inputs:
let
lib = inputs.snowfall-lib.mkLib {
inherit inputs;
src = ./.;
};
in
lib.mkFlake {
alias = {
packages.default = "solaar";
modules.nixos.default = "solaar";
};
outputsBuilder = channels: {
packages = exportPackages self.overlays channels;
};
};
}
8 changes: 5 additions & 3 deletions modules/nixos/solaar/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

with lib;

let cfg = config.services.solaar;
let
cfg = config.services.solaar;
solaar = pkgs.callPackage ../../../packages/solaar { };
in {
options.services.solaar = {
enable = mkEnableOption ''
Expand All @@ -11,8 +13,8 @@ in {

package = mkOption {
type = types.package;
default = pkgs.internal.solaar;
defaultText = "pkgs.internal.solaar";
default = solaar;
defaultText = "solaar";
description = ''
Package witch is used for Solaar
'';
Expand Down
4 changes: 4 additions & 0 deletions packages/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
final: prev: {
solaar = prev.callPackage ./solaar { };
default = prev.callPackage ./solaar { };
}