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

Compare commits

base: daylin:54d5632674477510b4c08f448eaae5f8464ec77c
Branches Tags
daylin:main
daylin:flake-lock
daylin:lix-beta
daylin:lix-beta-with-nix
...
compare: daylin:433a4b81390e7735b740324381318518151060aa
Branches Tags
daylin:main
daylin:flake-lock
daylin:lix-beta
daylin:lix-beta-with-nix

4 commits
54d5632674 ... 433a4b8139

Author SHA1 Message Date
daylin-bot
433a4b8139 flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=0dc7367a7006cc3cc877d52bf34c4998144bff84' (2025-01-16)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=407453166ce2a52433c7b0b4ee92a41e47ef8f6d' (2025-01-19)
• Updated input 'hyprland/hyprland-protocols':
    'github:hyprwm/hyprland-protocols/e3b6af97ddcfaafbda8e2828c719a5af84f662cb' (2025-01-01)
  → 'github:hyprwm/hyprland-protocols/455c055883d9639d4fcbfcedb4c6d12ce313791e' (2025-01-17)
• Updated input 'lib-aggregate':
    'github:nix-community/lib-aggregate/917882a0186d7731a61ede986c701e272f744750' (2025-01-12)
  → 'github:nix-community/lib-aggregate/e07594822638004d96f100febbe947189c42e8a9' (2025-01-19)
• Added input 'lix-attic/flake-compat':
    'github:edolstra/flake-compat/ff81ac966bb2cae68946d5ed5fc4994f96d0ffec' (2024-12-04)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/271e5bd7c57e1f001693799518b10a02d1123b12' (2025-01-12)
  → 'github:nix-community/nix-index-database/744d330659e207a1883d2da0141d35e520eb87bd' (2025-01-19)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/eb62e6aa39ea67e0b8018ba8ea077efe65807dc8' (2025-01-14)
  → 'github:nixos/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c' (2025-01-16)
• Updated input 'nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/1418bc28a52126761c02dd3d89b2d8ca0f521181' (2025-01-12)
  → 'github:nix-community/nixpkgs.lib/977f49fd8cf854416f82987696784717acd6e817' (2025-01-19)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/8f3a889a1bb60d58f42fc671d8a0b73496ede51c' (2025-01-15)
  → 'github:nix-community/nixpkgs-wayland/0deffe038aebb272bd19a514e780a09e24da8417' (2025-01-20)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/553c7cb22fed19fd60eb310423fdc93045c51ba8' (2025-01-13)
  → 'github:Mic92/sops-nix/4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6' (2025-01-17)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/97871d416166803134ba64597a1006f3f670fbde' (2025-01-16)
  → 'github:numtide/treefmt-nix/d1ed3b385f8130e392870cfb1dbfaff8a63a1899' (2025-01-17)
 2025-01-20 15:11:44 +00:00
Daylin Morgan
0f374b91b2
different flake organization scheme 2025-01-20 00:53:19 -06:00
Daylin Morgan
ef69a6ce6a
use fork 2025-01-20 00:23:44 -06:00
Daylin Morgan
74cee0e251
tryout alt action to install lix 2025-01-19 23:58:42 -06:00
3 changed files with 92 additions and 116 deletions
Show stats Expand all files Collapse all files

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

@ -5,7 +5,7 @@ inputs:
description: Extra nix.conf config
default: |
accept-flake-config = true
experimental-features = pipe-operator
experimental-features = nix-command flakes pipe-operator
build-dir = /nix/var
keep-derivations = true
keep-outputs = true
@ -27,9 +27,13 @@ runs:
BTRFS: ${{ inputs.btrfs }}
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:
source-url: https://install.lix.systems/lix/lix-installer-x86_64-linux
extra-conf: ${{ inputs.nix_conf }}
- name: Install and login to attic cache

73
flake.lock
View file

