mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-12-26 21:50:44 -06:00
Compare commits
No commits in common. "c51da5dacffd1dd2711a59445a6a894a34c5ace9" and "097dc5677f7eef5a87779184905fd7fed2e478f6" have entirely different histories.
c51da5dacf
...
097dc5677f
5 changed files with 72 additions and 62 deletions
2
.github/workflows/checks.yml
vendored
2
.github/workflows/checks.yml
vendored
|
|
@ -38,4 +38,4 @@ jobs:
|
|||
|
||||
- name: Build
|
||||
run: |
|
||||
cachix watch-exec daylin -- nix build --accept-flake-config '.#checks.x86_64-linux.makePackages'
|
||||
cachix watch-exec daylin -- nix build --accept-flake-config '.#checks.x86_64-linux.packageCheck'
|
||||
|
|
|
|||
32
flake.lock
32
flake.lock
|
|
@ -305,11 +305,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1718633685,
|
||||
"narHash": "sha256-dAuZ6mIIVQraN1PnCe12Qwdcs/Nvfe/zfSy45ED5aso=",
|
||||
"lastModified": 1718566457,
|
||||
"narHash": "sha256-FtgnoGecYVBnGelxdcgavpogPVn+zi/5p4JFJM+9VJk=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "a9c7a0830fd9a8b9fc4065f1cd654efd1326691a",
|
||||
"revCount": 4856,
|
||||
"rev": "b15be9c77de593581007de53b2bbca97d121900a",
|
||||
"revCount": 4851,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
|
@ -682,11 +682,11 @@
|
|||
"nixpkgs": "nixpkgs_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1718630464,
|
||||
"narHash": "sha256-GXuN6MmzNomxT9VOEFu4iwP1kRTJ7F3/HdOzeDGPE1c=",
|
||||
"lastModified": 1718541015,
|
||||
"narHash": "sha256-Hh5FRnI0WgDmSgs0Xky2VKtSDibcWOOEA1T79/tIer0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "4a3b27cc9526208686896d0ef01c7bb67a47b91f",
|
||||
"rev": "937cdd5ba09099b20d665cba048959f505fd0880",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -761,11 +761,11 @@
|
|||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1718428119,
|
||||
"narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=",
|
||||
"lastModified": 1718276985,
|
||||
"narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5",
|
||||
"rev": "3f84a279f1a6290ce154c5531378acc827836fbb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -930,11 +930,11 @@
|
|||
},
|
||||
"stable": {
|
||||
"locked": {
|
||||
"lastModified": 1718447546,
|
||||
"narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=",
|
||||
"lastModified": 1718229064,
|
||||
"narHash": "sha256-ZFav8A9zPNfjZg/wrxh1uZeMJHELRfRgFP+meq01XYk=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "842253bf992c3a7157b67600c2857193f126563a",
|
||||
"rev": "5c2ec3a5c2ee9909904f860dadc19bc12cd9cc44",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1169,11 +1169,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1718624172,
|
||||
"narHash": "sha256-ZWrhjpNX6WSdjnSV8/JTaSLLqY4VqRp9ql16DldcGYk=",
|
||||
"lastModified": 1718500719,
|
||||
"narHash": "sha256-lPaOrzQe8xVMha9IEQSVkPYVZmrZIl7pvTymERM3sAQ=",
|
||||
"owner": "Cloudef",
|
||||
"repo": "zig2nix",
|
||||
"rev": "26b1364329ffb4c910da43c53f6be27b140723de",
|
||||
"rev": "59549938d6f2651b4d5cb1582a6589f60c147bff",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -1,15 +1,6 @@
|
|||
{ inputs, system }:
|
||||
let
|
||||
pkgs = import inputs.nixpkgs {
|
||||
inherit system;
|
||||
overlays = [
|
||||
inputs.lix-module.overlays.default
|
||||
inputs.hyprland-contrib.overlays.default
|
||||
inputs.nixpkgs-wayland.overlay
|
||||
];
|
||||
};
|
||||
in
|
||||
{ inputs, pkgs }:
|
||||
{
|
||||
|
||||
makePackages =
|
||||
pkgs.runCommandLocal "build-third-party"
|
||||
{
|
||||
|
|
@ -17,13 +8,12 @@ in
|
|||
nativeBuildInputs = [
|
||||
pkgs.pixi
|
||||
pkgs.swww
|
||||
pkgs.xdg-desktop-portal-hyprland
|
||||
pkgs.nixVersions.stable
|
||||
|
||||
inputs.tsm.packages.${pkgs.system}.default
|
||||
inputs.hyprman.packages.${pkgs.system}.default
|
||||
|
||||
inputs.roc.packages.${pkgs.system}.full # cli + lang_server
|
||||
inputs.roc.packages.${pkgs.system}.full
|
||||
inputs.roc.packages.${pkgs.system}.lang-server
|
||||
|
||||
inputs.zls.outputs.packages.${pkgs.system}.default
|
||||
inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin
|
||||
|
|
|
|||
|
|
@ -22,8 +22,10 @@ let
|
|||
inherit (import ./find-modules.nix { inherit lib; }) findModulesList;
|
||||
#supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
|
||||
supportedSystems = [ "x86_64-linux" ];
|
||||
|
||||
in
|
||||
rec {
|
||||
forAllSystems = f: genAttrs supportedSystems (system: f (import nixpkgs { inherit system; }));
|
||||
oizysModules = listToAttrs (findModulesList ../modules);
|
||||
|
||||
mkSystem =
|
||||
hostName:
|
||||
|
|
@ -34,6 +36,7 @@ let
|
|||
../overlays
|
||||
inputs.lix-module.nixosModules.default
|
||||
] ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostName}"));
|
||||
|
||||
specialArgs = {
|
||||
inherit
|
||||
inputs
|
||||
|
|
@ -47,19 +50,15 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
in
|
||||
{
|
||||
oizysFlake = {
|
||||
nixosModules = listToAttrs (findModulesList ../modules);
|
||||
nixosConfigurations = mapAttrs (name: _: mkSystem name) (readDir ../hosts);
|
||||
packages = forAllSystems (pkgs: rec {
|
||||
oizysHosts = mapAttrs (name: _: mkSystem name) (readDir ../hosts);
|
||||
oizysPkg = forAllSystems (pkgs: rec {
|
||||
oizys-zig = pkgs.callPackage ../pkgs/oizys/oizys-zig { inherit zig2nix; };
|
||||
oizys-nim = pkgs.callPackage ../pkgs/oizys/oizys-nim { };
|
||||
oizys-rs = pkgs.callPackage ../pkgs/oizys/oizys-rs { };
|
||||
oizys-go = pkgs.callPackage ../pkgs/oizys/oizys-go { };
|
||||
default = oizys-go;
|
||||
});
|
||||
devShells = forAllSystems (pkgs: {
|
||||
oizysShells = forAllSystems (pkgs: {
|
||||
default = pkgs.mkShell {
|
||||
packages = with pkgs; [
|
||||
git
|
||||
|
|
@ -67,15 +66,35 @@ in
|
|||
];
|
||||
};
|
||||
});
|
||||
checks = forAllSystems (
|
||||
pkgs:
|
||||
import ./checks.nix {
|
||||
inherit inputs;
|
||||
system = pkgs.system;
|
||||
}
|
||||
);
|
||||
formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
|
||||
|
||||
oizysChecks = forAllSystems (pkgs: import ./checks.nix { inherit pkgs inputs; });
|
||||
oizysFormatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
|
||||
oizysFlake = {
|
||||
nixosModules = oizysModules;
|
||||
nixosConfigurations = oizysHosts;
|
||||
packages = oizysPkg;
|
||||
devShells = oizysShells;
|
||||
formatter = oizysFormatter;
|
||||
checks = oizysChecks;
|
||||
# checks = forAllSystems (pkgs: {
|
||||
# packageCheck = mkPackageCheck {
|
||||
# inherit pkgs;
|
||||
# # make sure lix is in this?
|
||||
# packages = [
|
||||
# pkgs.pixi
|
||||
# pkgs.swww
|
||||
#
|
||||
# inputs.tsm.packages.${pkgs.system}.default
|
||||
# inputs.hyprman.packages.${pkgs.system}.default
|
||||
#
|
||||
# inputs.roc.packages.${pkgs.system}.full
|
||||
# inputs.roc.packages.${pkgs.system}.lang-server
|
||||
#
|
||||
# inputs.zls.outputs.packages.${pkgs.system}.default
|
||||
# inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin
|
||||
# ];
|
||||
#
|
||||
# };
|
||||
# });
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,8 @@ in
|
|||
{
|
||||
config = mkIfIn "roc" cfg {
|
||||
environment.systemPackages = with rocPkgs; [
|
||||
full # cli + lang_server
|
||||
full
|
||||
lang-server
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue