diff options
| -rw-r--r-- | flake.lock | 635 | ||||
| -rw-r--r-- | flake.nix | 13 | ||||
| -rw-r--r-- | home/ebisu/default.nix | 8 | ||||
| -rw-r--r-- | home/ebisu/fortune/default.nix | 1 | ||||
| -rw-r--r-- | home/ebisu/fortune/development/default.nix | 1 | ||||
| -rw-r--r-- | home/ebisu/fortune/development/nix/default.nix | 29 | ||||
| -rw-r--r-- | home/ebisu/fortune/multimedia/video/default.nix | 2 | ||||
| -rw-r--r-- | home/ebisu/fortune/nix/default.nix | 27 | ||||
| -rw-r--r-- | home/ebisu/fortune/nix/development/default.nix | 9 | ||||
| -rw-r--r-- | home/ebisu/fortune/nix/development/formatting.nix | 7 | ||||
| -rw-r--r-- | home/ebisu/fortune/nix/development/lsp.nix | 7 | ||||
| -rw-r--r-- | home/ebisu/fortune/nix/development/tools.nix | 18 | ||||
| -rw-r--r-- | home/ebisu/fortune/nix/direnv.nix (renamed from home/ebisu/fortune/development/nix/direnv.nix) | 0 | ||||
| -rw-r--r-- | modules/nix/default.nix | 2 | ||||
| -rw-r--r-- | modules/virtualisation/default.nix | 2 |
15 files changed, 711 insertions, 50 deletions
@@ -33,6 +33,136 @@ "type": "github" } }, + "cachix-push": { + "locked": { + "lastModified": 1725315090, + "narHash": "sha256-d/ZGRHfSGPEpCCNSVlfZ0ND2IZV0H9nN/3BLMA7d9fs=", + "owner": "juspay", + "repo": "cachix-push", + "rev": "fbe9734921e19abc4830dc4ea425aaa82cf61991", + "type": "github" + }, + "original": { + "owner": "juspay", + "repo": "cachix-push", + "type": "github" + } + }, + "cargo-doc-live": { + "locked": { + "lastModified": 1724704668, + "narHash": "sha256-kJFYXlWUodg5WhJ0NuvrP0mCvOT/2AOIo8oGeYLXocs=", + "owner": "srid", + "repo": "cargo-doc-live", + "rev": "b09d5d258d2498829e03014931fc19aed499b86f", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "cargo-doc-live", + "type": "github" + } + }, + "chaotic": { + "inputs": { + "compare-to": "compare-to", + "fenix": "fenix", + "flake-schemas": "flake-schemas", + "home-manager": "home-manager", + "jovian": "jovian", + "nixpkgs": "nixpkgs", + "systems": "systems", + "yafas": "yafas" + }, + "locked": { + "lastModified": 1725648456, + "narHash": "sha256-tvUH4BPgk8jVVJrXlTQDu6sqHsSDOLWMEhy+iuLR2RA=", + "owner": "chaotic-cx", + "repo": "nyx", + "rev": "61032d2f00185066bcd0db424f60dd3e4aa7ed89", + "type": "github" + }, + "original": { + "owner": "chaotic-cx", + "ref": "nyxpkgs-unstable", + "repo": "nyx", + "type": "github" + } + }, + "compare-to": { + "locked": { + "lastModified": 1695341185, + "narHash": "sha256-htO6DSbWyCgaDkxi7foPjXwJFPzGjVt3RRUbPSpNtZY=", + "rev": "98b8e330823a3570d328720f87a1153f8a7f2224", + "revCount": 2, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/chaotic-cx/nix-empty-flake/0.1.2%2Brev-98b8e330823a3570d328720f87a1153f8a7f2224/018aba35-d228-7fa9-b205-7616c89ef4e0/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz" + } + }, + "crane": { + "inputs": { + "nixpkgs": [ + "omnix", + "rust-flake", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1718474113, + "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=", + "owner": "ipetkov", + "repo": "crane", + "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "devour-flake": { + "flake": false, + "locked": { + "lastModified": 1709858306, + "narHash": "sha256-Vey9n9hIlWiSAZ6CCTpkrL6jt4r2JvT2ik9wa2bjeC0=", + "owner": "srid", + "repo": "devour-flake", + "rev": "17b711b9deadbbc5629cb7d2b64cf86ae72af3fa", + "type": "github" + }, + "original": { + "owner": "srid", + "repo": "devour-flake", + "type": "github" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1725517947, + "narHash": "sha256-sB8B3M6CS0Y0rnncsCPz0htg6LoC1RbI2Mq9K88tSOk=", + "owner": "nix-community", + "repo": "fenix", + "rev": "96072c2af73da16c7db013dbb8c8869000157235", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "locked": { "lastModified": 1696426674, @@ -51,6 +181,22 @@ "flake-compat_2": { "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_3": { + "flake": false, + "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", @@ -82,9 +228,59 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "omnix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1725234343, + "narHash": "sha256-+ebgonl3NbiKD2UD0x4BszCZQ6sTfL4xioaM49o5B3Y=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "567b938d64d4b4112ee253b9274472dc3a346eb6", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-schemas": { + "locked": { + "lastModified": 1693491534, + "narHash": "sha256-ifw8Td8kD08J8DxFbYjeIx5naHcDLz7s2IFP3X42I/U=", + "rev": "c702cbb663d6d70bbb716584a2ee3aeb35017279", + "revCount": 21, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.1/018a4c59-80e1-708a-bb4d-854930c20f72/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.1.tar.gz" + } + }, + "flake-schemas_2": { + "locked": { + "lastModified": 1719857163, + "narHash": "sha256-wM+8JtoKBkahHiKn+EM1ikurMnitwRQrZ91hipJIJK8=", + "owner": "DeterminateSystems", + "repo": "flake-schemas", + "rev": "61a02d7183d4241962025e6c6307a22a0bb72a21", + "type": "github" + }, + "original": { + "owner": "DeterminateSystems", + "repo": "flake-schemas", + "type": "github" + } + }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -101,8 +297,23 @@ } }, "flake-utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_5" }, "locked": { "lastModified": 1685518550, @@ -142,6 +353,27 @@ "home-manager": { "inputs": { "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1725180166, + "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ "nixpkgs" ] }, @@ -198,7 +430,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems", + "systems": "systems_2", "xdph": "xdph" }, "locked": { @@ -353,6 +585,73 @@ "type": "github" } }, + "jovian": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1725153537, + "narHash": "sha256-8+BJdXM1WBAttY+C63pEMUmUtSEWXHEhXOkLK4k1s2E=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "b13488a1f8ab01db6a3d18629f7b22a430f03984", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, + "nix": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-parts": [ + "omnix", + "flake-parts" + ], + "flake-schemas": "flake-schemas_2", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_3", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1722511816, + "narHash": "sha256-jSrAhqM3qTKUmVvM0PQXoxKv2SQzWNRGvcW11DyOemE=", + "owner": "shivaraj-bh", + "repo": "nix", + "rev": "af109049cf392a6b4ede343a4756692eee9b4fd6", + "type": "github" + }, + "original": { + "owner": "shivaraj-bh", + "ref": "flake-schemas", + "repo": "nix", + "type": "github" + } + }, "nix-alien": { "inputs": { "flake-compat": "flake-compat", @@ -414,6 +713,29 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "chaotic", + "jovian", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1690328911, + "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -477,20 +799,36 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724932487, - "narHash": "sha256-zzbqHmY1mt21omyk1+14QbAkII1B7OHlwKLcczVq22w=", - "owner": "nixos", + "lastModified": 1725432240, + "narHash": "sha256-+yj+xgsfZaErbfYM3T+QvEE2hU7UuE+Jf0fJCJ8uPS0=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "b4f7fb71438d00539b21f1b1e6968c0eac060127", + "rev": "ad416d066ca1222956472ab7d0555a6946746a80", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1722555339, @@ -503,6 +841,22 @@ "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" } }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1720386169, @@ -519,6 +873,38 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1724932487, + "narHash": "sha256-zzbqHmY1mt21omyk1+14QbAkII1B7OHlwKLcczVq22w=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b4f7fb71438d00539b21f1b1e6968c0eac060127", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1717432640, + "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nur": { "locked": { "lastModified": 1725599613, @@ -534,6 +920,35 @@ "type": "github" } }, + "omnix": { + "inputs": { + "cachix-push": "cachix-push", + "cargo-doc-live": "cargo-doc-live", + "devour-flake": "devour-flake", + "flake-parts": "flake-parts_2", + "nix": "nix", + "nixpkgs": [ + "nixpkgs" + ], + "process-compose-flake": "process-compose-flake", + "rust-flake": "rust-flake", + "systems": "systems_4", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1725590656, + "narHash": "sha256-G6D96mILdxAGG7SVItC7xIKF1y8gijGkNMCGW/3N0MU=", + "owner": "juspay", + "repo": "omnix", + "rev": "c566f7a4566473fdedca6bb8d32178820be0502f", + "type": "github" + }, + "original": { + "owner": "juspay", + "repo": "omnix", + "type": "github" + } + }, "pia": { "inputs": { "nixpkgs": [ @@ -557,7 +972,43 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": [ + "omnix", + "nix" + ], + "flake-utils": "flake-utils_2", + "gitignore": [ + "omnix", + "nix" + ], + "nixpkgs": [ + "omnix", + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "omnix", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_2": { + "inputs": { + "flake-compat": "flake-compat_3", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" @@ -578,26 +1029,100 @@ "type": "github" } }, + "process-compose-flake": { + "locked": { + "lastModified": 1718031437, + "narHash": "sha256-+RrlkAVZx0QhyeHAGFJnjST+/7Dc3zsDU3zAKXoDXaI=", + "owner": "Platonic-Systems", + "repo": "process-compose-flake", + "rev": "9344fac44edced4c686721686a6ad904d067c546", + "type": "github" + }, + "original": { + "owner": "Platonic-Systems", + "repo": "process-compose-flake", + "type": "github" + } + }, "root": { "inputs": { - "home-manager": "home-manager", + "chaotic": "chaotic", + "home-manager": "home-manager_2", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "nix-alien": "nix-alien", "nix-gaming": "nix-gaming", "nix-index-database": "nix-index-database_2", "nix-thorium": "nix-thorium", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nur": "nur", + "omnix": "omnix", "pia": "pia", - "pre-commit-hooks": "pre-commit-hooks", + "pre-commit-hooks": "pre-commit-hooks_2", "spicetify-nix": "spicetify-nix", - "systems": "systems_4" + "systems": "systems_6" + } + }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1725444219, + "narHash": "sha256-VjItfg2kZJ2to3bnNlkWAClKQLssIi86QcE1/vcRvv0=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "50882fbfa204027c84753e6d51a1a12884dc1b19", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-flake": { + "inputs": { + "crane": "crane", + "nixpkgs": [ + "omnix", + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1725522236, + "narHash": "sha256-dP8ie2arXvvNzn5uqHGf3r0x5pfHm4d5rIg3j1fpwcA=", + "owner": "juspay", + "repo": "rust-flake", + "rev": "ea2bdf67ec3924adb0361630365c34ba8bc11ad9", + "type": "github" + }, + "original": { + "owner": "juspay", + "ref": "granular-autoWire", + "repo": "rust-flake", + "type": "github" + } + }, + "rust-overlay": { + "flake": false, + "locked": { + "lastModified": 1725243956, + "narHash": "sha256-0A5ZP8uDCyBdYUzayZfy6JFdTefP79oZVAjyqA/yuSI=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a10c8092d5f82622be79ed4dd12289f72011f850", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -633,6 +1158,21 @@ }, "systems_2": { "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_3": { + "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", @@ -646,7 +1186,7 @@ "type": "github" } }, - "systems_3": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -661,7 +1201,7 @@ "type": "github" } }, - "systems_4": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -676,6 +1216,42 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "omnix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1724338379, + "narHash": "sha256-kKJtaiU5Ou+e/0Qs7SICXF22DLx4V/WhG1P6+k4yeOE=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "070f834771efa715f3e74cd8ab93ecc96fabc951", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "umu": { "inputs": { "nixpkgs": [ @@ -730,6 +1306,31 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } + }, + "yafas": { + "inputs": { + "flake-schemas": [ + "chaotic", + "flake-schemas" + ], + "systems": [ + "chaotic", + "systems" + ] + }, + "locked": { + "lastModified": 1695926485, + "narHash": "sha256-wNFFnItckgSs8XeYhhv8vlJs2WF09fSQaWgw4xkDqHQ=", + "owner": "UbiqueLambda", + "repo": "yafas", + "rev": "7772afd6686458ca0ddbc599a52cf5d337367653", + "type": "github" + }, + "original": { + "owner": "UbiqueLambda", + "repo": "yafas", + "type": "github" + } } }, "root": "root", @@ -3,6 +3,12 @@ nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nur.url = "github:nix-community/NUR"; systems.url = "github:nix-systems/default"; + chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + + omnix = { + url = "github:juspay/omnix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; spicetify-nix = { url = "github:the-argus/spicetify-nix"; @@ -72,6 +78,7 @@ pia, nur, pre-commit-hooks, + chaotic, ... }@inputs: let @@ -123,13 +130,17 @@ pia.nixosModule nix-index-database.nixosModules.nix-index nur.nixosModules.nur + chaotic.nixosModules.default ./hosts/kansai ]; }; homeConfigurations.ebisu = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgsFor."${system}"; - modules = [ ./home/ebisu ]; + modules = [ + ./home/ebisu + chaotic.homeManagerModules.default + ]; extraSpecialArgs = { inherit diff --git a/home/ebisu/default.nix b/home/ebisu/default.nix index d20e71c..6e7a2d8 100644 --- a/home/ebisu/default.nix +++ b/home/ebisu/default.nix @@ -1,10 +1,16 @@ -{ config, inputs, ... }: +{ + pkgs, + config, + inputs, + ... +}: let username = "ebisu"; in { imports = [ ./fortune ]; programs.home-manager.enable = true; + nix.package = pkgs.nix; home = { inherit username; diff --git a/home/ebisu/fortune/default.nix b/home/ebisu/fortune/default.nix index e12e633..31754b1 100644 --- a/home/ebisu/fortune/default.nix +++ b/home/ebisu/fortune/default.nix @@ -9,6 +9,7 @@ ./filesystem ./multimedia ./network + ./nix ./rice ./scripts ./system diff --git a/home/ebisu/fortune/development/default.nix b/home/ebisu/fortune/development/default.nix index 1fdf89f..3e1e809 100644 --- a/home/ebisu/fortune/development/default.nix +++ b/home/ebisu/fortune/development/default.nix @@ -1,7 +1,6 @@ { imports = [ ./languages - ./nix ./tools ./database.nix ./infrastructure.nix diff --git a/home/ebisu/fortune/development/nix/default.nix b/home/ebisu/fortune/development/nix/default.nix deleted file mode 100644 index 284b28b..0000000 --- a/home/ebisu/fortune/development/nix/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ pkgs, inputs, ... }: -{ - imports = [ ./direnv.nix ]; - services.lorri.enable = true; - - home.packages = with pkgs; [ - nil - statix - alejandra - nurl - nix-init - nix-prefetch-git - nixfmt-rfc-style - nix-tree - nix-visualize - deadnix - update-nix-fetchgit - nix-prefetch-scripts - nix-output-monitor - cachix - inputs.nix-alien.packages.${pkgs.stdenv.hostPlatform.system}.nix-alien - devenv - manix - niv - nix-diff - nix-fast-build - nix-melt - ]; -} diff --git a/home/ebisu/fortune/multimedia/video/default.nix b/home/ebisu/fortune/multimedia/video/default.nix index 0746cb6..db04395 100644 --- a/home/ebisu/fortune/multimedia/video/default.nix +++ b/home/ebisu/fortune/multimedia/video/default.nix @@ -5,7 +5,7 @@ home.packages = with pkgs; [ mplayer mpv - yt-dlp + yt-dlp_git ytfzf clapper streamlink-twitch-gui-bin diff --git a/home/ebisu/fortune/nix/default.nix b/home/ebisu/fortune/nix/default.nix new file mode 100644 index 0000000..3e4c7b7 --- /dev/null +++ b/home/ebisu/fortune/nix/default.nix @@ -0,0 +1,27 @@ +{ pkgs, inputs, ... }: +{ + imports = [ + ./development + ./direnv.nix + ]; + + home.packages = + with pkgs; + with inputs; + [ + nix-tree + nix-visualize + nix-output-monitor + cachix + nix-alien.packages.${pkgs.system}.nix-alien + manix + nix-diff + nix-fast-build + nix-melt + nixos-shell + nix-du + nvd + cached-nix-shell + omnix.packages.${pkgs.system}.default + ]; +} diff --git a/home/ebisu/fortune/nix/development/default.nix b/home/ebisu/fortune/nix/development/default.nix new file mode 100644 index 0000000..7c92172 --- /dev/null +++ b/home/ebisu/fortune/nix/development/default.nix @@ -0,0 +1,9 @@ +{ + imports = [ + ./formatting.nix + ./lsp.nix + ./tools.nix + ]; + + services.lorri.enable = true; +} diff --git a/home/ebisu/fortune/nix/development/formatting.nix b/home/ebisu/fortune/nix/development/formatting.nix new file mode 100644 index 0000000..f543d06 --- /dev/null +++ b/home/ebisu/fortune/nix/development/formatting.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + alejandra + nixfmt-rfc-style + ]; +} diff --git a/home/ebisu/fortune/nix/development/lsp.nix b/home/ebisu/fortune/nix/development/lsp.nix new file mode 100644 index 0000000..7f7e8fc --- /dev/null +++ b/home/ebisu/fortune/nix/development/lsp.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + nil + nixd + ]; +} diff --git a/home/ebisu/fortune/nix/development/tools.nix b/home/ebisu/fortune/nix/development/tools.nix new file mode 100644 index 0000000..16b5d6b --- /dev/null +++ b/home/ebisu/fortune/nix/development/tools.nix @@ -0,0 +1,18 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + statix + nurl + nix-init + nix-prefetch-git + deadnix + update-nix-fetchgit + nix-prefetch-scripts + devenv + niv + nixpkgs-hammering + devbox + compose2nix + nix-update + ]; +} diff --git a/home/ebisu/fortune/development/nix/direnv.nix b/home/ebisu/fortune/nix/direnv.nix index 9f73981..9f73981 100644 --- a/home/ebisu/fortune/development/nix/direnv.nix +++ b/home/ebisu/fortune/nix/direnv.nix diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 6036627..e6a5b08 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -49,6 +49,7 @@ "https://nixpkgs-wayland.cachix.org" "https://cuda-maintainers.cachix.org" "https://nixpkgs-unfree.cachix.org" + "https://cache.flox.dev" ]; trusted-public-keys = [ @@ -58,6 +59,7 @@ "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=" "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" + "flox-cache-public-1:7F4OyH7ZCnFhcze3fJdfyXYLQw/aV7GEed86nQ7IsOs=" ]; experimental-features = [ diff --git a/modules/virtualisation/default.nix b/modules/virtualisation/default.nix index e61cf6f..97aa4b9 100644 --- a/modules/virtualisation/default.nix +++ b/modules/virtualisation/default.nix @@ -5,6 +5,8 @@ ./qemu.nix ]; + programs.extra-container.enable = true; + virtualisation = { kvmgt.enable = true; spiceUSBRedirection.enable = true; |