daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-09-20 07:07:17 -05:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:c51da5dacffd1dd2711a59445a6a894a34c5ace9
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master
..
compare: daylin:097dc5677f7eef5a87779184905fd7fed2e478f6
Branches Tags
daylin:flake-lock
daylin:main
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master

No commits in common. "c51da5dacffd1dd2711a59445a6a894a34c5ace9" and "097dc5677f7eef5a87779184905fd7fed2e478f6" have entirely different histories.
c51da5dacf ... 097dc5677f

5 changed files with 72 additions and 62 deletions
Show stats Expand all files Collapse all files

2
.github/workflows/checks.yml vendored
View file

@ -38,4 +38,4 @@ jobs:
- name: Build - name: Build
run: | 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
View file

@ -305,11 +305,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1718633685, "lastModified": 1718566457,
"narHash": "sha256-dAuZ6mIIVQraN1PnCe12Qwdcs/Nvfe/zfSy45ED5aso=", "narHash": "sha256-FtgnoGecYVBnGelxdcgavpogPVn+zi/5p4JFJM+9VJk=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "a9c7a0830fd9a8b9fc4065f1cd654efd1326691a", "rev": "b15be9c77de593581007de53b2bbca97d121900a",
"revCount": 4856, "revCount": 4851,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -682,11 +682,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1718630464, "lastModified": 1718541015,
"narHash": "sha256-GXuN6MmzNomxT9VOEFu4iwP1kRTJ7F3/HdOzeDGPE1c=", "narHash": "sha256-Hh5FRnI0WgDmSgs0Xky2VKtSDibcWOOEA1T79/tIer0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "4a3b27cc9526208686896d0ef01c7bb67a47b91f", "rev": "937cdd5ba09099b20d665cba048959f505fd0880",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -761,11 +761,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1718428119, "lastModified": 1718276985,
"narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", "narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5", "rev": "3f84a279f1a6290ce154c5531378acc827836fbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -930,11 +930,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1718447546, "lastModified": 1718229064,
"narHash": "sha256-JHuXsrC9pr4kA4n7LuuPfWFJUVlDBVJ1TXDVpHEuUgM=", "narHash": "sha256-ZFav8A9zPNfjZg/wrxh1uZeMJHELRfRgFP+meq01XYk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "842253bf992c3a7157b67600c2857193f126563a", "rev": "5c2ec3a5c2ee9909904f860dadc19bc12cd9cc44",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1169,11 +1169,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718624172, "lastModified": 1718500719,
"narHash": "sha256-ZWrhjpNX6WSdjnSV8/JTaSLLqY4VqRp9ql16DldcGYk=", "narHash": "sha256-lPaOrzQe8xVMha9IEQSVkPYVZmrZIl7pvTymERM3sAQ=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "26b1364329ffb4c910da43c53f6be27b140723de", "rev": "59549938d6f2651b4d5cb1582a6589f60c147bff",
"type": "github" "type": "github"
}, },
"original": { "original": {

18
lib/checks.nix
View file

@ -1,15 +1,6 @@
{ inputs, system }: { inputs, pkgs }:
let
pkgs = import inputs.nixpkgs {
inherit system;
overlays = [
inputs.lix-module.overlays.default
inputs.hyprland-contrib.overlays.default
inputs.nixpkgs-wayland.overlay
];
};
in
{ {
makePackages = makePackages =
pkgs.runCommandLocal "build-third-party" pkgs.runCommandLocal "build-third-party"
{ {
@ -17,13 +8,12 @@ in
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.pixi pkgs.pixi
pkgs.swww pkgs.swww
pkgs.xdg-desktop-portal-hyprland
pkgs.nixVersions.stable
inputs.tsm.packages.${pkgs.system}.default inputs.tsm.packages.${pkgs.system}.default
inputs.hyprman.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.zls.outputs.packages.${pkgs.system}.default
inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin

79
lib/default.nix
View file

@ -22,8 +22,10 @@ let
inherit (import ./find-modules.nix { inherit lib; }) findModulesList; inherit (import ./find-modules.nix { inherit lib; }) findModulesList;
#supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; #supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"];
supportedSystems = [ "x86_64-linux" ]; supportedSystems = [ "x86_64-linux" ];
in
rec {
forAllSystems = f: genAttrs supportedSystems (system: f (import nixpkgs { inherit system; })); forAllSystems = f: genAttrs supportedSystems (system: f (import nixpkgs { inherit system; }));
oizysModules = listToAttrs (findModulesList ../modules);
mkSystem = mkSystem =
hostName: hostName:
@ -34,6 +36,7 @@ let
../overlays ../overlays
inputs.lix-module.nixosModules.default inputs.lix-module.nixosModules.default
] ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostName}")); ] ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostName}"));
specialArgs = { specialArgs = {
inherit inherit
inputs inputs
@ -47,35 +50,51 @@ let
}; };
}; };
in 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;
});
oizysShells = forAllSystems (pkgs: {
default = pkgs.mkShell {
packages = with pkgs; [
git
deadnix
];
};
});
oizysChecks = forAllSystems (pkgs: import ./checks.nix { inherit pkgs inputs; });
oizysFormatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
oizysFlake = { oizysFlake = {
nixosModules = listToAttrs (findModulesList ../modules); nixosModules = oizysModules;
nixosConfigurations = mapAttrs (name: _: mkSystem name) (readDir ../hosts); nixosConfigurations = oizysHosts;
packages = forAllSystems (pkgs: rec { packages = oizysPkg;
oizys-zig = pkgs.callPackage ../pkgs/oizys/oizys-zig { inherit zig2nix; }; devShells = oizysShells;
oizys-nim = pkgs.callPackage ../pkgs/oizys/oizys-nim { }; formatter = oizysFormatter;
oizys-rs = pkgs.callPackage ../pkgs/oizys/oizys-rs { }; checks = oizysChecks;
oizys-go = pkgs.callPackage ../pkgs/oizys/oizys-go { }; # checks = forAllSystems (pkgs: {
default = oizys-go; # packageCheck = mkPackageCheck {
}); # inherit pkgs;
devShells = forAllSystems (pkgs: { # # make sure lix is in this?
default = pkgs.mkShell { # packages = [
packages = with pkgs; [ # pkgs.pixi
git # pkgs.swww
deadnix #
]; # inputs.tsm.packages.${pkgs.system}.default
}; # inputs.hyprman.packages.${pkgs.system}.default
}); #
checks = forAllSystems ( # inputs.roc.packages.${pkgs.system}.full
pkgs: # inputs.roc.packages.${pkgs.system}.lang-server
import ./checks.nix { #
inherit inputs; # inputs.zls.outputs.packages.${pkgs.system}.default
system = pkgs.system; # inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin
} # ];
); #
formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style); # };
# });
}; };
} }

3
modules/languages/roc.nix
View file

@ -13,7 +13,8 @@ in
{ {
config = mkIfIn "roc" cfg { config = mkIfIn "roc" cfg {
environment.systemPackages = with rocPkgs; [ environment.systemPackages = with rocPkgs; [
full # cli + lang_server full
lang-server
]; ];
}; };
} }