mirror of
https://github.com/daylinmorgan/oizys.git
synced 2025-02-05 13:14:17 -06:00
Compare commits
No commits in common. "54d5632674477510b4c08f448eaae5f8464ec77c" and "e4fb3d6e6495da3fec58fe00c892d633da67cecf" have entirely different histories.
54d5632674
...
e4fb3d6e64
22 changed files with 591 additions and 477 deletions
6
.github/actions/nix/action.yml
vendored
6
.github/actions/nix/action.yml
vendored
|
|
@ -5,8 +5,8 @@ inputs:
|
|||
description: Extra nix.conf config
|
||||
default: |
|
||||
accept-flake-config = true
|
||||
experimental-features = pipe-operator
|
||||
build-dir = /nix/var
|
||||
experimental-features = pipe-operator
|
||||
keep-derivations = true
|
||||
keep-outputs = true
|
||||
clean:
|
||||
|
|
@ -37,7 +37,3 @@ runs:
|
|||
run: |
|
||||
nix profile install "nixpkgs#attic-client"
|
||||
attic login oizys https://attic.dayl.in "${{ inputs.attic_token}}"
|
||||
|
||||
- name: "Show Nix Info"
|
||||
shell: bash
|
||||
run: nix run "nixpkgs#nix-info" -- -m
|
||||
|
|
|
|||
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
|
|
@ -6,15 +6,11 @@ on:
|
|||
hosts:
|
||||
description: "list of hosts to build"
|
||||
required: true
|
||||
type: string
|
||||
default: "othalan,algiz"
|
||||
type: string
|
||||
lockFile:
|
||||
description: "flake.lock file"
|
||||
type: string
|
||||
extraArgs:
|
||||
description: "postional args forwared to nix"
|
||||
type: string
|
||||
default: "--keep-going"
|
||||
|
||||
workflow_call:
|
||||
inputs:
|
||||
|
|
@ -58,4 +54,4 @@ jobs:
|
|||
--flake .
|
||||
-vv
|
||||
--
|
||||
${{ inputs.extraArgs }}
|
||||
--keep-going
|
||||
|
|
|
|||
589
flake.lock
589
flake.lock
|
|
@ -54,21 +54,6 @@
|
|||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -90,6 +75,22 @@
|
|||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1733328505,
|
||||
|
|
@ -105,10 +106,26 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"locked": {
|
||||
"lastModified": 1717312683,
|
||||
"narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "flake-compat",
|
||||
"rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"lix-attic",
|
||||
"nixpkgs-wayland",
|
||||
"nix-eval-jobs",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
|
|
@ -128,7 +145,43 @@
|
|||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"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"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726560853,
|
||||
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_3": {
|
||||
"inputs": {
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
|
|
@ -159,6 +212,28 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"pre-commit-hooks",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709087332,
|
||||
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"hyprcursor": {
|
||||
"inputs": {
|
||||
"hyprlang": [
|
||||
|
|
@ -230,16 +305,16 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"pre-commit-hooks": [],
|
||||
"systems": "systems_2",
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
"systems": "systems",
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737310896,
|
||||
"narHash": "sha256-Y0s1jBm18Dl9HKpXsLG0fN9Co2IKoGqtriZ/2Vncv5s=",
|
||||
"lastModified": 1737038559,
|
||||
"narHash": "sha256-iSJIeZz2Bto/RiZN1scp4hfvnEAc+IhIRGxD2V3iu+c=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "407453166ce2a52433c7b0b4ee92a41e47ef8f6d",
|
||||
"revCount": 5690,
|
||||
"rev": "0dc7367a7006cc3cc877d52bf34c4998144bff84",
|
||||
"revCount": 5674,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
|
@ -282,11 +357,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737127640,
|
||||
"narHash": "sha256-mIQ3/axCZ4g8ySwWRbW4fJcyC9v55uAii3cqlJRtW8g=",
|
||||
"lastModified": 1735774328,
|
||||
"narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-protocols",
|
||||
"rev": "455c055883d9639d4fcbfcedb4c6d12ce313791e",
|
||||
"rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -355,9 +430,7 @@
|
|||
},
|
||||
"hyprman": {
|
||||
"inputs": {
|
||||
"nim2nix": [
|
||||
"nim2nix"
|
||||
],
|
||||
"nim2nix": "nim2nix",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
|
|
@ -428,9 +501,7 @@
|
|||
},
|
||||
"jj": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
|
|
@ -453,17 +524,15 @@
|
|||
},
|
||||
"lib-aggregate": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737288694,
|
||||
"narHash": "sha256-e9MsdkHidgepQpF0InyRSpeD6YujQcaB0uUzeXVvW+I=",
|
||||
"lastModified": 1736684024,
|
||||
"narHash": "sha256-FYJ4iFD/2L1CFN/aHjI8HxxSxuPNy4OvW+VCBh41Lzk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "lib-aggregate",
|
||||
"rev": "e07594822638004d96f100febbe947189c42e8a9",
|
||||
"rev": "917882a0186d7731a61ede986c701e272f744750",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -475,54 +544,20 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1737234286,
|
||||
"narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=",
|
||||
"rev": "2837da71ec1588c1187d2e554719b15904a46c8b",
|
||||
"lastModified": 1729298361,
|
||||
"narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
|
||||
"rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
|
||||
"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/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz"
|
||||
}
|
||||
},
|
||||
"lix-attic": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"flake-compat": "flake-compat",
|
||||
"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"
|
||||
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
|
||||
}
|
||||
},
|
||||
"lix-module": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flakey-profile": "flakey-profile",
|
||||
"lix": "lix",
|
||||
"nixpkgs": [
|
||||
|
|
@ -530,15 +565,15 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737237494,
|
||||
"narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=",
|
||||
"rev": "b90bf629bbd835e61f1317b99e12f8c831017006",
|
||||
"lastModified": 1729360442,
|
||||
"narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
|
||||
"rev": "9098ac95768f7006d7e070b88bae76939f6034e6",
|
||||
"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/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6"
|
||||
},
|
||||
"original": {
|
||||
"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/2.91.1-1.tar.gz"
|
||||
}
|
||||
},
|
||||
"my-nixpkgs": {
|
||||
|
|
@ -560,6 +595,7 @@
|
|||
"nim2nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprman",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
|
|
@ -577,6 +613,87 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nim2nix_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731683943,
|
||||
"narHash": "sha256-S7J/6qnwvj09XSma37oynLONYP+rJAul/sX9hpK7cN4=",
|
||||
"owner": "daylinmorgan",
|
||||
"repo": "nim2nix",
|
||||
"rev": "a9f1182dbe51675b9666d6a79bebded7d9839ad7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "daylinmorgan",
|
||||
"repo": "nim2nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nim2nix_3": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1725469705,
|
||||
"narHash": "sha256-4/iSUwB3XKmybdt4R87VhBPiD3z4BL6RrD9LyrrkesM=",
|
||||
"owner": "daylinmorgan",
|
||||
"repo": "nim2nix",
|
||||
"rev": "42af12ca45025c7146bc24e27f5d8b65b003d663",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "daylinmorgan",
|
||||
"repo": "nim2nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-eval-jobs": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nix-github-actions": "nix-github-actions",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736194844,
|
||||
"narHash": "sha256-CXtD5xUKb92EjL9RrsGQ9jgnl0aIoGEPwnJ805d3Xz0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-eval-jobs",
|
||||
"rev": "cbae9154bc76c5aa7873f0a67b3c9f13124929d3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-eval-jobs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-github-actions": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs-wayland",
|
||||
"nix-eval-jobs",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731952509,
|
||||
"narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-github-actions",
|
||||
"rev": "7b5f051df789b6b20d259924d349a9ba3319b226",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-github-actions",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-index-database": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -584,11 +701,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737257306,
|
||||
"narHash": "sha256-lEGgpA4kGafc76+Amnz+gh1L/cwUS2pePFlf22WEyh8=",
|
||||
"lastModified": 1736652904,
|
||||
"narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "744d330659e207a1883d2da0141d35e520eb87bd",
|
||||
"rev": "271e5bd7c57e1f001693799518b10a02d1123b12",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -599,10 +716,8 @@
|
|||
},
|
||||
"nixos-wsl": {
|
||||
"inputs": {
|
||||
"flake-compat": [],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
"flake-compat": "flake-compat_2",
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736095716,
|
||||
|
|
@ -620,57 +735,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1737062831,
|
||||
"narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"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": {
|
||||
"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-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1735563628,
|
||||
"narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
|
||||
"lastModified": 1733384649,
|
||||
"narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
|
||||
"rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -680,23 +749,34 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1736643958,
|
||||
"narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-wayland": {
|
||||
"inputs": {
|
||||
"flake-compat": [],
|
||||
"lib-aggregate": [
|
||||
"lib-aggregate"
|
||||
],
|
||||
"nix-eval-jobs": [],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
"flake-compat": "flake-compat_3",
|
||||
"lib-aggregate": "lib-aggregate",
|
||||
"nix-eval-jobs": "nix-eval-jobs",
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737325094,
|
||||
"narHash": "sha256-cUi6vDI/rveFpKsJJhIe084XiXzbJPYUxBKB1dfepH4=",
|
||||
"lastModified": 1736965550,
|
||||
"narHash": "sha256-u34e02DgidNBbJ2ZPUWlNZeqQTo7tCGT8LN9dZphNAY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "4b5cbd9e85bfedab28018e955086b9987bc495df",
|
||||
"rev": "8f3a889a1bb60d58f42fc671d8a0b73496ede51c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -705,6 +785,86 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1736883708,
|
||||
"narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1736042175,
|
||||
"narHash": "sha256-jdd5UWtLVrNEW8K6u5sy5upNAFmF3S4Y+OIeToqJ1X8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bf689c40d035239a489de5997a4da5352434632e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1736798957,
|
||||
"narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1735554305,
|
||||
"narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1724479785,
|
||||
"narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pixi": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -725,29 +885,48 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"pre-commit-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"hyprland",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1735882644,
|
||||
"narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"NixVirt": "NixVirt",
|
||||
"f1multiviewer": "f1multiviewer",
|
||||
"flake-utils": "flake-utils",
|
||||
"hyprland": "hyprland",
|
||||
"hyprland-contrib": "hyprland-contrib",
|
||||
"hyprman": "hyprman",
|
||||
"jj": "jj",
|
||||
"lib-aggregate": "lib-aggregate",
|
||||
"lix-attic": "lix-attic",
|
||||
"lix-module": "lix-module",
|
||||
"my-nixpkgs": "my-nixpkgs",
|
||||
"nim2nix": "nim2nix",
|
||||
"nim2nix": "nim2nix_2",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixos-wsl": "nixos-wsl",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-lib": "nixpkgs-lib_2",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-wayland": "nixpkgs-wayland",
|
||||
"pixi": "pixi",
|
||||
"sops-nix": "sops-nix",
|
||||
"stable": "stable",
|
||||
"treefmt-nix": "treefmt-nix",
|
||||
"treefmt-nix": "treefmt-nix_2",
|
||||
"tsm": "tsm",
|
||||
"utils": "utils"
|
||||
}
|
||||
|
|
@ -780,11 +959,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737107480,
|
||||
"narHash": "sha256-GXUE9+FgxoZU8v0p6ilBJ8NH7k8nKmZjp/7dmMrCv3o=",
|
||||
"lastModified": 1736808430,
|
||||
"narHash": "sha256-wlgdf/n7bJMLBheqt1jmPoxJFrUP6FByKQFXuM9YvIk=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "4c4fb93f18b9072c6fa1986221f9a3d7bf1fe4b6",
|
||||
"rev": "553c7cb22fed19fd60eb310423fdc93045c51ba8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -810,21 +989,6 @@
|
|||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1689347949,
|
||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||
|
|
@ -839,18 +1003,83 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"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"
|
||||
}
|
||||
},
|
||||
"systems_4": {
|
||||
"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": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs-wayland",
|
||||
"nix-eval-jobs",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737103437,
|
||||
"narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=",
|
||||
"lastModified": 1736154270,
|
||||
"narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899",
|
||||
"rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737054102,
|
||||
"narHash": "sha256-saLiCRQ5RtdTnznT/fja7GxcYRAzeY3k8S+IF/2s/2A=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "97871d416166803134ba64597a1006f3f670fbde",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -861,9 +1090,7 @@
|
|||
},
|
||||
"tsm": {
|
||||
"inputs": {
|
||||
"nim2nix": [
|
||||
"nim2nix"
|
||||
],
|
||||
"nim2nix": "nim2nix_3",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
|
|
|
|||
111
flake.nix
111
flake.nix
|
|
@ -7,6 +7,20 @@
|
|||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
stable.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||
my-nixpkgs.url = "github:daylinmorgan/nixpkgs/nixos-unstable";
|
||||
treefmt-nix.url = "github:numtide/treefmt-nix";
|
||||
|
||||
nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
|
||||
nixos-wsl.url = "github:nix-community/NixOS-WSL";
|
||||
|
||||
nix-index-database = {
|
||||
url = "github:nix-community/nix-index-database";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
sops-nix = {
|
||||
url = "github:Mic92/sops-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# lix = {
|
||||
# url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
|
||||
|
|
@ -17,78 +31,49 @@
|
|||
# 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.92.0.tar.gz";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.flake-utils.follows = "flake-utils";
|
||||
};
|
||||
|
||||
sops-nix = {
|
||||
url = "github:Mic92/sops-nix";
|
||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nix-index-database = {
|
||||
url = "github:nix-community/nix-index-database";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
# using nixpkgs version now
|
||||
# # https://github.com/ghostty-org/ghostty/issues/2025
|
||||
# ghostty = {
|
||||
# url = "git+https://github.com/ghostty-org/ghostty.git?ref=refs/tags/v1.0.1";
|
||||
# inputs = {
|
||||
# nixpkgs-stable.follows = "nixpkgs";
|
||||
# nixpkgs-unstable.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";
|
||||
};
|
||||
hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1";
|
||||
hyprland.inputs.nixpkgs.follows = "nixpkgs";
|
||||
hyprland-contrib.url = "github:hyprwm/contrib";
|
||||
hyprland-contrib.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";
|
||||
};
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
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";
|
||||
};
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.nim2nix.follows = "nim2nix";
|
||||
};
|
||||
nim2nix = {
|
||||
url = "github:daylinmorgan/nim2nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
pixi = {
|
||||
url = "github:daylinmorgan/pixi-flake";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -105,14 +90,6 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
lix-attic = {
|
||||
url = "git+https://git.lix.systems/nrabulinski/attic.git";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.lix-module.follows = "lix-module";
|
||||
# make lix-module source of truth
|
||||
inputs.lix.follows = "lix-module/lix";
|
||||
};
|
||||
|
||||
# roc = {
|
||||
# url = "github:roc-lang/roc";
|
||||
# inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -123,30 +100,6 @@
|
|||
# zls.url = "github:zigtools/zls";
|
||||
# zls.inputs.nixpkgs.follows = "nixpkgs";
|
||||
# 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 = {
|
||||
|
|
|
|||
|
|
@ -2,6 +2,14 @@ links.dayl.in {
|
|||
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 {
|
||||
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
|
||||
# (caddy-common) {
|
||||
# encode gzip
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
"/home/daylin/services/gotosocial/"
|
||||
"/home/daylin/services/caddy/"
|
||||
"/home/daylin/services/wedding-website/"
|
||||
"/home/daylin/services/bsky-pds/"
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
pkgs,
|
||||
enabled,
|
||||
flake,
|
||||
...
|
||||
}:
|
||||
{ pkgs, enabled, ... }:
|
||||
let
|
||||
atticPort = "5656";
|
||||
static = pkgs.runCommandLocal "static-files" { } ''
|
||||
|
|
@ -31,10 +26,8 @@ in
|
|||
# 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";
|
||||
services.atticd = enabled // {
|
||||
package = (flake.pkgs "lix-attic").attic-server;
|
||||
|
||||
# Replace with absolute path to your credentials file
|
||||
# TODO: replace with sops-secret!
|
||||
environmentFile = "/etc/atticd.env";
|
||||
|
||||
settings = {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
config,
|
||||
enabled,
|
||||
flake,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
|
|
@ -27,9 +26,4 @@
|
|||
group = config.users.users.daylin.group;
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = [
|
||||
(flake.pkgs "lix-attic").attic-client
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
flake:utils
|
||||
ghostty
|
||||
sops
|
||||
attic-client
|
||||
distrobox
|
||||
firefox
|
||||
zk
|
||||
|
|
|
|||
|
|
@ -36,11 +36,11 @@ in
|
|||
swww
|
||||
nixVersions.git
|
||||
])
|
||||
# ++ [
|
||||
# (flake.pkgs "roc").full
|
||||
# (flake.pkgs "zig-overlay").master
|
||||
# (flake.pkg "zls")
|
||||
# ]
|
||||
++ [
|
||||
(flake.pkgs "roc").full
|
||||
(flake.pkgs "zig-overlay").master
|
||||
(flake.pkg "zls")
|
||||
]
|
||||
++ hyprPackages
|
||||
++ selfPackages;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ let
|
|||
inherit (builtins) mapAttrs readDir listToAttrs;
|
||||
inherit (lib)
|
||||
genAttrs
|
||||
pkgFromSystem
|
||||
loadOverlays
|
||||
listify
|
||||
enableAttrs
|
||||
|
|
@ -32,6 +33,15 @@ let
|
|||
)
|
||||
);
|
||||
|
||||
inheritFlakePkgs =
|
||||
pkgs: flakes:
|
||||
listToAttrs (
|
||||
map (name: {
|
||||
inherit name;
|
||||
value = pkgFromSystem pkgs.system name;
|
||||
}) flakes
|
||||
);
|
||||
|
||||
evalTreeFmt =
|
||||
pkgs:
|
||||
(treefmt-nix.lib.evalModule pkgs (
|
||||
|
|
@ -65,10 +75,14 @@ let
|
|||
default = oizys;
|
||||
oizys = pkgs.callPackage ../pkgs/oizys { };
|
||||
iso = mkIso.config.system.build.isoImage;
|
||||
|
||||
# nimlangserver = pkgs.callPackage ../pkgs/nim/nimlangserver { };
|
||||
lix = pkgFromSystem pkgs.system "lix-module";
|
||||
}
|
||||
// (import ../pkgs { inherit pkgs lib; })
|
||||
// (inheritFlakePkgs pkgs [
|
||||
"pixi"
|
||||
"f1multiviewer"
|
||||
"tsm"
|
||||
])
|
||||
// (import ../pkgs { inherit pkgs; })
|
||||
);
|
||||
|
||||
devShells = forAllSystems (pkgs: {
|
||||
|
|
@ -91,6 +105,7 @@ let
|
|||
}
|
||||
);
|
||||
formatter = forAllSystems (pkgs: (evalTreeFmt pkgs).config.build.wrapper);
|
||||
# formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
|
||||
};
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -104,16 +104,6 @@ let
|
|||
# listNixFilesRecursive = dir: filterNotDefaultNixFile (listFilesRecursive dir);
|
||||
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;
|
||||
# defaultPackageGeneric = system: flake: "${flake}.packages.${system}.default";
|
||||
pkgsFromSystem = system: flake: inputs."${flake}".packages."${system}";
|
||||
|
|
@ -125,7 +115,6 @@ let
|
|||
module = nixosModuleFrom;
|
||||
pkgs = pkgsFromSystem system;
|
||||
pkg = pkgFromSystem system;
|
||||
toPackageAttrs = flakesToPackagesAttrs system;
|
||||
};
|
||||
|
||||
loadOverlays =
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
inherit (builtins) filter;
|
||||
inherit (lib)
|
||||
nixosSystem
|
||||
mkDefaultOizysModule
|
||||
|
|
@ -20,32 +21,29 @@ let
|
|||
nixosModules = names: names |> listify |> map (n: inputs.${n}.nixosModules.default);
|
||||
selfModules = names: names |> listify |> map (n: self.nixosModules.${n});
|
||||
|
||||
# generate anonymous module to set oizys settings from existing plaintext files
|
||||
|
||||
commonSpecialArgs = {
|
||||
inherit
|
||||
self
|
||||
inputs
|
||||
lib
|
||||
flake
|
||||
enabled
|
||||
;
|
||||
};
|
||||
|
||||
mkIso = nixosSystem {
|
||||
modules =
|
||||
[
|
||||
{ nixpkgs.hostPlatform = "x86_64-linux"; }
|
||||
]
|
||||
++ (nixosModules "lix-module")
|
||||
++ (selfModules "essentials|iso");
|
||||
system = "x86_64-linux";
|
||||
modules = (nixosModules "lix-module") ++ (selfModules "nix|essentials|iso");
|
||||
specialArgs = commonSpecialArgs;
|
||||
};
|
||||
|
||||
mkSystem =
|
||||
hostName:
|
||||
nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules =
|
||||
[
|
||||
{ nixpkgs.hostPlatform = "x86_64-linux"; }
|
||||
]
|
||||
++ (selfModules ''oizys'')
|
||||
++ (nixosModules ''lix-module|sops-nix'')
|
||||
|
|
@ -53,6 +51,7 @@ let
|
|||
|
||||
specialArgs = commonSpecialArgs // {
|
||||
inherit
|
||||
flake
|
||||
mkDefaultOizysModule
|
||||
mkOizysModule
|
||||
listify
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
self,
|
||||
flake,
|
||||
enabled,
|
||||
...
|
||||
}:
|
||||
|
|
@ -21,47 +19,5 @@
|
|||
wget
|
||||
curl
|
||||
htop
|
||||
|
||||
(flake.pkg "self")
|
||||
|
||||
pkgs.nix-output-monitor
|
||||
];
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nix = {
|
||||
optimise.automatic = true;
|
||||
gc = {
|
||||
automatic = true;
|
||||
dates = "weekly";
|
||||
options = "--delete-older-than 7d";
|
||||
};
|
||||
|
||||
# use the same nixpkgs for nix run "nixpkgs#hello" style commands
|
||||
registry.nixpkgs.flake = inputs.nixpkgs;
|
||||
};
|
||||
|
||||
nix = {
|
||||
settings = {
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
"pipe-operator"
|
||||
];
|
||||
use-xdg-base-directories = true;
|
||||
trusted-users = [ "@wheel" ];
|
||||
accept-flake-config = true;
|
||||
extra-substituters = [
|
||||
"https://attic.dayl.in/oizys"
|
||||
"https://nixpkgs-wayland.cachix.org"
|
||||
# "https://hyprland.cachix.org"
|
||||
# "https://daylin.cachix.org"
|
||||
];
|
||||
extra-trusted-public-keys = [
|
||||
"oizys:DSw3mwVMM/Y+PXSVpkDlU5dLwlORuiJRGPkwr5INSMc="
|
||||
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
|
||||
# "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||
# "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
lib,
|
||||
enabled,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) makeBinPath;
|
||||
in
|
||||
{
|
||||
imports = [ inputs.nix-index-database.nixosModules.nix-index ];
|
||||
|
||||
# https://dataswamp.org/~solene/2022-07-20-nixos-flakes-command-sync-with-system.html#_nix-shell_vs_nix_shell
|
||||
# use the same nixpkgs for nix-shell -p hello style commands
|
||||
# I don't know that this is necesary...
|
||||
# nix.nixPath = [ "nixpkgs=/etc/channels/nixpkgs" ];
|
||||
# environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath;
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.nixd
|
||||
pkgs.nixfmt-rfc-style
|
||||
];
|
||||
|
||||
programs.nix-index-database.comma = enabled;
|
||||
|
||||
# nix-index didn't like this being enabled?
|
||||
programs.command-not-found.enable = false;
|
||||
|
||||
# I'm getting errors related to a non-existent nix-index?
|
||||
programs.nix-index.enableZshIntegration = false;
|
||||
programs.nix-index.enableBashIntegration = false;
|
||||
programs.nix-index.enableFishIntegration = false;
|
||||
|
||||
system.activationScripts.diff = ''
|
||||
if [[ -e /run/current-system ]]; then
|
||||
PATH=$PATH:${
|
||||
makeBinPath [
|
||||
pkgs.nvd
|
||||
pkgs.nix
|
||||
]
|
||||
}
|
||||
nvd diff /run/current-system "$systemConfig"
|
||||
fi
|
||||
'';
|
||||
|
||||
}
|
||||
89
modules/nix.nix
Normal file
89
modules/nix.nix
Normal file
|
|
@ -0,0 +1,89 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
lib,
|
||||
enabled,
|
||||
flake,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) makeBinPath;
|
||||
in
|
||||
{
|
||||
imports = [ inputs.nix-index-database.nixosModules.nix-index ];
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
# nix.package = pkgs.nixVersions.latest;
|
||||
nix = {
|
||||
settings = {
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
"pipe-operator"
|
||||
];
|
||||
use-xdg-base-directories = true;
|
||||
};
|
||||
|
||||
optimise.automatic = true;
|
||||
gc = {
|
||||
automatic = true;
|
||||
dates = "weekly";
|
||||
options = "--delete-older-than 7d";
|
||||
};
|
||||
|
||||
# use the same nixpkgs for nix run "nixpkgs#hello" style commands
|
||||
registry.nixpkgs.flake = inputs.nixpkgs;
|
||||
};
|
||||
|
||||
# https://dataswamp.org/~solene/2022-07-20-nixos-flakes-command-sync-with-system.html#_nix-shell_vs_nix_shell
|
||||
# use the same nixpkgs for nix-shell -p hello style commands
|
||||
# I don't know that this is necesary...
|
||||
# nix.nixPath = [ "nixpkgs=/etc/channels/nixpkgs" ];
|
||||
# environment.etc."channels/nixpkgs".source = inputs.nixpkgs.outPath;
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.nixd
|
||||
pkgs.nixfmt-rfc-style
|
||||
pkgs.nix-output-monitor
|
||||
(flake.pkg "self")
|
||||
];
|
||||
|
||||
programs.nix-index-database.comma = enabled;
|
||||
|
||||
# nix-index didn't like this being enabled?
|
||||
programs.command-not-found.enable = false;
|
||||
|
||||
# I'm getting errors related to a non-existent nix-index?
|
||||
programs.nix-index.enableZshIntegration = false;
|
||||
programs.nix-index.enableBashIntegration = false;
|
||||
programs.nix-index.enableFishIntegration = false;
|
||||
|
||||
system.activationScripts.diff = ''
|
||||
if [[ -e /run/current-system ]]; then
|
||||
PATH=$PATH:${
|
||||
makeBinPath [
|
||||
pkgs.nvd
|
||||
pkgs.nix
|
||||
]
|
||||
}
|
||||
nvd diff /run/current-system "$systemConfig"
|
||||
fi
|
||||
'';
|
||||
|
||||
nix.settings = {
|
||||
trusted-users = [ "@wheel" ];
|
||||
accept-flake-config = true;
|
||||
extra-substituters = [
|
||||
"https://attic.dayl.in/oizys"
|
||||
"https://nixpkgs-wayland.cachix.org"
|
||||
# "https://hyprland.cachix.org"
|
||||
# "https://daylin.cachix.org"
|
||||
];
|
||||
extra-trusted-public-keys = [
|
||||
"oizys:DSw3mwVMM/Y+PXSVpkDlU5dLwlORuiJRGPkwr5INSMc="
|
||||
"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
|
||||
# "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||
# "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -19,9 +19,9 @@ in
|
|||
imports = with self.nixosModules; [
|
||||
users
|
||||
runes
|
||||
essentials
|
||||
nix
|
||||
|
||||
nix-improved
|
||||
essentials
|
||||
cli
|
||||
nvim
|
||||
vpn
|
||||
|
|
|
|||
|
|
@ -1,12 +1,4 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit (lib) flakeFromSystem;
|
||||
flake = flakeFromSystem pkgs.system;
|
||||
in
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
nimlangserver = pkgs.callPackage ./nim/nimlangserver { };
|
||||
procs = pkgs.callPackage ./nim/procs { };
|
||||
|
|
@ -15,13 +7,4 @@ in
|
|||
distrobox = pkgs.callPackage ./distrobox { };
|
||||
|
||||
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"
|
||||
])
|
||||
|
|
|
|||
|
|
@ -47,10 +47,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||
'';
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion \
|
||||
--cmd distrbox \
|
||||
--zsh completions/zsh/_distrobox \
|
||||
--bash completions/bash/distrbox
|
||||
ls completions/zsh
|
||||
installShellCompletion --cmd distrbox --zsh completions/zsh/_distrobox
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
}:
|
||||
buildNimblePackage {
|
||||
name = "oizys";
|
||||
version = "unstable";
|
||||
verions = "unstable";
|
||||
src = lib.cleanSource ./.;
|
||||
nativeBuildInputs = [ openssl ];
|
||||
nimbleDepsHash = "sha256-dFJw/m7D5UFUrHH7exsyHknt8WHIK1QIQATNd5l7FZA=";
|
||||
|
|
|
|||
|
|
@ -56,28 +56,6 @@ proc runCmdCapt*(
|
|||
|
||||
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*(
|
||||
cmd: string,
|
||||
msg: string = "",
|
||||
|
|
@ -89,7 +67,8 @@ proc runCmdCaptWithSpinner*(
|
|||
with(Dots2, msg):
|
||||
(output, err, code) = runCmdCapt(cmd, capture)
|
||||
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"
|
||||
quit code
|
||||
return (output, err)
|
||||
|
|
|
|||
|
|
@ -389,7 +389,6 @@ proc nixBuildWithCache*(name: string, rest:seq[string], service: string, jobs: i
|
|||
if isCi():
|
||||
reportResults(results)
|
||||
|
||||
if outs.len > 0:
|
||||
# TODO: push after build not at once?
|
||||
var cmd = service
|
||||
cmd.addArg "push"
|
||||
|
|
|
|||
Loading…
Reference in a new issue