@ -89,6 +89,22 @@
"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": {
"inputs": {
"nixpkgs-lib": [
@ -219,11 +235,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1737038559,
"narHash": "sha256-iSJIeZz2Bto/RiZN1scp4hfvnEAc+IhIRGxD2V3iu+c=",
"lastModified": 1737310896,
"narHash": "sha256-Y0s1jBm18Dl9HKpXsLG0fN9Co2IKoGqtriZ/2Vncv5s=",
"ref": "refs/heads/main",
"rev": "0dc7367a7006cc3cc877d52bf34c4998144bff84",
"revCount": 5674,
"rev": "407453166ce2a52433c7b0b4ee92a41e47ef8f6d",
"revCount": 5690,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland/"
@ -266,11 +282,11 @@
]
},
"locked": {
"lastModified": 1735774328,
"narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=",
"lastModified": 1737127640,
"narHash": "sha256-mIQ3/axCZ4g8ySwWRbW4fJcyC9v55uAii3cqlJRtW8g=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb",
"rev": "455c055883d9639d4fcbfcedb4c6d12ce313791e",
"type": "github"
},
"original": {
@ -443,11 +459,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1736684024,
"narHash": "sha256-FYJ4iFD/2L1CFN/aHjI8HxxSxuPNy4OvW+VCBh41Lzk=",
"lastModified": 1737288694,
"narHash": "sha256-e9MsdkHidgepQpF0InyRSpeD6YujQcaB0uUzeXVvW+I=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "917882a0186d7731a61ede986c701e272f744750",
"rev": "e07594822638004d96f100febbe947189c42e8a9",
"type": "github"
},
"original": {
@ -473,6 +489,7 @@
"lix-attic": {
"inputs": {
"crane": "crane",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"lix": [
"lix-module",
@ -567,11 +584,11 @@
]
},
"locked": {
"lastModified": 1736652904,
"narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=",
"lastModified": 1737257306,
"narHash": "sha256-lEGgpA4kGafc76+Amnz+gh1L/cwUS2pePFlf22WEyh8=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "271e5bd7c57e1f001693799518b10a02d1123b12",
"rev": "744d330659e207a1883d2da0141d35e520eb87bd",
"type": "github"
},
"original": {
@ -603,11 +620,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1736883708,
"narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
"lastModified": 1737062831,
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
"type": "github"
},
"original": {
@ -634,11 +651,11 @@
},
"nixpkgs-lib_2": {
"locked": {
"lastModified": 1736643958,
"narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
"lastModified": 1737248590,
"narHash": "sha256-6SWtDeYJS3bS7QyJrGKyd6FpROEN0JCMgakSX8yPbyA=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
"rev": "977f49fd8cf854416f82987696784717acd6e817",
"type": "github"
},
"original": {
@ -675,11 +692,11 @@
]
},
"locked": {
"lastModified": 1736965550,
"narHash": "sha256-u34e02DgidNBbJ2ZPUWlNZeqQTo7tCGT8LN9dZphNAY=",
"lastModified": 1737341314,
"narHash": "sha256-cLtRowBc6OUcOSgGkwle70mOW/UyCbxWUveK3iQUKzI=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "8f3a889a1bb60d58f42fc671d8a0b73496ede51c",
"rev": "0deffe038aebb272bd19a514e780a09e24da8417",
"type": "github"
},
"original": {
@ -763,11 +780,11 @@
]
},
"locked": {
"lastModified": 1736808430,
"narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=",
"lastModified": 1737107480,
"narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8",
"rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6",
"type": "github"
},
"original": {
@ -829,11 +846,11 @@
]
},
"locked": {
"lastModified": 1737054102,
"narHash": "sha256-saLiCRQ5RtdTnznT/fja7GxcYRAzeY3k8S+IF/2s/2A=",
"lastModified": 1737103437,
"narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "97871d416166803134ba64597a1006f3f670fbde",
"rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899",
"type": "github"
},
"original": {

125
flake.nix
View file

@ -25,85 +25,47 @@
inputs.flake-utils.follows = "flake-utils";
};
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
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";
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";
};
# master as of 2024.12.12
NixVirt.url = "github:AshleyYakeley/NixVirt?rev=fe3aaa86d4458e4f84348941297f7ba82e2a9f67";
treefmt-nix = {
url = "github:numtide/treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
# Follows
nixos-wsl = {
url = "github:nix-community/NixOS-WSL";
inputs.nixpkgs.follows = "nixpkgs";
};
# 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";
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
url = "github:AshleyYakeley/NixVirt?rev=fe3aaa86d4458e4f84348941297f7ba82e2a9f67";
inputs.nixpkgs.follows = "nixpkgs";
};
# nim2nix
hyprman.inputs.nim2nix.follows = "nim2nix";
tsm.inputs.nim2nix.follows = "nim2nix";
utils.inputs.nim2nix.follows = "nim2nix";
lix-attic = {
url = "git+https://git.lix.systems/nrabulinski/attic.git";
@ -136,17 +98,10 @@
# 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 = "";
};
nixpkgs-wayland.inputs.flake-compat.follows = "";
nixpkgs-wayland.inputs.nix-eval-jobs.follows = "";
lix-attic.inputs.nix-github-actions.follows = "";
};
nixConfig = {