daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2025-02-05 13:14:17 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:fc6e5deea6dc5b2f0125f9ca52811219ec626d08
Branches Tags
daylin:main
daylin:flake-lock
daylin:lix-beta
daylin:lix-beta-with-nix
..
compare: daylin:b51da08f2bc772d7c97bd7707a3218b2767bf1fe
Branches Tags
daylin:flake-lock
daylin:main
daylin:lix-beta
daylin:lix-beta-with-nix

1 commit
fc6e5deea6 ... b51da08f2b

Author SHA1 Message Date
Daylin Morgan
b51da08f2b
test old nixpkgs 2025-01-17 17:01:34 -06:00
14 changed files with 150 additions and 256 deletions
Show stats Expand all files Collapse all files

1
.github/actions/nix/action.yml vendored
View file

@ -41,3 +41,4 @@ runs:
- name: "Show Nix Info" - name: "Show Nix Info"
shell: bash shell: bash
run: nix run "nixpkgs#nix-info" -- -m run: nix run "nixpkgs#nix-info" -- -m

181
flake.lock
View file

@ -54,21 +54,6 @@
"type": "github" "type": "github"
} }
}, },
"crane": {
"locked": {
"lastModified": 1736898272,
"narHash": "sha256-D10wlrU/HCpSRcb3a7yk+bU3ggpMD1kGbseKtO+7teo=",
"owner": "ipetkov",
"repo": "crane",
"rev": "6a589f034202a7c6e10bce6c5d1d392d7bc0f340",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"f1multiviewer": { "f1multiviewer": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -89,24 +74,18 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts": { "flake-compat": {
"inputs": {
"nixpkgs-lib": [
"lix-attic",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1736143030, "lastModified": 1733328505,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "hercules-ci", "owner": "edolstra",
"repo": "flake-parts", "repo": "flake-compat",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hercules-ci", "owner": "edolstra",
"repo": "flake-parts", "repo": "flake-compat",
"type": "github" "type": "github"
} }
}, },
@ -128,6 +107,24 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": { "flakey-profile": {
"locked": { "locked": {
"lastModified": 1712898590, "lastModified": 1712898590,
@ -440,7 +437,9 @@
"flake-utils": [ "flake-utils": [
"flake-utils" "flake-utils"
], ],
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": [
"nixpkgs-lib"
]
}, },
"locked": { "locked": {
"lastModified": 1736684024, "lastModified": 1736684024,
@ -459,69 +458,38 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737234286, "lastModified": 1737086202,
"narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=", "narHash": "sha256-33tcNERQt1R7tr/W7pvQj8R6NJktyTOKMIfY16RHLK8=",
"rev": "2837da71ec1588c1187d2e554719b15904a46c8b", "rev": "0d14c2b67a407825e3427bf079b31de069d9653a",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/0d14c2b67a407825e3427bf079b31de069d9653a.tar.gz?rev=0d14c2b67a407825e3427bf079b31de069d9653a"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz" "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
}
},
"lix-attic": {
"inputs": {
"crane": "crane",
"flake-parts": "flake-parts",
"lix": [
"lix-module",
"lix"
],
"lix-module": [
"lix-module"
],
"nix-github-actions": [],
"nixpkgs": [
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1736969694,
"narHash": "sha256-4OKeL5HbDNDKl1JgRH97HCe/QQjhLGB4pjxxYr5PTFc=",
"ref": "refs/heads/main",
"rev": "d413a74fa132cf5f421732dc7dd5cadda96fb874",
"revCount": 361,
"type": "git",
"url": "https://git.lix.systems/nrabulinski/attic.git"
},
"original": {
"type": "git",
"url": "https://git.lix.systems/nrabulinski/attic.git"
} }
}, },
"lix-module": { "lix-module": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": "flake-utils_2",
"flake-utils"
],
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"lix": "lix", "lix": [
"lix"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1737237494, "lastModified": 1733522213,
"narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", "narHash": "sha256-H+Pk19MzvI/TAbXWimUPZAoKkD56OSyxJBm8lVIA5n0=",
"rev": "b90bf629bbd835e61f1317b99e12f8c831017006", "rev": "c374ebf5548c7b6d4bf884369a5b6879cfc916ea",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/c374ebf5548c7b6d4bf884369a5b6879cfc916ea.tar.gz?rev=c374ebf5548c7b6d4bf884369a5b6879cfc916ea"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz" "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
} }
}, },
"my-nixpkgs": { "my-nixpkgs": {
@ -582,7 +550,9 @@
}, },
"nixos-wsl": { "nixos-wsl": {
"inputs": { "inputs": {
"flake-compat": [], "flake-compat": [
"flake-compat"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -603,36 +573,21 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736883708, "lastModified": 1736012469,
"narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": {
"lastModified": 1737248590,
"narHash": "sha256-6SWtDeYJS3bS7QyJrGKyd6FpROEN0JCMgakSX8yPbyA=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "977f49fd8cf854416f82987696784717acd6e817",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-lib_2": {
"locked": { "locked": {
"lastModified": 1736643958, "lastModified": 1736643958,
"narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
@ -647,22 +602,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1735563628,
"narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-wayland": { "nixpkgs-wayland": {
"inputs": { "inputs": {
"flake-compat": [], "flake-compat": [],
@ -712,20 +651,21 @@
"inputs": { "inputs": {
"NixVirt": "NixVirt", "NixVirt": "NixVirt",
"f1multiviewer": "f1multiviewer", "f1multiviewer": "f1multiviewer",
"flake-compat": "flake-compat",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-contrib": "hyprland-contrib", "hyprland-contrib": "hyprland-contrib",
"hyprman": "hyprman", "hyprman": "hyprman",
"jj": "jj", "jj": "jj",
"lib-aggregate": "lib-aggregate", "lib-aggregate": "lib-aggregate",
"lix-attic": "lix-attic", "lix": "lix",
"lix-module": "lix-module", "lix-module": "lix-module",
"my-nixpkgs": "my-nixpkgs", "my-nixpkgs": "my-nixpkgs",
"nim2nix": "nim2nix", "nim2nix": "nim2nix",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-lib": "nixpkgs-lib_2", "nixpkgs-lib": "nixpkgs-lib",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"pixi": "pixi", "pixi": "pixi",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
@ -822,6 +762,21 @@
"type": "github" "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"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

86
flake.nix
View file

@ -4,26 +4,28 @@
outputs = inputs: (import ./lib inputs).oizysFlake; outputs = inputs: (import ./lib inputs).oizysFlake;
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/8f3e1f807051e32d8c95cd12b9b421623850a34d";
stable.url = "github:nixos/nixpkgs/nixos-24.05"; stable.url = "github:nixos/nixpkgs/nixos-24.05";
my-nixpkgs.url = "github:daylinmorgan/nixpkgs/nixos-unstable"; my-nixpkgs.url = "github:daylinmorgan/nixpkgs/nixos-unstable";
# lix = { lix = {
# url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
# flake = false; flake = false;
# };
# lix-module = {
# url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
# inputs.nixpkgs.follows = "nixpkgs";
# inputs.lix.follows = "lix";
# };
#
# keep for when lix breaks :/
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
}; };
lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
inputs.nixpkgs.follows = "nixpkgs";
inputs.lix.follows = "lix";
};
# lix is failing to build only on GHA?
# keep for when lix breaks :/
# lix-module = {
# url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
# inputs.nixpkgs.follows = "nixpkgs";
# inputs.flake-utils.follows = "flake-utils";
# };
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
@ -43,13 +45,15 @@
nixos-wsl = { nixos-wsl = {
url = "github:nix-community/NixOS-WSL"; url = "github:nix-community/NixOS-WSL";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-compat.follows = "flake-compat";
}; };
hyprland = { hyprland = {
url = "git+https://github.com/hyprwm/Hyprland/?submodules=1"; url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
# inputs.systems.follows = "systems";
inputs.pre-commit-hooks.follows = "";
}; };
hyprland-contrib = { hyprland-contrib = {
url = "github:hyprwm/contrib"; url = "github:hyprwm/contrib";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -57,7 +61,11 @@
nixpkgs-wayland = { nixpkgs-wayland = {
url = "github:nix-community/nixpkgs-wayland"; url = "github:nix-community/nixpkgs-wayland";
# breaks their cache...
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.lib-aggregate.follows = "lib-aggregate";
inputs.nix-eval-jobs.follows = "";
inputs.flake-compat.follows = "";
}; };
f1multiviewer = { f1multiviewer = {
@ -97,6 +105,7 @@
jj = { jj = {
url = "github:martinvonz/jj/v0.25.0"; url = "github:martinvonz/jj/v0.25.0";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
}; };
NixVirt = { NixVirt = {
@ -105,14 +114,21 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
lix-attic = { # included to reduce flake.lock size
url = "git+https://git.lix.systems/nrabulinski/attic.git"; flake-utils = {
inputs.nixpkgs.follows = "nixpkgs"; url = "github:numtide/flake-utils";
inputs.lix-module.follows = "lix-module";
# make lix-module source of truth
inputs.lix.follows = "lix-module/lix";
}; };
flake-compat = {
url = "github:edolstra/flake-compat";
};
lib-aggregate = {
url = "github:nix-community/lib-aggregate";
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs-lib.follows = "nixpkgs-lib";
};
nixpkgs-lib.url = "github:nix-community/nixpkgs.lib";
# roc = { # roc = {
# url = "github:roc-lang/roc"; # url = "github:roc-lang/roc";
# inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
@ -123,30 +139,6 @@
# zls.url = "github:zigtools/zls"; # zls.url = "github:zigtools/zls";
# zls.inputs.nixpkgs.follows = "nixpkgs"; # zls.inputs.nixpkgs.follows = "nixpkgs";
# zls.inputs.zig-overlay.follows = "zig-overlay"; # zls.inputs.zig-overlay.follows = "zig-overlay";
# further flake.lock minimization shenanigans
flake-utils.url = "github:numtide/flake-utils";
jj.inputs.flake-utils.follows = "flake-utils";
lib-aggregate.inputs.flake-utils.follows = "flake-utils";
lib-aggregate.url = "github:nix-community/lib-aggregate";
nixpkgs-wayland.inputs.lib-aggregate.follows = "lib-aggregate";
nixpkgs-lib.url = "github:nix-community/nixpkgs.lib";
# nil inputs
hyprland.inputs.pre-commit-hooks.follows = "";
nixos-wsl.inputs.flake-compat.follows = "";
nixpkgs-wayland.inputs = {
flake-compat.follows = "";
nix-eval-jobs.follows = "";
};
lix-attic.inputs = {
nix-github-actions.follows = "";
};
}; };
nixConfig = { nixConfig = {

21
hosts/algiz/caddy/Caddyfile
View file

@ -2,6 +2,14 @@ links.dayl.in {
reverse_proxy http://localhost:9090 reverse_proxy http://localhost:9090
} }
elizabeth-and-daylin.com {
reverse_proxy http://localhost:4321
}
elizabeth.dayl.in, www.elizabeth-and-daylin.com {
redir https://elizabeth-and-daylin.com{uri} permanent
}
git.dayl.in { git.dayl.in {
reverse_proxy http://localhost:3000 reverse_proxy http://localhost:3000
} }
@ -18,19 +26,6 @@ gts.dayl.in {
} }
} }
daylin.bsky.dayl.in, bsky.dayl.in {
reverse_proxy http://localhost:6555
}
elizabeth-and-daylin.com {
reverse_proxy http://localhost:4321
}
elizabeth.dayl.in, www.elizabeth-and-daylin.com {
redir https://elizabeth-and-daylin.com{uri} permanent
}
# not currently a running service on algiz # not currently a running service on algiz
# (caddy-common) { # (caddy-common) {
# encode gzip # encode gzip

1
hosts/algiz/default.nix
View file

@ -27,7 +27,6 @@
"/home/daylin/services/gotosocial/" "/home/daylin/services/gotosocial/"
"/home/daylin/services/caddy/" "/home/daylin/services/caddy/"
"/home/daylin/services/wedding-website/" "/home/daylin/services/wedding-website/"
"/home/daylin/services/bsky-pds/"
]; ];
}; };

9
hosts/algiz/services.nix
View file

@ -1,9 +1,4 @@
{ { pkgs, enabled, ... }:
pkgs,
enabled,
flake,
...
}:
let let
atticPort = "5656"; atticPort = "5656";
static = pkgs.runCommandLocal "static-files" { } '' static = pkgs.runCommandLocal "static-files" { } ''
@ -31,10 +26,8 @@ in
# https://discourse.nixos.org/t/docker-container-not-resolving-to-host/30259/6 # https://discourse.nixos.org/t/docker-container-not-resolving-to-host/30259/6
# networking.firewall.extraCommands = "iptables -A INPUT -p tcp --destination-port ${atticPort} -s 172.16.0.0/12 -j ACCEPT"; # networking.firewall.extraCommands = "iptables -A INPUT -p tcp --destination-port ${atticPort} -s 172.16.0.0/12 -j ACCEPT";
services.atticd = enabled // { services.atticd = enabled // {
package = (flake.pkgs "lix-attic").attic-server;
# Replace with absolute path to your credentials file # Replace with absolute path to your credentials file
# TODO: replace with sops-secret!
environmentFile = "/etc/atticd.env"; environmentFile = "/etc/atticd.env";
settings = { settings = {

8
hosts/othalan/default.nix
View file

@ -1,7 +1,6 @@
{ {
config,
enabled, enabled,
flake, config,
... ...
}: }:
{ {
@ -27,9 +26,4 @@
group = config.users.users.daylin.group; group = config.users.users.daylin.group;
}; };
}; };
environment.systemPackages = [
(flake.pkgs "lix-attic").attic-client
];
} }

1
hosts/othalan/settings/pkgs
View file

@ -1,6 +1,7 @@
flake:utils flake:utils
ghostty ghostty
sops sops
attic-client
distrobox distrobox
firefox firefox
zk zk

20
lib/default.nix
View file

@ -10,6 +10,7 @@ let
inherit (builtins) mapAttrs readDir listToAttrs; inherit (builtins) mapAttrs readDir listToAttrs;
inherit (lib) inherit (lib)
genAttrs genAttrs
pkgFromSystem
loadOverlays loadOverlays
listify listify
enableAttrs enableAttrs
@ -32,6 +33,15 @@ let
) )
); );
inheritFlakePkgs =
pkgs: flakes:
listToAttrs (
map (name: {
inherit name;
value = pkgFromSystem pkgs.system name;
}) flakes
);
evalTreeFmt = evalTreeFmt =
pkgs: pkgs:
(treefmt-nix.lib.evalModule pkgs ( (treefmt-nix.lib.evalModule pkgs (
@ -65,10 +75,14 @@ let
default = oizys; default = oizys;
oizys = pkgs.callPackage ../pkgs/oizys { }; oizys = pkgs.callPackage ../pkgs/oizys { };
iso = mkIso.config.system.build.isoImage; iso = mkIso.config.system.build.isoImage;
lix = pkgFromSystem pkgs.system "lix-module";
# nimlangserver = pkgs.callPackage ../pkgs/nim/nimlangserver { };
} }
// (import ../pkgs { inherit pkgs lib; }) // (inheritFlakePkgs pkgs [
"pixi"
"f1multiviewer"
"tsm"
])
// (import ../pkgs { inherit pkgs; })
); );
devShells = forAllSystems (pkgs: { devShells = forAllSystems (pkgs: {

11
lib/extended.nix
View file

@ -104,16 +104,6 @@ let
# listNixFilesRecursive = dir: filterNotDefaultNixFile (listFilesRecursive dir); # listNixFilesRecursive = dir: filterNotDefaultNixFile (listFilesRecursive dir);
listNixFilesRecursive = dir: dir |> listFilesRecursive |> filterNotDefaultNixFile; listNixFilesRecursive = dir: dir |> listFilesRecursive |> filterNotDefaultNixFile;
## convert a list of flakes to { name = packageAttr; }
flakesToPackagesAttrs =
system: flakes:
listToAttrs (
map (name: {
inherit name;
value = pkgFromSystem system name;
}) flakes
);
# defaultLinuxPackage = flake: flake.packages.x86_64-linux.default; # defaultLinuxPackage = flake: flake.packages.x86_64-linux.default;
# defaultPackageGeneric = system: flake: "${flake}.packages.${system}.default"; # defaultPackageGeneric = system: flake: "${flake}.packages.${system}.default";
pkgsFromSystem = system: flake: inputs."${flake}".packages."${system}"; pkgsFromSystem = system: flake: inputs."${flake}".packages."${system}";
@ -125,7 +115,6 @@ let
module = nixosModuleFrom; module = nixosModuleFrom;
pkgs = pkgsFromSystem system; pkgs = pkgsFromSystem system;
pkg = pkgFromSystem system; pkg = pkgFromSystem system;
toPackageAttrs = flakesToPackagesAttrs system;
}; };
loadOverlays = loadOverlays =

19
pkgs/default.nix
View file

@ -1,12 +1,4 @@
{ { pkgs, ... }:
pkgs,
lib,
...
}:
let
inherit (lib) flakeFromSystem;
flake = flakeFromSystem pkgs.system;
in
{ {
nimlangserver = pkgs.callPackage ./nim/nimlangserver { }; nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
procs = pkgs.callPackage ./nim/procs { }; procs = pkgs.callPackage ./nim/procs { };
@ -15,13 +7,4 @@ in
distrobox = pkgs.callPackage ./distrobox { }; distrobox = pkgs.callPackage ./distrobox { };
llm-with-plugins = pkgs.callPackage ./llm/llm-with-plugins { }; llm-with-plugins = pkgs.callPackage ./llm/llm-with-plugins { };
attic-client = (flake.pkgs "lix-attic").attic-client;
attic-server = (flake.pkgs "lix-attic").attic-server;
lix = (flake.pkgs "lix-module").default;
} }
// (flake.toPackageAttrs [
"pixi"
"f1multiviewer"
"tsm"
])

2
pkgs/oizys/default.nix
View file

@ -5,7 +5,7 @@
}: }:
buildNimblePackage { buildNimblePackage {
name = "oizys"; name = "oizys";
version = "unstable"; verions = "unstable";
src = lib.cleanSource ./.; src = lib.cleanSource ./.;
nativeBuildInputs = [ openssl ]; nativeBuildInputs = [ openssl ];
nimbleDepsHash = "sha256-dFJw/m7D5UFUrHH7exsyHknt8WHIK1QIQATNd5l7FZA="; nimbleDepsHash = "sha256-dFJw/m7D5UFUrHH7exsyHknt8WHIK1QIQATNd5l7FZA=";

25
pkgs/oizys/src/oizys/exec.nim
View file

@ -56,28 +56,6 @@ proc runCmdCapt*(
close p close p
proc formatStdoutStderr(stdout: string, stderr: string): string =
template addLine =
# TODO: make -> red after hwylterm update
result.add "-> "
result.add line
result.add "\n"
result.add "stdout:\n"
for line in stdout.splitLines():
addLine
# result.add bb"[red]->[/]"
# result.add "-> "
# result.add line
# result.add "\n"
result.add "stdout:\n"
for line in stderr.splitLines():
addLine
result.add "-> "
result.add line
result.add "\n"
proc runCmdCaptWithSpinner*( proc runCmdCaptWithSpinner*(
cmd: string, cmd: string,
msg: string = "", msg: string = "",
@ -89,7 +67,8 @@ proc runCmdCaptWithSpinner*(
with(Dots2, msg): with(Dots2, msg):
(output, err, code) = runCmdCapt(cmd, capture) (output, err, code) = runCmdCapt(cmd, capture)
if code != 0: if code != 0:
stderr.write(formatStdoutStderr(output,err)) stderr.writeLine("stdout\n" & output)
stderr.writeLine("stderr\n" & err)
error fmt"{cmd} had non zero exit" error fmt"{cmd} had non zero exit"
quit code quit code
return (output, err) return (output, err)

21
pkgs/oizys/src/oizys/nix.nim
View file

@ -389,17 +389,16 @@ proc nixBuildWithCache*(name: string, rest:seq[string], service: string, jobs: i
if isCi(): if isCi():
reportResults(results) reportResults(results)
if outs.len > 0: # TODO: push after build not at once?
# TODO: push after build not at once? var cmd = service
var cmd = service cmd.addArg "push"
cmd.addArg "push" cmd.addArg name
cmd.addArg name cmd.addArg "--jobs"
cmd.addArg "--jobs" cmd.addArg $jobs
cmd.addArg $jobs cmd.addArgs outs
cmd.addArgs outs let pushErr = runCmd(cmd)
let pushErr = runCmd(cmd) if pushErr != 0:
if pushErr != 0: errorQuit "failed to push build to cache"
errorQuit "failed to push build to cache"
proc getUpdatedLockFile() = proc getUpdatedLockFile() =
info "getting updated flake.lock as updated.lock" info "getting updated flake.lock as updated.lock"