summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsils <sils@sils.li>2023-11-26 17:25:25 +0100
committersils <sils@sils.li>2023-11-26 17:25:25 +0100
commitd6806c96ca3fcf88426166f4d973193f8d90f8bf (patch)
tree9358356fe524ba3ab84611bc38a2286f832e2f6c
parentfeat(treewide): remove git-crypt (diff)
downloadnix-config-d6806c96ca3fcf88426166f4d973193f8d90f8bf.zip
fix(flake): optimize imports
-rw-r--r--flake.lock608
-rw-r--r--flake.nix87
2 files changed, 235 insertions, 460 deletions
diff --git a/flake.lock b/flake.lock
index 27535a1..34c02fe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,8 +2,12 @@
"nodes": {
"agenix": {
"inputs": {
- "darwin": "darwin",
- "home-manager": "home-manager",
+ "darwin": [
+ "nix-darwin"
+ ],
+ "home-manager": [
+ "home-manager"
+ ],
"nixpkgs": [
"nixpkgs"
]
@@ -25,11 +29,14 @@
"beautysh": {
"inputs": {
"nixpkgs": [
- "nixvim",
"nixpkgs"
],
- "poetry2nix": "poetry2nix",
- "utils": "utils"
+ "poetry2nix": [
+ "poetry2nix"
+ ],
+ "utils": [
+ "flake-utils"
+ ]
},
"locked": {
"lastModified": 1680308980,
@@ -67,46 +74,13 @@
},
"crane_2": {
"inputs": {
- "flake-compat": [
- "lanzaboote",
- "flake-compat"
- ],
- "flake-utils": [
- "lanzaboote",
- "flake-utils"
- ],
- "nixpkgs": [
- "lanzaboote",
- "nixpkgs"
- ],
- "rust-overlay": [
- "lanzaboote",
- "rust-overlay"
- ]
- },
- "locked": {
- "lastModified": 1681177078,
- "narHash": "sha256-ZNIjBDou2GOabcpctiQykEQVkI8BDwk7TyvlWlI4myE=",
- "owner": "ipetkov",
- "repo": "crane",
- "rev": "0c9f468ff00576577d83f5019a66c557ede5acf6",
- "type": "github"
- },
- "original": {
- "owner": "ipetkov",
- "repo": "crane",
- "type": "github"
- }
- },
- "crane_3": {
- "inputs": {
- "flake-compat": "flake-compat_5",
- "flake-utils": "flake-utils_5",
+ "flake-compat": "flake-compat_2",
+ "flake-utils": "flake-utils_2",
"nixpkgs": [
"yambar_memory",
"nixpkgs"
],
- "rust-overlay": "rust-overlay_3"
+ "rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1677642623,
@@ -122,28 +96,6 @@
"type": "github"
}
},
- "darwin": {
- "inputs": {
- "nixpkgs": [
- "agenix",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1673295039,
- "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=",
- "owner": "lnl7",
- "repo": "nix-darwin",
- "rev": "87b9d090ad39b25b2400029c64825fc2a8868943",
- "type": "github"
- },
- "original": {
- "owner": "lnl7",
- "ref": "master",
- "repo": "nix-darwin",
- "type": "github"
- }
- },
"flake-compat": {
"flake": false,
"locked": {
@@ -176,80 +128,13 @@
"type": "github"
}
},
- "flake-compat_3": {
- "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"
- }
- },
- "flake-compat_4": {
- "flake": false,
- "locked": {
- "lastModified": 1696426674,
- "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
- "flake-compat_5": {
- "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"
- }
- },
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
- "lanzaboote",
- "nixpkgs"
+ "nixpkgs-lib"
]
},
"locked": {
- "lastModified": 1680392223,
- "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "flake-parts",
- "type": "github"
- }
- },
- "flake-parts_2": {
- "inputs": {
- "nixpkgs-lib": "nixpkgs-lib"
- },
- "locked": {
"lastModified": 1698882062,
"narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
"owner": "hercules-ci",
@@ -284,60 +169,6 @@
}
},
"flake-utils_2": {
- "inputs": {
- "systems": "systems"
- },
- "locked": {
- "lastModified": 1681202837,
- "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flake-utils_3": {
- "inputs": {
- "systems": "systems_2"
- },
- "locked": {
- "lastModified": 1685518550,
- "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flake-utils_4": {
- "inputs": {
- "systems": "systems_3"
- },
- "locked": {
- "lastModified": 1685518550,
- "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
- "flake-utils_5": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
@@ -384,61 +215,15 @@
"gitignore": {
"inputs": {
"nixpkgs": [
- "lanzaboote",
- "pre-commit-hooks-nix",
"nixpkgs"
]
},
"locked": {
- "lastModified": 1660459072,
- "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+ "lastModified": 1694102001,
+ "narHash": "sha256-vky6VPK1n1od6vXbqzOXnekrQpTL4hbPAwUhT5J9c9E=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
- "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "type": "github"
- }
- },
- "gitignore_2": {
- "inputs": {
- "nixpkgs": [
- "nixvim",
- "pre-commit-hooks",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1660459072,
- "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
- "type": "github"
- },
- "original": {
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "type": "github"
- }
- },
- "gitignore_3": {
- "inputs": {
- "nixpkgs": [
- "prismlauncher",
- "pre-commit-hooks",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1660459072,
- "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
- "owner": "hercules-ci",
- "repo": "gitignore.nix",
- "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+ "rev": "9e21c80adf67ebcb077d75bd5e7d724d21eeafd6",
"type": "github"
},
"original": {
@@ -450,27 +235,6 @@
"home-manager": {
"inputs": {
"nixpkgs": [
- "agenix",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1682203081,
- "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
- "owner": "nix-community",
- "repo": "home-manager",
- "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "home-manager",
- "type": "github"
- }
- },
- "home-manager_2": {
- "inputs": {
- "nixpkgs": [
"nixpkgs"
]
},
@@ -505,15 +269,27 @@
},
"lanzaboote": {
"inputs": {
- "crane": "crane_2",
- "flake-compat": "flake-compat_2",
- "flake-parts": "flake-parts",
- "flake-utils": "flake-utils_2",
+ "crane": [
+ "crane"
+ ],
+ "flake-compat": [
+ "flake-compat"
+ ],
+ "flake-parts": [
+ "flake-parts"
+ ],
+ "flake-utils": [
+ "flake-utils"
+ ],
"nixpkgs": [
"nixpkgs"
],
- "pre-commit-hooks-nix": "pre-commit-hooks-nix",
- "rust-overlay": "rust-overlay"
+ "pre-commit-hooks-nix": [
+ "pre-commit-hooks-nix"
+ ],
+ "rust-overlay": [
+ "rust-overlay"
+ ]
},
"locked": {
"lastModified": 1682802423,
@@ -546,6 +322,26 @@
"type": "github"
}
},
+ "nix-darwin": {
+ "inputs": {
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1700795494,
+ "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
+ "owner": "lnl7",
+ "repo": "nix-darwin",
+ "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "lnl7",
+ "repo": "nix-darwin",
+ "type": "github"
+ }
+ },
"nix-filter": {
"locked": {
"lastModified": 1694857738,
@@ -561,6 +357,26 @@
"type": "github"
}
},
+ "nix-github-actions": {
+ "inputs": {
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1698974481,
+ "narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=",
+ "owner": "nix-community",
+ "repo": "nix-github-actions",
+ "rev": "4bb5e752616262457bc7ca5882192a564c0472d2",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "nix-github-actions",
+ "type": "github"
+ }
+ },
"nixpkgs": {
"locked": {
"lastModified": 1700612854,
@@ -580,16 +396,16 @@
"nixpkgs-lib": {
"locked": {
"dir": "lib",
- "lastModified": 1698611440,
- "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
- "owner": "NixOS",
+ "lastModified": 1700794826,
+ "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
+ "owner": "NixOs",
"repo": "nixpkgs",
- "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
+ "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
"type": "github"
},
"original": {
"dir": "lib",
- "owner": "NixOS",
+ "owner": "NixOs",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
@@ -597,22 +413,6 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1678872516,
- "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-22.11",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-stable_2": {
- "locked": {
"lastModified": 1700678569,
"narHash": "sha256-2Ki+2UvOidxEb3xB4ADqlbPQ2BZOF4uZMR094O8or2I=",
"owner": "NixOs",
@@ -627,48 +427,20 @@
"type": "github"
}
},
- "nixpkgs-stable_3": {
- "locked": {
- "lastModified": 1685801374,
- "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-23.05",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_2": {
- "locked": {
- "lastModified": 1700108881,
- "narHash": "sha256-+Lqybl8kj0+nD/IlAWPPG/RDTa47gff9nbei0u7BntE=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "7414e9ee0b3e9903c24d3379f577a417f0aae5f1",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixvim": {
"inputs": {
- "beautysh": "beautysh",
+ "beautysh": [
+ "beautysh"
+ ],
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
],
- "pre-commit-hooks": "pre-commit-hooks"
+ "pre-commit-hooks": [
+ "pre-commit-hooks-nix"
+ ]
},
"locked": {
"lastModified": 1700773889,
@@ -687,22 +459,25 @@
"poetry2nix": {
"inputs": {
"flake-utils": [
- "nixvim",
- "beautysh",
- "utils"
+ "flake-utils"
+ ],
+ "nix-github-actions": [
+ "nix-github-actions"
],
"nixpkgs": [
- "nixvim",
- "beautysh",
"nixpkgs"
+ ],
+ "systems": "systems",
+ "treefmt-nix": [
+ "treefmt-nix"
]
},
"locked": {
- "lastModified": 1658665240,
- "narHash": "sha256-/wkx7D7enyBPRjIkK0w7QxLQhzEkb3UxNQnjyc3FTUI=",
+ "lastModified": 1700890240,
+ "narHash": "sha256-AKbWnuDzDuXaYSXHXSj0Sa1DSmUm1KaFNJhf2MEhoS0=",
"owner": "nix-community",
"repo": "poetry2nix",
- "rev": "8b8edc85d24661d5a6d0d71d6a7011f3e699780f",
+ "rev": "674fc0ef18bb62f3aea7684e09f20046a3cdfedf",
"type": "github"
},
"original": {
@@ -711,54 +486,30 @@
"type": "github"
}
},
- "pre-commit-hooks": {
- "inputs": {
- "flake-compat": "flake-compat_3",
- "flake-utils": "flake-utils_3",
- "gitignore": "gitignore_2",
- "nixpkgs": [
- "nixvim",
- "nixpkgs"
- ],
- "nixpkgs-stable": "nixpkgs-stable_3"
- },
- "locked": {
- "lastModified": 1700064067,
- "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=",
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "type": "github"
- }
- },
"pre-commit-hooks-nix": {
"inputs": {
"flake-compat": [
- "lanzaboote",
"flake-compat"
],
"flake-utils": [
- "lanzaboote",
"flake-utils"
],
- "gitignore": "gitignore",
+ "gitignore": [
+ "gitignore"
+ ],
"nixpkgs": [
- "lanzaboote",
"nixpkgs"
],
- "nixpkgs-stable": "nixpkgs-stable"
+ "nixpkgs-stable": [
+ "nixpkgs-stable"
+ ]
},
"locked": {
- "lastModified": 1681413034,
- "narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=",
+ "lastModified": 1700922917,
+ "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5",
+ "rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78",
"type": "github"
},
"original": {
@@ -767,47 +518,28 @@
"type": "github"
}
},
- "pre-commit-hooks_2": {
+ "prismlauncher": {
"inputs": {
"flake-compat": [
- "prismlauncher",
"flake-compat"
],
- "flake-utils": "flake-utils_4",
- "gitignore": "gitignore_3",
+ "flake-parts": [
+ "flake-parts"
+ ],
+ "libnbtplusplus": [
+ "libnbtplusplus"
+ ],
+ "nix-filter": [
+ "nix-filter"
+ ],
"nixpkgs": [
- "prismlauncher",
"nixpkgs"
],
- "nixpkgs-stable": [
- "prismlauncher",
- "nixpkgs"
+ "pre-commit-hooks": [
+ "pre-commit-hooks-nix"
]
},
"locked": {
- "lastModified": 1700064067,
- "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=",
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8",
- "type": "github"
- },
- "original": {
- "owner": "cachix",
- "repo": "pre-commit-hooks.nix",
- "type": "github"
- }
- },
- "prismlauncher": {
- "inputs": {
- "flake-compat": "flake-compat_4",
- "flake-parts": "flake-parts_2",
- "libnbtplusplus": "libnbtplusplus",
- "nix-filter": "nix-filter",
- "nixpkgs": "nixpkgs_2",
- "pre-commit-hooks": "pre-commit-hooks_2"
- },
- "locked": {
"lastModified": 1700748844,
"narHash": "sha256-qfK4ORiTfTUpvWrJoZkI5A26TIjGIaulUC0j58aQFAI=",
"owner": "PrismLauncher",
@@ -888,22 +620,33 @@
"root": {
"inputs": {
"agenix": "agenix",
+ "beautysh": "beautysh",
"crane": "crane",
"flake-compat": "flake-compat",
+ "flake-parts": "flake-parts",
"flake-utils": "flake-utils",
- "home-manager": "home-manager_2",
+ "gitignore": "gitignore",
+ "home-manager": "home-manager",
"impermanence": "impermanence",
"lanzaboote": "lanzaboote",
+ "libnbtplusplus": "libnbtplusplus",
+ "nix-darwin": "nix-darwin",
+ "nix-filter": "nix-filter",
+ "nix-github-actions": "nix-github-actions",
"nixpkgs": "nixpkgs",
- "nixpkgs-stable": "nixpkgs-stable_2",
+ "nixpkgs-lib": "nixpkgs-lib",
+ "nixpkgs-stable": "nixpkgs-stable",
"nixvim": "nixvim",
+ "poetry2nix": "poetry2nix",
+ "pre-commit-hooks-nix": "pre-commit-hooks-nix",
"prismlauncher": "prismlauncher",
"ragenix": "ragenix",
"river_init_lesser": "river_init_lesser",
- "rust-overlay": "rust-overlay_2",
+ "rust-overlay": "rust-overlay",
"shell_library": "shell_library",
"sops-nix": "sops-nix",
- "systems": "systems_4",
+ "systems": "systems_2",
+ "treefmt-nix": "treefmt-nix",
"wl-togglescreens": "wl-togglescreens",
"yambar_cpu": "yambar_cpu",
"yambar_memory": "yambar_memory"
@@ -912,31 +655,6 @@
"rust-overlay": {
"inputs": {
"flake-utils": [
- "lanzaboote",
- "flake-utils"
- ],
- "nixpkgs": [
- "lanzaboote",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1682129965,
- "narHash": "sha256-1KRPIorEL6pLpJR04FwAqqnt4Tzcm4MqD84yhlD+XSk=",
- "owner": "oxalica",
- "repo": "rust-overlay",
- "rev": "2c417c0460b788328220120c698630947547ee83",
- "type": "github"
- },
- "original": {
- "owner": "oxalica",
- "repo": "rust-overlay",
- "type": "github"
- }
- },
- "rust-overlay_2": {
- "inputs": {
- "flake-utils": [
"flake-utils"
],
"nixpkgs": [
@@ -957,7 +675,7 @@
"type": "github"
}
},
- "rust-overlay_3": {
+ "rust-overlay_2": {
"inputs": {
"flake-utils": [
"yambar_memory",
@@ -1044,43 +762,12 @@
"type": "github"
},
"original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
+ "id": "systems",
+ "type": "indirect"
}
},
"systems_2": {
"locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "systems_3": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
- "systems_4": {
- "locked": {
"lastModified": 1700773236,
"narHash": "sha256-yW1VEbKEYQwZfPKaHCORAS8JU08wQMKzPFkvXyDI/D8=",
"ref": "refs/heads/main",
@@ -1094,18 +781,23 @@
"url": "https://codeberg.org/sils/systems"
}
},
- "utils": {
+ "treefmt-nix": {
+ "inputs": {
+ "nixpkgs": [
+ "nixpkgs"
+ ]
+ },
"locked": {
- "lastModified": 1678901627,
- "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
+ "lastModified": 1699786194,
+ "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=",
"owner": "numtide",
- "repo": "flake-utils",
- "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
+ "repo": "treefmt-nix",
+ "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1",
"type": "github"
},
"original": {
"owner": "numtide",
- "repo": "flake-utils",
+ "repo": "treefmt-nix",
"type": "github"
}
},
@@ -1158,7 +850,7 @@
},
"yambar_memory": {
"inputs": {
- "crane": "crane_3",
+ "crane": "crane_2",
"flake-utils": [
"flake-utils"
],
diff --git a/flake.nix b/flake.nix
index 58e0738..02452ee 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,7 @@
inputs = {
nixpkgs.url = "github:NixOs/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:NixOs/nixpkgs/nixos-23.05";
+ nixpkgs-lib.url = "github:NixOs/nixpkgs/nixos-unstable?dir=lib";
home-manager = {
url = "github:nix-community/home-manager";
@@ -12,10 +13,35 @@
impermanence.url = "github:nix-community/impermanence";
+ nix-darwin = {
+ url = "github:lnl7/nix-darwin";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+
+ gitignore = {
+ url = "github:hercules-ci/gitignore.nix";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+
+ pre-commit-hooks-nix = {
+ url = "github:cachix/pre-commit-hooks.nix";
+ inputs = {
+ flake-compat.follows = "flake-compat";
+ flake-utils.follows = "flake-utils";
+ gitignore.follows = "gitignore";
+ nixpkgs.follows = "nixpkgs";
+ nixpkgs-stable.follows = "nixpkgs-stable";
+ };
+ };
+
# inputs for following
agenix = {
url = "github:ryantm/agenix";
- inputs.nixpkgs.follows = "nixpkgs";
+ inputs = {
+ nixpkgs.follows = "nixpkgs";
+ home-manager.follows = "home-manager";
+ darwin.follows = "nix-darwin";
+ };
};
ragenix = {
url = "github:yaxitech/ragenix";
@@ -27,16 +53,54 @@
crane.follows = "crane";
};
};
+ poetry2nix = {
+ url = "github:nix-community/poetry2nix";
+ inputs = {
+ flake-utils.follows = "flake-utils";
+ nixpkgs.follows = "nixpkgs";
+ nix-github-actions.follows = "nix-github-actions";
+ treefmt-nix.follows = "treefmt-nix";
+ };
+ };
+ beautysh = {
+ url = "github:lovesegfault/beautysh";
+ inputs = {
+ nixpkgs.follows = "nixpkgs";
+ poetry2nix.follows = "poetry2nix";
+ utils.follows = "flake-utils";
+ };
+ };
+ nix-github-actions = {
+ url = "github:nix-community/nix-github-actions";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
+ treefmt-nix = {
+ url = "github:numtide/treefmt-nix";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
nixvim = {
url = "github:nix-community/nixvim";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
+ beautysh.follows = "beautysh";
+ pre-commit-hooks.follows = "pre-commit-hooks-nix";
};
};
lanzaboote = {
url = "github:nix-community/lanzaboote/v0.3.0";
- inputs.nixpkgs.follows = "nixpkgs";
+ inputs = {
+ crane.follows = "crane";
+ nixpkgs.follows = "nixpkgs";
+ flake-compat.follows = "flake-compat";
+ flake-parts = {
+ follows = "flake-parts";
+ inputs.nixpkgs-lib.follows = "nixpkgs-lib";
+ };
+ flake-utils.follows = "flake-utils";
+ pre-commit-hooks-nix.follows = "pre-commit-hooks-nix";
+ rust-overlay.follows = "rust-overlay";
+ };
};
systems = {
url = "git+https://codeberg.org/sils/systems"; # specify systems to evaluate
@@ -64,6 +128,10 @@
systems.follows = "systems";
};
};
+ flake-parts = {
+ url = "github:hercules-ci/flake-parts";
+ inputs.nixpkgs-lib.follows = "nixpkgs-lib";
+ };
rust-overlay = {
url = "github:oxalica/rust-overlay";
inputs = {
@@ -116,6 +184,21 @@
# };
prismlauncher = {
url = "github:PrismLauncher/PrismLauncher";
+ inputs = {
+ flake-compat.follows = "flake-compat";
+ flake-parts.follows = "flake-parts";
+ libnbtplusplus.follows = "libnbtplusplus";
+ nix-filter.follows = "nix-filter";
+ nixpkgs.follows = "nixpkgs";
+ pre-commit-hooks.follows = "pre-commit-hooks-nix";
+ };
+ };
+ nix-filter = {
+ url = "github:numtide/nix-filter";
+ };
+ libnbtplusplus = {
+ url = "github:PrismLauncher/libnbtplusplus";
+ flake = false;
};
wl-togglescreens = {
url = "git+https://git.project-insanity.org/onny/wl-togglescreens.git?ref=main";