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:a8215ed290c0d2ad0eda33046f21c0a9620fc5e1
Branches Tags
daylin:main
daylin:flake-lock
daylin:lix-beta
daylin:lix-beta-with-nix
..
compare: daylin:10bc61746e77b2df7711a1c70608e41567ea13dc
Branches Tags
daylin:flake-lock
daylin:main
daylin:lix-beta
daylin:lix-beta-with-nix

No commits in common. "a8215ed290c0d2ad0eda33046f21c0a9620fc5e1" and "10bc61746e77b2df7711a1c70608e41567ea13dc" have entirely different histories.
a8215ed290 ... 10bc61746e

10 changed files with 514 additions and 269 deletions
Show stats Expand all files Collapse all files

8
.github/workflows/build.yml vendored
View file

@ -6,15 +6,11 @@ on:
hosts: hosts:
description: "list of hosts to build" description: "list of hosts to build"
required: true required: true
type: string
default: "othalan,algiz" default: "othalan,algiz"
type: string
lockFile: lockFile:
description: "flake.lock file" description: "flake.lock file"
type: string type: string
extraArgs:
description: "postional args forwared to nix"
type: string
default: "--keep-going"
workflow_call: workflow_call:
inputs: inputs:
@ -58,4 +54,4 @@ jobs:
--flake . --flake .
-vv -vv
-- --
${{ inputs.extraArgs }} --keep-going

457
flake.lock
View file

