mirror of
https://github.com/daylinmorgan/oizys.git
synced 2025-02-05 13:14:17 -06:00
Compare commits
4 commits
54d5632674
...
433a4b8139
Author | SHA1 | Date | |
---|---|---|---|
433a4b8139 | |||
0f374b91b2 | |||
ef69a6ce6a | |||
74cee0e251 |
3 changed files with 50 additions and 91 deletions
10
.github/actions/nix/action.yml
vendored
10
.github/actions/nix/action.yml
vendored
|
@ -5,7 +5,7 @@ inputs:
|
||||||
description: Extra nix.conf config
|
description: Extra nix.conf config
|
||||||
default: |
|
default: |
|
||||||
accept-flake-config = true
|
accept-flake-config = true
|
||||||
experimental-features = pipe-operator
|
experimental-features = nix-command flakes pipe-operator
|
||||||
build-dir = /nix/var
|
build-dir = /nix/var
|
||||||
keep-derivations = true
|
keep-derivations = true
|
||||||
keep-outputs = true
|
keep-outputs = true
|
||||||
|
@ -27,9 +27,13 @@ runs:
|
||||||
BTRFS: ${{ inputs.btrfs }}
|
BTRFS: ${{ inputs.btrfs }}
|
||||||
run: exec ${{ github.action_path }}/prepare.sh
|
run: exec ${{ github.action_path }}/prepare.sh
|
||||||
|
|
||||||
- uses: DeterminateSystems/nix-installer-action@v15
|
# - uses: DeterminateSystems/nix-installer-action@v15
|
||||||
|
# with:
|
||||||
|
# source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
|
||||||
|
# extra-conf: ${{ inputs.nix_conf }}
|
||||||
|
|
||||||
|
- uses: daylinmorgan/lix-gha-installer-action@released
|
||||||
with:
|
with:
|
||||||
source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
|
|
||||||
extra-conf: ${{ inputs.nix_conf }}
|
extra-conf: ${{ inputs.nix_conf }}
|
||||||
|
|
||||||
- name: Install and login to attic cache
|
- name: Install and login to attic cache
|
||||||
|
|
|
@ -692,11 +692,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1737325094,
|
"lastModified": 1737341314,
|
||||||
"narHash": "sha256-cUi6vDI/rveFpKsJJhIe084XiXzbJPYUxBKB1dfepH4=",
|
"narHash": "sha256-cLtRowBc6OUcOSgGkwle70mOW/UyCbxWUveK3iQUKzI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs-wayland",
|
"repo": "nixpkgs-wayland",
|
||||||
"rev": "4b5cbd9e85bfedab28018e955086b9987bc495df",
|
"rev": "0deffe038aebb272bd19a514e780a09e24da8417",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
129
flake.nix
129
flake.nix
|
@ -25,85 +25,47 @@
|
||||||
inputs.flake-utils.follows = "flake-utils";
|
inputs.flake-utils.follows = "flake-utils";
|
||||||
};
|
};
|
||||||
|
|
||||||
sops-nix = {
|
sops-nix.url = "github:Mic92/sops-nix";
|
||||||
url = "github:Mic92/sops-nix";
|
nix-index-database.url = "github:nix-community/nix-index-database";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
treefmt-nix.url = "github:numtide/treefmt-nix";
|
||||||
};
|
nixos-wsl.url = "github:nix-community/NixOS-WSL";
|
||||||
|
hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
|
||||||
|
hyprland-contrib.url = "github:hyprwm/contrib";
|
||||||
|
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
|
||||||
|
f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake";
|
||||||
|
tsm.url = "github:daylinmorgan/tsm?dir=nix";
|
||||||
|
hyprman.url = "git+https://git.dayl.in/daylin/hyprman.git";
|
||||||
|
nim2nix.url = "github:daylinmorgan/nim2nix";
|
||||||
|
utils.url = "git+https://git.dayl.in/daylin/utils.git";
|
||||||
|
pixi.url = "github:daylinmorgan/pixi-flake";
|
||||||
|
jj.url = "github:martinvonz/jj/v0.25.0";
|
||||||
|
|
||||||
nix-index-database = {
|
|
||||||
url = "github:nix-community/nix-index-database";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
treefmt-nix = {
|
|
||||||
url = "github:numtide/treefmt-nix";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
nixos-wsl = {
|
|
||||||
url = "github:nix-community/NixOS-WSL";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
hyprland = {
|
|
||||||
url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
hyprland-contrib = {
|
|
||||||
url = "github:hyprwm/contrib";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
nixpkgs-wayland = {
|
|
||||||
url = "github:nix-community/nixpkgs-wayland";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
f1multiviewer = {
|
|
||||||
url = "github:daylinmorgan/f1multiviewer-flake";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
tsm = {
|
|
||||||
url = "github:daylinmorgan/tsm?dir=nix";
|
|
||||||
inputs = {
|
|
||||||
nixpkgs.follows = "nixpkgs";
|
|
||||||
nim2nix.follows = "nim2nix";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
hyprman = {
|
|
||||||
url = "git+https://git.dayl.in/daylin/hyprman.git";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
inputs.nim2nix.follows = "nim2nix";
|
|
||||||
};
|
|
||||||
utils = {
|
|
||||||
url = "git+https://git.dayl.in/daylin/utils.git";
|
|
||||||
inputs = {
|
|
||||||
nixpkgs.follows = "nixpkgs";
|
|
||||||
nim2nix.follows = "nim2nix";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
nim2nix = {
|
|
||||||
url = "github:daylinmorgan/nim2nix";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
pixi = {
|
|
||||||
url = "github:daylinmorgan/pixi-flake";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
jj = {
|
|
||||||
url = "github:martinvonz/jj/v0.25.0";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
NixVirt = {
|
|
||||||
# master as of 2024.12.12
|
# master as of 2024.12.12
|
||||||
url = "github:AshleyYakeley/NixVirt?rev=fe3aaa86d4458e4f84348941297f7ba82e2a9f67";
|
NixVirt.url = "github:AshleyYakeley/NixVirt?rev=fe3aaa86d4458e4f84348941297f7ba82e2a9f67";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
# Follows
|
||||||
|
|
||||||
|
# nixpkgs
|
||||||
|
f1multiviewer.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
hyprland.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
hyprland-contrib.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
hyprman.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
jj.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
nim2nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
nixpkgs-wayland.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
NixVirt.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
pixi.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
sops-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
tsm.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
utils.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
|
# nim2nix
|
||||||
|
hyprman.inputs.nim2nix.follows = "nim2nix";
|
||||||
|
tsm.inputs.nim2nix.follows = "nim2nix";
|
||||||
|
utils.inputs.nim2nix.follows = "nim2nix";
|
||||||
|
|
||||||
lix-attic = {
|
lix-attic = {
|
||||||
url = "git+https://git.lix.systems/nrabulinski/attic.git";
|
url = "git+https://git.lix.systems/nrabulinski/attic.git";
|
||||||
|
@ -136,17 +98,10 @@
|
||||||
|
|
||||||
# nil inputs
|
# nil inputs
|
||||||
hyprland.inputs.pre-commit-hooks.follows = "";
|
hyprland.inputs.pre-commit-hooks.follows = "";
|
||||||
|
|
||||||
nixos-wsl.inputs.flake-compat.follows = "";
|
nixos-wsl.inputs.flake-compat.follows = "";
|
||||||
|
nixpkgs-wayland.inputs.flake-compat.follows = "";
|
||||||
nixpkgs-wayland.inputs = {
|
nixpkgs-wayland.inputs.nix-eval-jobs.follows = "";
|
||||||
flake-compat.follows = "";
|
lix-attic.inputs.nix-github-actions.follows = "";
|
||||||
nix-eval-jobs.follows = "";
|
|
||||||
};
|
|
||||||
|
|
||||||
lix-attic.inputs = {
|
|
||||||
nix-github-actions.follows = "";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nixConfig = {
|
nixConfig = {
|
||||||
|
|
Loading…
Reference in a new issue