diff --git a/flake.lock b/flake.lock index 114392d..37a135b 100644 --- a/flake.lock +++ b/flake.lock @@ -42,6 +42,27 @@ "type": "github" } }, + "compose2nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "onchg": "onchg" + }, + "locked": { + "lastModified": 1762390855, + "narHash": "sha256-IUNXoHzTdpR+hRgcLB7imqmmA6bB7gUwWb5OfVAteJo=", + "owner": "aksiksi", + "repo": "compose2nix", + "rev": "d87652be197855d568b093cbacecdcd26cde0d91", + "type": "github" + }, + "original": { + "owner": "aksiksi", + "repo": "compose2nix", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1746162366, @@ -100,6 +121,21 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1652776076, + "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems_2" }, @@ -186,6 +222,29 @@ "type": "github" } }, + "nix-pre-commit": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "compose2nix", + "onchg", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1653259102, + "narHash": "sha256-XfCEu4zur/N2Dk4v8wFiQAgJ7bgNqPqwWp1vBXkeczM=", + "owner": "jmgilman", + "repo": "nix-pre-commit", + "rev": "6a99b2711c7eac9960939d8eb91e84322b22d50c", + "type": "github" + }, + "original": { + "owner": "jmgilman", + "repo": "nix-pre-commit", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1762977756, @@ -248,7 +307,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -269,6 +328,28 @@ "type": "github" } }, + "onchg": { + "inputs": { + "nix-pre-commit": "nix-pre-commit", + "nixpkgs": [ + "compose2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1720368454, + "narHash": "sha256-NUSw3G2gsQX8/G64/pDBb1oitM+x13m7nFRvpiI4a+s=", + "owner": "aksiksi", + "repo": "onchg-rs", + "rev": "c42b693d10920874b3644ef1502e33318409d69c", + "type": "github" + }, + "original": { + "owner": "aksiksi", + "repo": "onchg-rs", + "type": "github" + } + }, "plasma-manager": { "inputs": { "home-manager": [ @@ -296,6 +377,7 @@ "inputs": { "apple-silicon": "apple-silicon", "catppuccin": "catppuccin", + "compose2nix": "compose2nix", "home-manager": "home-manager", "kwin-effects-forceblur": "kwin-effects-forceblur", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index 2f81732..851245a 100644 --- a/flake.nix +++ b/flake.nix @@ -35,6 +35,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + compose2nix = { + url = "github:aksiksi/compose2nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + apple-silicon = { url = "github:nix-community/nixos-apple-silicon/release-2025-11-18"; inputs.nixpkgs.follows = "nixpkgs"; @@ -50,6 +55,7 @@ nur, nixvim, kwin-effects-forceblur, + compose2nix, apple-silicon, ... }: @@ -64,7 +70,7 @@ inherit system; specialArgs = { inherit catppuccin; - inputs = { inherit kwin-effects-forceblur; }; + inputs = { inherit kwin-effects-forceblur compose2nix; }; }; modules = [ { diff --git a/system/hosts/alien/default.nix b/system/hosts/alien/default.nix index 3254649..6e76692 100644 --- a/system/hosts/alien/default.nix +++ b/system/hosts/alien/default.nix @@ -2,6 +2,7 @@ config, pkgs, lib, + inputs, catppuccin, ... }: @@ -13,6 +14,11 @@ "riscv64-linux" ]; + environment.systemPackages = [ + pkgs.compose2nix + inputs.compose2nix.packages.x86_64-linux.default + ]; + catppuccin.accent = "blue"; home-manager.users.sckova = {