@ -75,6 +75,23 @@
} }
}, },
"flake-compat": { "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": { "locked": {
"lastModified": 1733328505, "lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
@ -89,9 +106,46 @@
"type": "github" "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": [
"nixpkgs-wayland",
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1736143030,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -111,6 +165,24 @@
"inputs": { "inputs": {
"systems": "systems_3" "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": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
@ -140,6 +212,28 @@
"type": "github" "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": { "hyprcursor": {
"inputs": { "inputs": {
"hyprlang": [ "hyprlang": [
@ -211,16 +305,16 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"pre-commit-hooks": [], "pre-commit-hooks": "pre-commit-hooks",
"systems": "systems_2", "systems": "systems",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1737038559, "lastModified": 1736873552,
"narHash": "sha256-iSJIeZz2Bto/RiZN1scp4hfvnEAc+IhIRGxD2V3iu+c=", "narHash": "sha256-lGZv+YcdDXYowKJf7vaeu97o7JKFzTL/vzS8WxTT+UM=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "0dc7367a7006cc3cc877d52bf34c4998144bff84", "rev": "25add26881d7b98d2b80eb7a95d3aee0449b72b9",
"revCount": 5674, "revCount": 5672,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -336,9 +430,7 @@
}, },
"hyprman": { "hyprman": {
"inputs": { "inputs": {
"nim2nix": [ "nim2nix": "nim2nix",
"nim2nix"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -409,9 +501,7 @@
}, },
"jj": { "jj": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": "flake-utils",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -434,12 +524,8 @@
}, },
"lib-aggregate": { "lib-aggregate": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": "flake-utils_3",
"flake-utils" "nixpkgs-lib": "nixpkgs-lib"
],
"nixpkgs-lib": [
"nixpkgs-lib"
]
}, },
"locked": { "locked": {
"lastModified": 1736684024, "lastModified": 1736684024,
@ -458,38 +544,36 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737086202, "lastModified": 1729298361,
"narHash": "sha256-33tcNERQt1R7tr/W7pvQj8R6NJktyTOKMIfY16RHLK8=", "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=",
"rev": "0d14c2b67a407825e3427bf079b31de069d9653a", "rev": "ad9d06f7838a25beec425ff406fe68721fef73be",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/0d14c2b67a407825e3427bf079b31de069d9653a.tar.gz?rev=0d14c2b67a407825e3427bf079b31de069d9653a" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be"
}, },
"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.91.1.tar.gz"
} }
}, },
"lix-module": { "lix-module": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"lix": [ "lix": "lix",
"lix"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1733522213, "lastModified": 1729360442,
"narHash": "sha256-H+Pk19MzvI/TAbXWimUPZAoKkD56OSyxJBm8lVIA5n0=", "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=",
"rev": "c374ebf5548c7b6d4bf884369a5b6879cfc916ea", "rev": "9098ac95768f7006d7e070b88bae76939f6034e6",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/c374ebf5548c7b6d4bf884369a5b6879cfc916ea.tar.gz?rev=c374ebf5548c7b6d4bf884369a5b6879cfc916ea" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6"
}, },
"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.91.1-1.tar.gz"
} }
}, },
"my-nixpkgs": { "my-nixpkgs": {
@ -511,6 +595,7 @@
"nim2nix": { "nim2nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprman",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -528,6 +613,87 @@
"type": "github" "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": { "nix-index-database": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -550,12 +716,8 @@
}, },
"nixos-wsl": { "nixos-wsl": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": "flake-compat_2",
"flake-compat" "nixpkgs": "nixpkgs"
],
"nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1736095716, "lastModified": 1736095716,
@ -573,16 +735,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736883708, "lastModified": 1733384649,
"narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", "narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", "rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -604,21 +766,17 @@
}, },
"nixpkgs-wayland": { "nixpkgs-wayland": {
"inputs": { "inputs": {
"flake-compat": [], "flake-compat": "flake-compat_3",
"lib-aggregate": [ "lib-aggregate": "lib-aggregate",
"lib-aggregate" "nix-eval-jobs": "nix-eval-jobs",
], "nixpkgs": "nixpkgs_4"
"nix-eval-jobs": [],
"nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1736965550, "lastModified": 1736879154,
"narHash": "sha256-u34e02DgidNBbJ2ZPUWlNZeqQTo7tCGT8LN9dZphNAY=", "narHash": "sha256-aN0v2sr9o2zVoolZvoxOZuRRiACTRN1ySKZxDyvynxc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "8f3a889a1bb60d58f42fc671d8a0b73496ede51c", "rev": "07d1519ff6abaf37209529e03da075f990da2479",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -627,6 +785,86 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"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_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": { "pixi": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -647,30 +885,48 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"NixVirt": "NixVirt", "NixVirt": "NixVirt",
"f1multiviewer": "f1multiviewer", "f1multiviewer": "f1multiviewer",
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprland-contrib": "hyprland-contrib", "hyprland-contrib": "hyprland-contrib",
"hyprman": "hyprman", "hyprman": "hyprman",
"jj": "jj", "jj": "jj",
"lib-aggregate": "lib-aggregate",
"lix": "lix",
"lix-module": "lix-module", "lix-module": "lix-module",
"my-nixpkgs": "my-nixpkgs", "my-nixpkgs": "my-nixpkgs",
"nim2nix": "nim2nix", "nim2nix": "nim2nix_2",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"nixpkgs-lib": "nixpkgs-lib",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"pixi": "pixi", "pixi": "pixi",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stable": "stable", "stable": "stable",
"treefmt-nix": "treefmt-nix", "treefmt-nix": "treefmt-nix_2",
"tsm": "tsm", "tsm": "tsm",
"utils": "utils" "utils": "utils"
} }
@ -733,21 +989,6 @@
} }
}, },
"systems": { "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": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -762,6 +1003,21 @@
"type": "github" "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": { "systems_3": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@ -777,18 +1033,53 @@
"type": "github" "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": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-wayland",
"nix-eval-jobs",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1737054102, "lastModified": 1736154270,
"narHash": "sha256-saLiCRQ5RtdTnznT/fja7GxcYRAzeY3k8S+IF/2s/2A=", "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "97871d416166803134ba64597a1006f3f670fbde", "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1736154270,
"narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -799,9 +1090,7 @@
}, },
"tsm": { "tsm": {
"inputs": { "inputs": {
"nim2nix": [ "nim2nix": "nim2nix_3",
"nim2nix"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]

108
flake.nix
View file

@ -7,95 +7,73 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
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";
treefmt-nix.url = "github:numtide/treefmt-nix";
lix = { nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland";
url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; nixos-wsl.url = "github:nix-community/NixOS-WSL";
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";
};
# 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.91.1-1.tar.gz";
# inputs.nixpkgs.follows = "nixpkgs";
# inputs.flake-utils.follows = "flake-utils";
# };
sops-nix = {
url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-index-database = { nix-index-database = {
url = "github:nix-community/nix-index-database"; url = "github:nix-community/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
treefmt-nix = { sops-nix = {
url = "github:numtide/treefmt-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-wsl = { # lix = {
url = "github:nix-community/NixOS-WSL"; # url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; # flake = false;
inputs.flake-compat.follows = "flake-compat"; # };
}; # lix-module = {
# url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz";
hyprland = { # inputs.nixpkgs.follows = "nixpkgs";
url = "git+https://github.com/hyprwm/Hyprland/?submodules=1"; # inputs.lix.follows = "lix";
inputs.nixpkgs.follows = "nixpkgs"; # };
# inputs.systems.follows = "systems"; # lix is failing to build only on GHA?
inputs.pre-commit-hooks.follows = ""; # keep for when lix breaks :/
}; lix-module = {
hyprland-contrib = { url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz";
url = "github:hyprwm/contrib";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixpkgs-wayland = { # using nixpkgs version now
url = "github:nix-community/nixpkgs-wayland"; # # https://github.com/ghostty-org/ghostty/issues/2025
# breaks their cache... # ghostty = {
inputs.nixpkgs.follows = "nixpkgs"; # url = "git+https://github.com/ghostty-org/ghostty.git?ref=refs/tags/v1.0.1";
inputs.lib-aggregate.follows = "lib-aggregate"; # inputs = {
inputs.nix-eval-jobs.follows = ""; # nixpkgs-stable.follows = "nixpkgs";
inputs.flake-compat.follows = ""; # nixpkgs-unstable.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 = { f1multiviewer = {
url = "github:daylinmorgan/f1multiviewer-flake"; url = "github:daylinmorgan/f1multiviewer-flake";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
tsm = { tsm = {
url = "github:daylinmorgan/tsm?dir=nix"; url = "github:daylinmorgan/tsm?dir=nix";
inputs = { inputs.nixpkgs.follows = "nixpkgs";
nixpkgs.follows = "nixpkgs";
nim2nix.follows = "nim2nix";
};
}; };
hyprman = { hyprman = {
url = "git+https://git.dayl.in/daylin/hyprman.git"; url = "git+https://git.dayl.in/daylin/hyprman.git";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.nim2nix.follows = "nim2nix";
}; };
utils = { utils = {
url = "git+https://git.dayl.in/daylin/utils.git"; url = "git+https://git.dayl.in/daylin/utils.git";
inputs = { inputs.nixpkgs.follows = "nixpkgs";
nixpkgs.follows = "nixpkgs"; inputs.nim2nix.follows = "nim2nix";
nim2nix.follows = "nim2nix";
};
}; };
nim2nix = { nim2nix = {
url = "github:daylinmorgan/nim2nix"; url = "github:daylinmorgan/nim2nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
pixi = { pixi = {
url = "github:daylinmorgan/pixi-flake"; url = "github:daylinmorgan/pixi-flake";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -104,7 +82,6 @@
jj = { jj = {
url = "github:martinvonz/jj/v0.25.0"; url = "github:martinvonz/jj/v0.25.0";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
}; };
NixVirt = { NixVirt = {
@ -113,21 +90,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# included to reduce flake.lock size
flake-utils = {
url = "github:numtide/flake-utils";
};
flake-compat = {
url = "github:edolstra/flake-compat";
};
lib-aggregate = {
url = "github:nix-community/lib-aggregate";
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs-lib.follows = "nixpkgs-lib";
};
nixpkgs-lib.url = "github:nix-community/nixpkgs.lib";
# roc = { # roc = {
# url = "github:roc-lang/roc"; # url = "github:roc-lang/roc";
# inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";

10
lib/checks.nix
View file

@ -36,11 +36,11 @@ in
swww swww
nixVersions.git nixVersions.git
]) ])
# ++ [ ++ [
# (flake.pkgs "roc").full (flake.pkgs "roc").full
# (flake.pkgs "zig-overlay").master (flake.pkgs "zig-overlay").master
# (flake.pkg "zls") (flake.pkg "zls")
# ] ]
++ hyprPackages ++ hyprPackages
++ selfPackages; ++ selfPackages;
} }

1
lib/default.nix
View file

@ -105,6 +105,7 @@ let
} }
); );
formatter = forAllSystems (pkgs: (evalTreeFmt pkgs).config.build.wrapper); formatter = forAllSystems (pkgs: (evalTreeFmt pkgs).config.build.wrapper);
# formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
}; };
in in
{ {

15
lib/generators.nix
View file

@ -5,6 +5,7 @@
... ...
}: }:
let let
inherit (builtins) filter;
inherit (lib) inherit (lib)
nixosSystem nixosSystem
mkDefaultOizysModule mkDefaultOizysModule
@ -20,32 +21,29 @@ let
nixosModules = names: names |> listify |> map (n: inputs.${n}.nixosModules.default); nixosModules = names: names |> listify |> map (n: inputs.${n}.nixosModules.default);
selfModules = names: names |> listify |> map (n: self.nixosModules.${n}); selfModules = names: names |> listify |> map (n: self.nixosModules.${n});
# generate anonymous module to set oizys settings from existing plaintext files
commonSpecialArgs = { commonSpecialArgs = {
inherit inherit
self self
inputs inputs
lib lib
flake
enabled enabled
; ;
}; };
mkIso = nixosSystem { mkIso = nixosSystem {
modules = system = "x86_64-linux";
[ modules = (nixosModules "lix-module") ++ (selfModules "nix|essentials|iso");
{ nixpkgs.hostPlatform = "x86_64-linux"; }
]
++ (nixosModules "lix-module")
++ (selfModules "essentials|iso");
specialArgs = commonSpecialArgs; specialArgs = commonSpecialArgs;
}; };
mkSystem = mkSystem =
hostName: hostName:
nixosSystem { nixosSystem {
system = "x86_64-linux";
modules = modules =
[ [
{ nixpkgs.hostPlatform = "x86_64-linux"; }
] ]
++ (selfModules ''oizys'') ++ (selfModules ''oizys'')
++ (nixosModules ''lix-module|sops-nix'') ++ (nixosModules ''lix-module|sops-nix'')
@ -53,6 +51,7 @@ let
specialArgs = commonSpecialArgs // { specialArgs = commonSpecialArgs // {
inherit inherit
flake
mkDefaultOizysModule mkDefaultOizysModule
mkOizysModule mkOizysModule
listify listify

44
modules/essentials.nix
View file

@ -1,8 +1,6 @@
{ {
inputs,
pkgs, pkgs,
self, self,
flake,
enabled, enabled,
... ...
}: }:
@ -21,47 +19,5 @@
wget wget
curl curl
htop 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="
];
};
};
} }

47
modules/nix-improved.nix
View file

@ -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
View 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="
];
};
}

4
modules/oizys.nix
View file

@ -19,9 +19,9 @@ in
imports = with self.nixosModules; [ imports = with self.nixosModules; [
users users
runes runes
essentials nix
nix-improved essentials
cli cli
nvim nvim
vpn vpn