daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-25 08:30:45 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:097dc5677f7eef5a87779184905fd7fed2e478f6
Branches Tags
daylin:main
daylin:flake-lock
...
compare: daylin:c51da5dacffd1dd2711a59445a6a894a34c5ace9
Branches Tags
daylin:flake-lock
daylin:main

5 commits
097dc5677f ... c51da5dacf

Author SHA1 Message Date
Daylin Morgan
c51da5dacf
make checks build needed software 2024-06-17 10:06:58 -05:00
Daylin Morgan
c825262a72
flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=b15be9c77de593581007de53b2bbca97d121900a' (2024-06-16)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=a9c7a0830fd9a8b9fc4065f1cd654efd1326691a' (2024-06-17)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/3f84a279f1a6290ce154c5531378acc827836fbb' (2024-06-13)
  → 'github:nixos/nixpkgs/e6cea36f83499eb4e9cd184c8a8e823296b50ad5' (2024-06-15)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/937cdd5ba09099b20d665cba048959f505fd0880' (2024-06-16)
  → 'github:nix-community/nixpkgs-wayland/4a3b27cc9526208686896d0ef01c7bb67a47b91f' (2024-06-17)
• Updated input 'stable':
    'github:nixos/nixpkgs/5c2ec3a5c2ee9909904f860dadc19bc12cd9cc44' (2024-06-12)
  → 'github:nixos/nixpkgs/842253bf992c3a7157b67600c2857193f126563a' (2024-06-15)
• Updated input 'zig2nix':
    'github:Cloudef/zig2nix/59549938d6f2651b4d5cb1582a6589f60c147bff' (2024-06-16)
  → 'github:Cloudef/zig2nix/26b1364329ffb4c910da43c53f6be27b140723de' (2024-06-17)
 2024-06-17 09:50:42 -05:00
Daylin Morgan
63f744752c
update checks attr 2024-06-17 09:50:12 -05:00
Daylin Morgan
9b9c710f4b
only need roc-full 2024-06-17 09:49:31 -05:00
Daylin Morgan
97084f9c08
refactor oizysFlake 2024-06-17 09:48:54 -05:00
5 changed files with 62 additions and 72 deletions
Show stats Expand all files Collapse all files

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

@ -38,4 +38,4 @@ jobs:
- name: Build
run: |
cachix watch-exec daylin -- nix build --accept-flake-config '.#checks.x86_64-linux.packageCheck'
cachix watch-exec daylin -- nix build --accept-flake-config '.#checks.x86_64-linux.makePackages'

32
flake.lock
View file

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

18
lib/checks.nix
View file

@ -1,6 +1,15 @@
{ inputs, pkgs }:
{ 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
{
makePackages =
pkgs.runCommandLocal "build-third-party"
{
@ -8,12 +17,13 @@
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
inputs.roc.packages.${pkgs.system}.lang-server
inputs.roc.packages.${pkgs.system}.full # cli + lang_server
inputs.zls.outputs.packages.${pkgs.system}.default
inputs.zig2nix.outputs.packages.${pkgs.system}.zig.master.bin

79
lib/default.nix
View file

@ -22,10 +22,8 @@ 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:
@ -36,7 +34,6 @@ rec {
../overlays
inputs.lix-module.nixosModules.default
] ++ filter isNixFile (listFilesRecursive (../. + "/hosts/${hostName}"));
specialArgs = {
inherit
inputs
@ -50,51 +47,35 @@ 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;
});
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);
in
{
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
# ];
#
# };
# });
nixosModules = listToAttrs (findModulesList ../modules);
nixosConfigurations = mapAttrs (name: _: mkSystem name) (readDir ../hosts);
packages = 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: {
default = pkgs.mkShell {
packages = with pkgs; [
git
deadnix
];
};
});
checks = forAllSystems (
pkgs:
import ./checks.nix {
inherit inputs;
system = pkgs.system;
}
);
formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
};
}

3
modules/languages/roc.nix
View file

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