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:05861c8a884fc3905dc06223228738401c2f07b5
Branches Tags
daylin:main
daylin:flake-lock
daylin:lix-beta
daylin:lix-beta-with-nix
..
compare: daylin:0f374b91b2014c1d061c01505c5309280d748c88
Branches Tags
daylin:flake-lock
daylin:main
daylin:lix-beta
daylin:lix-beta-with-nix

No commits in common. "05861c8a884fc3905dc06223228738401c2f07b5" and "0f374b91b2014c1d061c01505c5309280d748c88" have entirely different histories.
05861c8a88 ... 0f374b91b2

9 changed files with 71 additions and 97 deletions
Show stats Expand all files Collapse all files

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

@ -36,11 +36,6 @@ runs:
with: with:
extra-conf: ${{ inputs.nix_conf }} 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 - name: Install and login to attic cache
shell: bash shell: bash
run: | run: |

106
flake.lock
View file

@ -7,17 +7,17 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736736253, "lastModified": 1732406038,
"narHash": "sha256-GrktftEfXmmdKOU0yz3QXckDz1ncZ+f4KLU8XnYKYuA=", "narHash": "sha256-BYNBN+Rtc/SX6qI7m3nmryufRPn0ZYd40yHDo9VQaNE=",
"owner": "AshleyYakeley", "owner": "AshleyYakeley",
"repo": "NixVirt", "repo": "NixVirt",
"rev": "9063243af5e6674359a0ff7cec57f02eeacf0cea", "rev": "fe3aaa86d4458e4f84348941297f7ba82e2a9f67",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "AshleyYakeley", "owner": "AshleyYakeley",
"repo": "NixVirt", "repo": "NixVirt",
"rev": "9063243af5e6674359a0ff7cec57f02eeacf0cea", "rev": "fe3aaa86d4458e4f84348941297f7ba82e2a9f67",
"type": "github" "type": "github"
} }
}, },
@ -89,22 +89,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -235,11 +219,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1737310896, "lastModified": 1737038559,
"narHash": "sha256-Y0s1jBm18Dl9HKpXsLG0fN9Co2IKoGqtriZ/2Vncv5s=", "narHash": "sha256-iSJIeZz2Bto/RiZN1scp4hfvnEAc+IhIRGxD2V3iu+c=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "407453166ce2a52433c7b0b4ee92a41e47ef8f6d", "rev": "0dc7367a7006cc3cc877d52bf34c4998144bff84",
"revCount": 5690, "revCount": 5674,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -282,11 +266,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737127640, "lastModified": 1735774328,
"narHash": "sha256-mIQ3/axCZ4g8ySwWRbW4fJcyC9v55uAii3cqlJRtW8g=", "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "455c055883d9639d4fcbfcedb4c6d12ce313791e", "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -459,11 +443,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1737288694, "lastModified": 1736684024,
"narHash": "sha256-e9MsdkHidgepQpF0InyRSpeD6YujQcaB0uUzeXVvW+I=", "narHash": "sha256-FYJ4iFD/2L1CFN/aHjI8HxxSxuPNy4OvW+VCBh41Lzk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lib-aggregate", "repo": "lib-aggregate",
"rev": "e07594822638004d96f100febbe947189c42e8a9", "rev": "917882a0186d7731a61ede986c701e272f744750",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -475,21 +459,20 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737301226, "lastModified": 1737234286,
"narHash": "sha256-Gt0o5Reh1Pm/1Bf5QawWWbEB6A1kExmc9Wva4bq8Bx8=", "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=",
"rev": "4bb97b2a9b4e96b825e621810900ce077fdf7efb", "rev": "2837da71ec1588c1187d2e554719b15904a46c8b",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4bb97b2a9b4e96b825e621810900ce077fdf7efb.tar.gz?rev=4bb97b2a9b4e96b825e621810900ce077fdf7efb" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b"
}, },
"original": { "original": {
"type": "tarball", "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": { "lix-attic": {
"inputs": { "inputs": {
"crane": "crane", "crane": "crane",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"lix": [ "lix": [
"lix-module", "lix-module",
@ -524,23 +507,21 @@
"flake-utils" "flake-utils"
], ],
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"lix": [ "lix": "lix",
"lix"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1737241037, "lastModified": 1737237494,
"narHash": "sha256-6LIpS3rK1Ch6OXis4tvBTgGBTRb+NptDAfhPNzmgZSE=", "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=",
"rev": "690f7c0fa2935bf591cccf4d7312b3e0f470298b", "rev": "b90bf629bbd835e61f1317b99e12f8c831017006",
"type": "tarball", "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": { "original": {
"type": "tarball", "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": { "my-nixpkgs": {
@ -586,11 +567,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737257306, "lastModified": 1736652904,
"narHash": "sha256-lEGgpA4kGafc76+Amnz+gh1L/cwUS2pePFlf22WEyh8=", "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "744d330659e207a1883d2da0141d35e520eb87bd", "rev": "271e5bd7c57e1f001693799518b10a02d1123b12",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -622,11 +603,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1737062831, "lastModified": 1736883708,
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -653,11 +634,11 @@
}, },
"nixpkgs-lib_2": { "nixpkgs-lib_2": {
"locked": { "locked": {
"lastModified": 1737248590, "lastModified": 1736643958,
"narHash": "sha256-6SWtDeYJS3bS7QyJrGKyd6FpROEN0JCMgakSX8yPbyA=", "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "977f49fd8cf854416f82987696784717acd6e817", "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -694,11 +675,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737341314, "lastModified": 1736965550,
"narHash": "sha256-cLtRowBc6OUcOSgGkwle70mOW/UyCbxWUveK3iQUKzI=", "narHash": "sha256-u34e02DgidNBbJ2ZPUWlNZeqQTo7tCGT8LN9dZphNAY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "0deffe038aebb272bd19a514e780a09e24da8417", "rev": "8f3a889a1bb60d58f42fc671d8a0b73496ede51c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -737,7 +718,6 @@
"hyprman": "hyprman", "hyprman": "hyprman",
"jj": "jj", "jj": "jj",
"lib-aggregate": "lib-aggregate", "lib-aggregate": "lib-aggregate",
"lix": "lix",
"lix-attic": "lix-attic", "lix-attic": "lix-attic",
"lix-module": "lix-module", "lix-module": "lix-module",
"my-nixpkgs": "my-nixpkgs", "my-nixpkgs": "my-nixpkgs",
@ -783,11 +763,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737107480, "lastModified": 1736808430,
"narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=", "narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6", "rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -849,11 +829,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737103437, "lastModified": 1737054102,
"narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=", "narHash": "sha256-saLiCRQ5RtdTnznT/fja7GxcYRAzeY3k8S+IF/2s/2A=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899", "rev": "97871d416166803134ba64597a1006f3f670fbde",
"type": "github" "type": "github"
}, },
"original": { "original": {

30
flake.nix
View file

@ -8,21 +8,27 @@
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-module.url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; # lix = {
lix-module.inputs.nixpkgs.follows = "nixpkgs"; # url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
lix-module.inputs.flake-utils.follows = "flake-utils"; # flake = false;
lix = { # };
url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; # lix-module = {
flake = false; # url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
}; # inputs.nixpkgs.follows = "nixpkgs";
lix-module.inputs.lix.follows = "lix"; # inputs.lix.follows = "lix";
# };
#
# keep for when lix breaks :/ # 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"; treefmt-nix.url = "github:numtide/treefmt-nix";
nixos-wsl.url = "github:nix-community/NixOS-WSL"; 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.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
hyprland-contrib.url = "github:hyprwm/contrib"; hyprland-contrib.url = "github:hyprwm/contrib";
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
@ -35,7 +41,7 @@
jj.url = "github:martinvonz/jj/v0.25.0"; jj.url = "github:martinvonz/jj/v0.25.0";
# master as of 2024.12.12 # master as of 2024.12.12
NixVirt.url = "github:AshleyYakeley/NixVirt?rev=9063243af5e6674359a0ff7cec57f02eeacf0cea"; NixVirt.url = "github:AshleyYakeley/NixVirt?rev=fe3aaa86d4458e4f84348941297f7ba82e2a9f67";
# Follows # Follows

2
hosts/algiz/system.nix
View file

@ -6,7 +6,7 @@
# # added to make using `pip install` work in docker build # # added to make using `pip install` work in docker build
# networking.nameservers = [ "8.8.8.8"]; # networking.nameservers = [ "8.8.8.8"];
# allow tcp connections for reverse proxy # allow tcp connections for revsere proxy
networking.firewall = enabled // { networking.firewall = enabled // {
allowedTCPPorts = [ allowedTCPPorts = [
80 80

1
lib/default.nix
View file

@ -65,6 +65,7 @@ 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;
# nimlangserver = pkgs.callPackage ../pkgs/nim/nimlangserver { }; # nimlangserver = pkgs.callPackage ../pkgs/nim/nimlangserver { };
} }
// (import ../pkgs { inherit pkgs lib; }) // (import ../pkgs { inherit pkgs lib; })

2
modules/essentials.nix
View file

@ -28,8 +28,6 @@
]; ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix.package = (flake.pkgs "self").lix;
nix = { nix = {
optimise.automatic = true; optimise.automatic = true;
gc = { gc = {

2
pkgs/default.nix
View file

@ -18,7 +18,7 @@ in
attic-client = (flake.pkgs "lix-attic").attic-client; attic-client = (flake.pkgs "lix-attic").attic-client;
attic-server = (flake.pkgs "lix-attic").attic-server; attic-server = (flake.pkgs "lix-attic").attic-server;
lix = pkgs.callPackage ./lix { inherit flake; }; lix = (flake.pkgs "lix-module").default;
} }
// (flake.toPackageAttrs [ // (flake.toPackageAttrs [
"pixi" "pixi"

11
pkgs/lix/default.nix
View file

@ -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;
})

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

@ -62,14 +62,19 @@ proc formatStdoutStderr(stdout: string, stderr: string): string =
result.add "-> " result.add "-> "
result.add line result.add line
result.add "\n" result.add "\n"
result.add "stdout:\n" result.add "stdout:\n"
for line in stdout.splitLines(): for line in stdout.splitLines():
addLine addLine
# result.add bb"[red]->[/]"
# result.add "-> "
# result.add line
# result.add "\n"
result.add "stdout:\n" result.add "stdout:\n"
for line in stderr.splitLines(): for line in stderr.splitLines():
addLine addLine
result.add "-> "
result.add line
result.add "\n"