mirror of
https://github.com/daylinmorgan/oizys.git
synced 2025-02-05 13:14:17 -06:00
Compare commits
No commits in common. "d302d78029b95bb1cfb83aac3f8f0bc0342a786f" and "433a4b81390e7735b740324381318518151060aa" have entirely different histories.
d302d78029
...
433a4b8139
9 changed files with 50 additions and 59 deletions
5
.github/actions/nix/action.yml
vendored
5
.github/actions/nix/action.yml
vendored
|
|
@ -36,11 +36,6 @@ runs:
|
|||
with:
|
||||
extra-conf: ${{ inputs.nix_conf }}
|
||||
|
||||
- name: modify trusted users
|
||||
shell: bash
|
||||
run: |
|
||||
sudo echo "trusted-users = root $USER" >> /etc/nix/nix.conf
|
||||
|
||||
- name: Install and login to attic cache
|
||||
shell: bash
|
||||
run: |
|
||||
|
|
|
|||
47
flake.lock
47
flake.lock
|
|
@ -7,17 +7,17 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736736253,
|
||||
"narHash": "sha256-GrktftEfXmmdKOU0yz3QXckDz1ncZ+f4KLU8XnYKYuA=",
|
||||
"lastModified": 1732406038,
|
||||
"narHash": "sha256-BYNBN+Rtc/SX6qI7m3nmryufRPn0ZYd40yHDo9VQaNE=",
|
||||
"owner": "AshleyYakeley",
|
||||
"repo": "NixVirt",
|
||||
"rev": "9063243af5e6674359a0ff7cec57f02eeacf0cea",
|
||||
"rev": "fe3aaa86d4458e4f84348941297f7ba82e2a9f67",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "AshleyYakeley",
|
||||
"repo": "NixVirt",
|
||||
"rev": "9063243af5e6674359a0ff7cec57f02eeacf0cea",
|
||||
"rev": "fe3aaa86d4458e4f84348941297f7ba82e2a9f67",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -235,11 +235,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737398451,
|
||||
"narHash": "sha256-9X6dQbYGi9az9+8wk3fnPppD2SOOe6U68vdZCl+MxkE=",
|
||||
"lastModified": 1737310896,
|
||||
"narHash": "sha256-Y0s1jBm18Dl9HKpXsLG0fN9Co2IKoGqtriZ/2Vncv5s=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "a661203bb6d4714b211572759e2f74b1da194972",
|
||||
"revCount": 5693,
|
||||
"rev": "407453166ce2a52433c7b0b4ee92a41e47ef8f6d",
|
||||
"revCount": 5690,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
|
@ -475,15 +475,15 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1737400654,
|
||||
"narHash": "sha256-szM+hEGCKFiPxWkKCXqA0oIGmlfbHupsk4b1uss1zuk=",
|
||||
"rev": "831e9d62f118dc6180901a762e25d04fde064595",
|
||||
"lastModified": 1737234286,
|
||||
"narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=",
|
||||
"rev": "2837da71ec1588c1187d2e554719b15904a46c8b",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/831e9d62f118dc6180901a762e25d04fde064595.tar.gz?rev=831e9d62f118dc6180901a762e25d04fde064595"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
|
||||
"url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz"
|
||||
}
|
||||
},
|
||||
"lix-attic": {
|
||||
|
|
@ -524,23 +524,21 @@
|
|||
"flake-utils"
|
||||
],
|
||||
"flakey-profile": "flakey-profile",
|
||||
"lix": [
|
||||
"lix"
|
||||
],
|
||||
"lix": "lix",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737241037,
|
||||
"narHash": "sha256-6LIpS3rK1Ch6OXis4tvBTgGBTRb+NptDAfhPNzmgZSE=",
|
||||
"rev": "690f7c0fa2935bf591cccf4d7312b3e0f470298b",
|
||||
"lastModified": 1737237494,
|
||||
"narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=",
|
||||
"rev": "b90bf629bbd835e61f1317b99e12f8c831017006",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/690f7c0fa2935bf591cccf4d7312b3e0f470298b.tar.gz?rev=690f7c0fa2935bf591cccf4d7312b3e0f470298b"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"
|
||||
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"
|
||||
}
|
||||
},
|
||||
"my-nixpkgs": {
|
||||
|
|
@ -694,11 +692,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737390929,
|
||||
"narHash": "sha256-0G3+H+LH18eQXDnElM/Y/8BkUPoO9qc2jLh7aoI6tXA=",
|
||||
"lastModified": 1737341314,
|
||||
"narHash": "sha256-cLtRowBc6OUcOSgGkwle70mOW/UyCbxWUveK3iQUKzI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "900b3dbd52e89c7dde737e50c51ee97e93ee4d9e",
|
||||
"rev": "0deffe038aebb272bd19a514e780a09e24da8417",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -737,7 +735,6 @@
|
|||
"hyprman": "hyprman",
|
||||
"jj": "jj",
|
||||
"lib-aggregate": "lib-aggregate",
|
||||
"lix": "lix",
|
||||
"lix-attic": "lix-attic",
|
||||
"lix-module": "lix-module",
|
||||
"my-nixpkgs": "my-nixpkgs",
|
||||
|
|
|
|||
30
flake.nix
30
flake.nix
|
|
@ -8,21 +8,27 @@
|
|||
stable.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||
my-nixpkgs.url = "github:daylinmorgan/nixpkgs/nixos-unstable";
|
||||
|
||||
lix-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
|
||||
lix-module.inputs.nixpkgs.follows = "nixpkgs";
|
||||
lix-module.inputs.flake-utils.follows = "flake-utils";
|
||||
lix = {
|
||||
url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
|
||||
flake = false;
|
||||
};
|
||||
lix-module.inputs.lix.follows = "lix";
|
||||
# lix = {
|
||||
# url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
|
||||
# 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";
|
||||
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";
|
||||
};
|
||||
|
||||
sops-nix.url = "github:Mic92/sops-nix";
|
||||
nix-index-database.url = "github:nix-community/nix-index-database";
|
||||
treefmt-nix.url = "github:numtide/treefmt-nix";
|
||||
nixos-wsl.url = "github:nix-community/NixOS-WSL";
|
||||
nix-index-database.url = "github:nix-community/nix-index-database";
|
||||
sops-nix.url = "github:Mic92/sops-nix";
|
||||
hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
|
||||
hyprland-contrib.url = "github:hyprwm/contrib";
|
||||
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
|
||||
|
|
@ -35,7 +41,7 @@
|
|||
jj.url = "github:martinvonz/jj/v0.25.0";
|
||||
|
||||
# master as of 2024.12.12
|
||||
NixVirt.url = "github:AshleyYakeley/NixVirt?rev=9063243af5e6674359a0ff7cec57f02eeacf0cea";
|
||||
NixVirt.url = "github:AshleyYakeley/NixVirt?rev=fe3aaa86d4458e4f84348941297f7ba82e2a9f67";
|
||||
|
||||
# Follows
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
# # added to make using `pip install` work in docker build
|
||||
# networking.nameservers = [ "8.8.8.8"];
|
||||
|
||||
# allow tcp connections for reverse proxy
|
||||
# allow tcp connections for revsere proxy
|
||||
networking.firewall = enabled // {
|
||||
allowedTCPPorts = [
|
||||
80
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@ let
|
|||
default = oizys;
|
||||
oizys = pkgs.callPackage ../pkgs/oizys { };
|
||||
iso = mkIso.config.system.build.isoImage;
|
||||
|
||||
# nimlangserver = pkgs.callPackage ../pkgs/nim/nimlangserver { };
|
||||
}
|
||||
// (import ../pkgs { inherit pkgs lib; })
|
||||
|
|
|
|||
|
|
@ -28,8 +28,6 @@
|
|||
];
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nix.package = (flake.pkgs "self").lix;
|
||||
|
||||
nix = {
|
||||
optimise.automatic = true;
|
||||
gc = {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ in
|
|||
|
||||
attic-client = (flake.pkgs "lix-attic").attic-client;
|
||||
attic-server = (flake.pkgs "lix-attic").attic-server;
|
||||
lix = pkgs.callPackage ./lix { inherit flake; };
|
||||
lix = (flake.pkgs "lix-module").default;
|
||||
}
|
||||
// (flake.toPackageAttrs [
|
||||
"pixi"
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
{ flake, ... }:
|
||||
((flake.pkgs "lix-module").default.override {
|
||||
aws-sdk-cpp = null;
|
||||
}).overrideAttrs
|
||||
(attrs: {
|
||||
version = "${attrs.version}-oizys";
|
||||
|
||||
# probs a mistake ¯\_(ツ)_/¯
|
||||
# surely they wouldn't push a broken CL....surely
|
||||
doCheck = false;
|
||||
})
|
||||
|
|
@ -62,14 +62,19 @@ proc formatStdoutStderr(stdout: string, stderr: string): string =
|
|||
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"
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue