From fa0c1cb877494dc8689ec264981cbe3e9279c3da Mon Sep 17 00:00:00 2001 From: Daylin Morgan Date: Mon, 19 Feb 2024 10:54:03 -0600 Subject: [PATCH] most minimal flake.nix --- flake.lock | 103 +++++++++++++++++++++++++++++++++++------------ flake.nix | 45 ++++++++------------- inputs/flake.nix | 39 ++++++++++++++++++ 3 files changed, 133 insertions(+), 54 deletions(-) create mode 100644 inputs/flake.nix diff --git a/flake.lock b/flake.lock index 975e8cf..d982040 100644 --- a/flake.lock +++ b/flake.lock @@ -18,6 +18,7 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ + "inputs", "nix-eval-jobs", "nixpkgs" ] @@ -57,7 +58,9 @@ "hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang", "nixpkgs": [ + "inputs", "nixpkgs" ], "systems": "systems", @@ -65,11 +68,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1708215223, - "narHash": "sha256-5z+NPNoiWKoaz3M4LZJ2fP+N7Vl9XGwr4QAV8rh4l4o=", + "lastModified": 1708346705, + "narHash": "sha256-Zevax+tbcABJ9ZT/jOtJ8x4nudSAXhlBF0uIDSp8v4o=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "683a4b07c514fa3c13cdf09e475283a69fcc7653", + "rev": "df82625206b6faffbf02d5d802e857143d656239", "type": "github" }, "original": { @@ -82,6 +85,7 @@ "hyprland-contrib": { "inputs": { "nixpkgs": [ + "inputs", "nixpkgs" ] }, @@ -102,10 +106,12 @@ "hyprland-protocols": { "inputs": { "nixpkgs": [ + "inputs", "hyprland", "nixpkgs" ], "systems": [ + "inputs", "hyprland", "systems" ] @@ -127,6 +133,29 @@ "hyprlang": { "inputs": { "nixpkgs": [ + "inputs", + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1708005943, + "narHash": "sha256-9TT3xk++LI5/SPYgjYX34xZ4ebR93c1uerIq+SE/ues=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "aeb3e012adc7b3235335c540b214b82267c2b983", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprlang_2": { + "inputs": { + "nixpkgs": [ + "inputs", "hyprland", "xdph", "nixpkgs" @@ -146,17 +175,37 @@ "type": "github" } }, + "inputs": { + "inputs": { + "hyprland": "hyprland", + "hyprland-contrib": "hyprland-contrib", + "nix-eval-jobs": "nix-eval-jobs", + "nixpkgs": "nixpkgs", + "nixpkgs-wayland": "nixpkgs-wayland", + "pinix": "pinix" + }, + "locked": { + "lastModified": 1, + "narHash": "sha256-f1iK37gKrRA5Ampke23EzstEFHuKAwEdQnFi2kp4Gi4=", + "path": "/nix/store/zawcw9ffqblsfj2943zlkhdiilg9k2vg-source/inputs", + "type": "path" + }, + "original": { + "path": "/nix/store/zawcw9ffqblsfj2943zlkhdiilg9k2vg-source/inputs", + "type": "path" + } + }, "lib-aggregate": { "inputs": { "flake-utils": "flake-utils", "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1707653303, - "narHash": "sha256-DSnssBCh1rPPyxGxFawGzWJjfmDB5AL18QHzzDMarqc=", + "lastModified": 1708258113, + "narHash": "sha256-SYqkbLHSe4UxgcNwUHrMPnRmX/oJFzRILrpyn5dsJVE=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "48d8001225a9148f1a97ee519ad53d8272cd8c73", + "rev": "42e4c0c8b04cecec07e796ce8efcb5378e93a319", "type": "github" }, "original": { @@ -170,6 +219,7 @@ "flake-parts": "flake-parts", "nix-github-actions": "nix-github-actions", "nixpkgs": [ + "inputs", "nixpkgs" ], "treefmt-nix": "treefmt-nix" @@ -191,6 +241,7 @@ "nix-github-actions": { "inputs": { "nixpkgs": [ + "inputs", "nix-eval-jobs", "nixpkgs" ] @@ -211,11 +262,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708151420, - "narHash": "sha256-MGT/4aGCWQPQiu6COqJdCj9kSpLPiShgbwpbC38YXC8=", + "lastModified": 1708341091, + "narHash": "sha256-3R7doGV1AoB5VKFifEd5elj8t4cld6VpJRpn9NaYr1Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e2f00c83911461438301db0dba5281197fe4b3a", + "rev": "86ef6bd96b6279e1a4a53236d341f5df1ede3803", "type": "github" }, "original": { @@ -227,11 +278,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1707612395, - "narHash": "sha256-iqWiOQY+OwL0Yqdqy1dEWsMMpht+0eSlmtpZ5Rws16Y=", + "lastModified": 1708217146, + "narHash": "sha256-nGfEv7k78slqIR5E0zzWSx214d/4/ZPKDkObLJqVLVw=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "240f2ff0ed2aac2b91efa29ba3d325526824205b", + "rev": "e623008d8a46517470e6365505f1a3ce171fa46a", "type": "github" }, "original": { @@ -245,18 +296,20 @@ "flake-compat": "flake-compat", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": [ + "inputs", "nix-eval-jobs" ], "nixpkgs": [ + "inputs", "nixpkgs" ] }, "locked": { - "lastModified": 1708193841, - "narHash": "sha256-VYSeZ1pHN+dZ2Pk5uv3x1I+StL5P+eGJUsVmJ8+UsnY=", + "lastModified": 1708345677, + "narHash": "sha256-kmay2PfLBNL1fDYDlKyYj7P/JSqyFeMKzA+PMhEPbJI=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "c33eb6820954085c08e4ecd12b161efb2641b5c7", + "rev": "e01cca334cae6d9e852c8d657633695c681250fd", "type": "github" }, "original": { @@ -268,15 +321,16 @@ "pinix": { "inputs": { "nixpkgs": [ + "inputs", "nixpkgs" ] }, "locked": { - "lastModified": 1708208940, - "narHash": "sha256-CyheHldtsKJTnWLJpYDU+XGURW5V+LjeoOnO8mIamJc=", + "lastModified": 1708267018, + "narHash": "sha256-/LA/IKbO7qgd5s/dWckcY2RQwyVZxvLH5gHzDzHXdO8=", "owner": "remi-dupre", "repo": "pinix", - "rev": "12539466ce91017fc7309f450e1914cf6d26ac78", + "rev": "83d58d64ebbb68532a0c23646ecd987d95dc0581", "type": "github" }, "original": { @@ -287,12 +341,7 @@ }, "root": { "inputs": { - "hyprland": "hyprland", - "hyprland-contrib": "hyprland-contrib", - "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs", - "nixpkgs-wayland": "nixpkgs-wayland", - "pinix": "pinix" + "inputs": "inputs" } }, "systems": { @@ -328,6 +377,7 @@ "treefmt-nix": { "inputs": { "nixpkgs": [ + "inputs", "nix-eval-jobs", "nixpkgs" ] @@ -368,15 +418,18 @@ "xdph": { "inputs": { "hyprland-protocols": [ + "inputs", "hyprland", "hyprland-protocols" ], - "hyprlang": "hyprlang", + "hyprlang": "hyprlang_2", "nixpkgs": [ + "inputs", "hyprland", "nixpkgs" ], "systems": [ + "inputs", "hyprland", "systems" ] diff --git a/flake.nix b/flake.nix index 25f2dcc..abce592 100644 --- a/flake.nix +++ b/flake.nix @@ -1,36 +1,23 @@ { description = "nix begat oizys"; - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - hyprland.url = "github:hyprwm/Hyprland/main"; - hyprland.inputs.nixpkgs.follows = "nixpkgs"; - hyprland-contrib.url = "github:hyprwm/contrib"; - hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs"; - nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; - nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs"; - nixpkgs-wayland.inputs.nix-eval-jobs.follows = "nix-eval-jobs"; - nix-eval-jobs.url = "github:nix-community/nix-eval-jobs"; - nix-eval-jobs.inputs.nixpkgs.follows = "nixpkgs"; - pinix.url = "github:remi-dupre/pinix"; - pinix.inputs.nixpkgs.follows = "nixpkgs"; - }; + inputs.inputs.url = "./inputs"; - nixConfig = { - extra-substituters = [ - "https://hyprland.cachix.org" - "https://nixpkgs-wayland.cachix.org" - "https://daylin.cachix.org" - ]; - extra-trusted-public-keys = [ - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" - "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k=" - ]; - }; - - outputs = inputs @ {nixpkgs, ...}: let - lib = import ./lib {inherit inputs nixpkgs;}; + # nixConfig = { + # extra-substituters = [ + # "https://hyprland.cachix.org" + # "https://nixpkgs-wayland.cachix.org" + # "https://daylin.cachix.org" + # ]; + # extra-trusted-public-keys = [ + # "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + # "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" + # "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k=" + # ]; + # }; + # + outputs = {inputs, ...}: let + lib = import ./lib {nixpkgs = inputs.inputs.nixpkgs; inputs = inputs;}; inherit (lib) findModules buildHosts buildOizys; in { nixosModules = findModules ./modules; diff --git a/inputs/flake.nix b/inputs/flake.nix new file mode 100644 index 0000000..12b21e3 --- /dev/null +++ b/inputs/flake.nix @@ -0,0 +1,39 @@ +{ + description = "nix begat oizys"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + + hyprland.url = "github:hyprwm/Hyprland/main"; + hyprland.inputs.nixpkgs.follows = "nixpkgs"; + + hyprland-contrib.url = "github:hyprwm/contrib"; + hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs"; + + nixpkgs-wayland = { + url = "github:nix-community/nixpkgs-wayland"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.nix-eval-jobs.follows = "nix-eval-jobs"; + }; + + nix-eval-jobs.url = "github:nix-community/nix-eval-jobs"; + nix-eval-jobs.inputs.nixpkgs.follows = "nixpkgs"; + + pinix.url = "github:remi-dupre/pinix"; + pinix.inputs.nixpkgs.follows = "nixpkgs"; + }; + + nixConfig = { + extra-substituters = [ + "https://hyprland.cachix.org" + "https://nixpkgs-wayland.cachix.org" + "https://daylin.cachix.org" + ]; + extra-trusted-public-keys = [ + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" + "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k=" + ]; + }; + outputs = _: {}; +}