diff --git a/flake.lock b/flake.lock index ee16e00..0093f43 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1711148452, - "narHash": "sha256-2MUcJV0Vs0Zfw+XPH7uslAXXpiLj3Wijcizq1DsRt3A=", + "lastModified": 1711597760, + "narHash": "sha256-SQ5ixJU33jjgSOrloFkuhvbKPy2FVREVNc96caEHYAY=", "ref": "refs/heads/canon", - "rev": "37776fcf8ca8b93a1c2a46f9323be97913113fbd", - "revCount": 43, + "rev": "be4c446e1dc3391b353b07a701bed21db5b025bb", + "revCount": 46, "type": "git", "url": "https://git.mildlyfunctional.gay/artemist/packages.git" }, @@ -95,6 +95,21 @@ } }, "flake-compat_2": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "ref": "refs/heads/master", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "git", + "url": "ssh://git@git.lix.systems/lix-project/flake-compat" + }, + "original": { + "type": "git", + "url": "ssh://git@git.lix.systems/lix-project/flake-compat" + } + }, + "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -108,7 +123,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_3": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -202,6 +217,21 @@ "type": "github" } }, + "flakey-profile": { + "locked": { + "lastModified": 1711325813, + "narHash": "sha256-ygJR5VikyCfK0CUJHboOKJVr6s9HQ1RXcvFEFnv+KIk=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "3b32c4a71f89b874fe0be2dc125eacb9c3473204", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "fonts": { "inputs": { "artemist": [ @@ -279,11 +309,11 @@ ] }, "locked": { - "lastModified": 1711133180, - "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", + "lastModified": 1711625603, + "narHash": "sha256-W+9dfqA9bqUIBV5u7jaIARAzMe3kTq/Hp2SpSVXKRQw=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", + "rev": "c0ef0dab55611c676ad7539bf4e41b3ec6fa87d2", "type": "github" }, "original": { @@ -342,6 +372,50 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1711639271, + "narHash": "sha256-SIdsZPOTKIkcTCm5e5bdIffC9UJygwQBEa4C55XUxJM=", + "ref": "refs/heads/main", + "rev": "47b0967cd1a28b780558e9db403c8e28bae11a13", + "revCount": 15250, + "type": "git", + "url": "ssh://git@lix.systems/lix-project/lix" + }, + "original": { + "type": "git", + "url": "ssh://git@lix.systems/lix-project/lix" + } + }, + "lix-module": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": [ + "utils" + ], + "flakey-profile": "flakey-profile", + "lix": [ + "lix" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1711647160, + "narHash": "sha256-I9WCwuRUU+LRBtcwLqCmfI2v1vbtXnfb6hxwT5mbEGc=", + "ref": "refs/heads/main", + "rev": "280c404856a313c83d4e8cc6d2d17d93e9b5363b", + "revCount": 32, + "type": "git", + "url": "ssh://git@lix.systems/lix-project/nixos-module" + }, + "original": { + "type": "git", + "url": "ssh://git@lix.systems/lix-project/nixos-module" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -379,11 +453,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711163522, - "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", + "lastModified": 1711523803, + "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", + "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", "type": "github" }, "original": { @@ -412,7 +486,7 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", "home-manager": [ "home-manager" @@ -424,11 +498,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1711407730, - "narHash": "sha256-vcMDhq4nKoDe8JXuooI5GojTVSf+QP1bxIELcdQOa9w=", + "lastModified": 1711630555, + "narHash": "sha256-jslStwDlRwVZLwcFkExWegOGYv/Dn9q7yoocUX7AsIg=", "owner": "nix-community", "repo": "nixvim", - "rev": "ce87283dd6f6660b199af174e60f4a0cec0e2c5b", + "rev": "acb917fbf2bc9ce9c556516d8a1f257709b3cf1e", "type": "github" }, "original": { @@ -439,7 +513,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_2", "gitignore": "gitignore_2", "nixpkgs": [ @@ -452,11 +526,11 @@ ] }, "locked": { - "lastModified": 1710923068, - "narHash": "sha256-6hOpUiuxuwpXXc/xfJsBUJeqqgGI+JMJuLo45aG3cKc=", + "lastModified": 1711519547, + "narHash": "sha256-Q7YmSCUJmDl71fJv/zD9lrOCJ1/SE/okZ2DsrmRjzhY=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e611897ddfdde3ed3eaac4758635d7177ff78673", + "rev": "7d47a32e5cd1ea481fab33c516356ce27c8cef4a", "type": "github" }, "original": { @@ -519,6 +593,8 @@ "home-manager": "home-manager", "jovian": "jovian", "lanzaboote": "lanzaboote", + "lix": "lix", + "lix-module": "lix-module", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index e936c65..497b7cd 100644 --- a/flake.nix +++ b/flake.nix @@ -14,14 +14,29 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "utils"; }; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + jovian = { + url = "github:jovian-experiments/jovian-nixos"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.nix-github-actions.follows = ""; + }; lanzaboote = { url = "github:nix-community/lanzaboote/v0.3.0"; inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "utils"; }; - home-manager = { - url = "github:nix-community/home-manager"; + lix = { + url = "git+ssh://git@lix.systems/lix-project/lix"; + flake = false; + }; + lix-module = { + url = "git+ssh://git@lix.systems/lix-project/nixos-module"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "utils"; + inputs.lix.follows = "lix"; }; nixvim = { url = "github:nix-community/nixvim"; @@ -33,18 +48,12 @@ url = "github:nix-community/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; + private.url = "git+ssh://forgejo@git.mildlyfunctional.gay/artemist/nixos-config-private?ref=unified"; rustybar = { url = "git+https://git.mildlyfunctional.gay/mildlyfunctionalgays/rustybar.git"; inputs.nixpkgs.follows = "nixpkgs"; inputs.utils.follows = "utils"; }; - jovian = { - url = "github:jovian-experiments/jovian-nixos"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.nix-github-actions.follows = ""; - }; - - private.url = "git+ssh://forgejo@git.mildlyfunctional.gay/artemist/nixos-config-private?ref=unified"; }; outputs = diff --git a/sets/base.nix b/sets/base.nix index 90d5a6a..82bcc55 100644 --- a/sets/base.nix +++ b/sets/base.nix @@ -8,6 +8,7 @@ { imports = [ + inputs.lix-module.nixosModules.default inputs.private.nixosModules.base inputs.private.nixosModules.substituter ];