mirror of
https://github.com/daylinmorgan/oizys.git
synced 2024-09-19 18:47:18 -05:00
Compare commits
No commits in common. "2e4e12f36949c1cd41ad82842293b5b76c9d9ced" and "3bc01c914342900cb37aa3b9a50afe912cfc38d4" have entirely different histories.
2e4e12f369
...
3bc01c9143
9 changed files with 37 additions and 73 deletions
3
.github/workflows/build.yml
vendored
3
.github/workflows/build.yml
vendored
|
|
@ -51,9 +51,6 @@ jobs:
|
|||
echo '${{ inputs.lockFile }}' > flake.lock
|
||||
git diff
|
||||
|
||||
- name: Pre-build Oizys
|
||||
run: nix build .
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
nix run . \
|
||||
|
|
|
|||
6
.github/workflows/push.yml
vendored
6
.github/workflows/push.yml
vendored
|
|
@ -1,12 +1,10 @@
|
|||
name: Build NixOS
|
||||
|
||||
on:
|
||||
# push:
|
||||
# paths-ignore:
|
||||
# - '**/*.md'
|
||||
pull_request:
|
||||
push:
|
||||
paths-ignore:
|
||||
- '**/*.md'
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
|
||||
|
|
|
|||
9
.github/workflows/update.yml
vendored
9
.github/workflows/update.yml
vendored
|
|
@ -37,9 +37,6 @@ jobs:
|
|||
nix flake update --commit-lock-file 2>> $GITHUB_STEP_SUMMARY
|
||||
printf '```\n' >> $GITHUB_STEP_SUMMARY
|
||||
|
||||
- name: Pre-build oizys
|
||||
run: nix build .
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
nix run . \
|
||||
|
|
@ -82,9 +79,6 @@ jobs:
|
|||
with:
|
||||
purge-packages: 'true'
|
||||
|
||||
- name: Pre-build oizys
|
||||
run: nix build .
|
||||
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
|
|
@ -100,9 +94,6 @@ jobs:
|
|||
|
||||
- run: git checkout flake-lock
|
||||
|
||||
- name: Pre-build oizys
|
||||
run: nix build .
|
||||
|
||||
- name: Build Updated
|
||||
run: |
|
||||
system_attr=$(nix run . -- output --host "${{ matrix.host }}" --flake .)
|
||||
|
|
|
|||
60
flake.lock
60
flake.lock
|
|
@ -341,11 +341,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723043089,
|
||||
"narHash": "sha256-b01LQD32/xakBOFxabj8Mtz37ekvFwrM74VKNssUnko=",
|
||||
"lastModified": 1722956902,
|
||||
"narHash": "sha256-g3cAlVmRtnyqMZw88MKqVNM8eU88XzgNAlXdTkym5q8=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "ea728315410e220d73a993f17c83ae9dc9be9015",
|
||||
"revCount": 5067,
|
||||
"rev": "b0a70f63e3865eaa77f0b78a04b230aa583bc95c",
|
||||
"revCount": 5055,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland/"
|
||||
|
|
@ -534,11 +534,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1723036070,
|
||||
"narHash": "sha256-fn8r4zVTCfLo1ruMbmzDB08N2giu3zWw/na2Jn/X6GQ=",
|
||||
"rev": "ec7552ff7411592305d28ec4bfcb4ea55866ab36",
|
||||
"lastModified": 1722957485,
|
||||
"narHash": "sha256-cEemTAXvhRcjn7XxujIRglqEfAFgdlNulkRSFskowbo=",
|
||||
"rev": "f84997cbefb2f2dd99e48f0ad39f747ed83d69e9",
|
||||
"type": "tarball",
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ec7552ff7411592305d28ec4bfcb4ea55866ab36.tar.gz"
|
||||
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f84997cbefb2f2dd99e48f0ad39f747ed83d69e9.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
|
|
@ -715,11 +715,11 @@
|
|||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723043911,
|
||||
"narHash": "sha256-JAYd5Tq1AmrGK9MBup+WK6dq3rIvkpUHFAgBJ3d8irY=",
|
||||
"lastModified": 1722928655,
|
||||
"narHash": "sha256-2BAfUaRzrhHwT/JodTq++DUf/nljgoFEc5A79SS8ydU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs-wayland",
|
||||
"rev": "5acf5ce79d80e23a2426b8a553a4d4b5996fef46",
|
||||
"rev": "423d21c157c2a7b384ae9c766e25759576dceb87",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -762,11 +762,11 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1722957468,
|
||||
"narHash": "sha256-SQ0TCC4aklOhN/OzcztrKqDLY8SjpIZcyvTulzhDXs0=",
|
||||
"lastModified": 1722926584,
|
||||
"narHash": "sha256-sLA+lfCxTkXf4o3JVxcfe+w9kAzauGfEnJ9roNbNng8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2a13929e1f191b3690dd2f2db13098b04adb9043",
|
||||
"rev": "d33cf80b603b3d0cddb48f9816cae707a59e2334",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -816,11 +816,11 @@
|
|||
"pixi-source": "pixi-source"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723049033,
|
||||
"narHash": "sha256-JMVvLQX+oJ5Gfck419poXJCIKOxWsZGRC23ize6hT6Y=",
|
||||
"lastModified": 1721665957,
|
||||
"narHash": "sha256-Kq5rZ5wRGLT/a7Gsdi0xBm6+FjPbHgpGUOWmYiZfv1A=",
|
||||
"owner": "daylinmorgan",
|
||||
"repo": "pixi-flake",
|
||||
"rev": "7a3e2a90d0f35170c1a95cc194a3ba81acd5b63d",
|
||||
"rev": "433b4c14e9dc9ed8b0fb4d36ff7a092b8d6fa12e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -832,16 +832,16 @@
|
|||
"pixi-source": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1723023748,
|
||||
"narHash": "sha256-m1qlDxZBEDUMNV+gRX2bbEdvBRp4lJv7C2ZZlEUA5Dg=",
|
||||
"lastModified": 1721638392,
|
||||
"narHash": "sha256-N8nNB+FOD8n+W7jFYhq9JoEnLOq6xLMLBC77DiK3RLU=",
|
||||
"owner": "prefix-dev",
|
||||
"repo": "pixi",
|
||||
"rev": "608a65d977b9d87bae71c747f77989ad01c76ada",
|
||||
"rev": "68062d9582b4c14c63f17791b96620908d4148be",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "prefix-dev",
|
||||
"ref": "v0.27.0",
|
||||
"ref": "v0.26.1",
|
||||
"repo": "pixi",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -857,11 +857,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1723012587,
|
||||
"narHash": "sha256-IxV/7YKqeFoBFc1SXgUPdnWi34JkBieSzWM+gP8YzWI=",
|
||||
"lastModified": 1722856566,
|
||||
"narHash": "sha256-Yr9P/TyxgVVwgXIiu96up2hgWjMR0zWPbaihyNXp+r0=",
|
||||
"owner": "roc-lang",
|
||||
"repo": "roc",
|
||||
"rev": "698bbc3cf1c279baf76b6015754aab58d5ffeffb",
|
||||
"rev": "13f60cde09ef01c003fe362bf46e592a0f4ae7c6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1156,11 +1156,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722993798,
|
||||
"narHash": "sha256-cXzpRh+nUTBqo4mU+jzG4otZcpTfo29DC0apTmH2gtU=",
|
||||
"lastModified": 1722907357,
|
||||
"narHash": "sha256-alp8wfWJtxLXKNuVXPjhWFtrGhp10/3Nle//1RkapgU=",
|
||||
"owner": "Cloudef",
|
||||
"repo": "zig2nix",
|
||||
"rev": "5a0307b91ad2cd6c60fd5817b6a88108e254730a",
|
||||
"rev": "32c6285061bbab4920b020ec9e9f4aa5c9a81750",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1180,11 +1180,11 @@
|
|||
"zig-overlay": "zig-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1722987529,
|
||||
"narHash": "sha256-r7tnq70psZQXfLlDj+XzidBj352vfQFrICC7hfKHw7M=",
|
||||
"lastModified": 1722919037,
|
||||
"narHash": "sha256-h8BG+XOCli8++tCojSo/cF39AIixVj3mO94b4cuqT94=",
|
||||
"owner": "zigtools",
|
||||
"repo": "zls",
|
||||
"rev": "d8084a342f40b444addf772fdef36a589299ebe6",
|
||||
"rev": "74b5a00f67ab4e5a848646411779221e6cc24b87",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -10,10 +10,7 @@
|
|||
hardware.sane = enabled // {
|
||||
extraBackends = [ pkgs.hplipWithPlugin ];
|
||||
};
|
||||
users.users.daylin.extraGroups = [
|
||||
"scanner"
|
||||
"lp"
|
||||
];
|
||||
users.users.daylin.extraGroups = ["scanner" "lp"];
|
||||
|
||||
# https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/lenovo/thinkpad/x1/9th-gen/default.nix
|
||||
# https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/common/pc/ssd/default.nix
|
||||
|
|
|
|||
|
|
@ -12,6 +12,9 @@ let
|
|||
mkOizysModule
|
||||
enabled
|
||||
enableAttrs
|
||||
pkgsFromSystem
|
||||
pkgFromSystem
|
||||
overlayFrom
|
||||
isNixFile
|
||||
flakeFromSystem
|
||||
;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,6 @@
|
|||
flake,
|
||||
...
|
||||
}:
|
||||
let
|
||||
activate-snippet = ''
|
||||
if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
|
||||
exec Hyprland
|
||||
fi
|
||||
'';
|
||||
in
|
||||
|
||||
mkOizysModule config "hyprland" {
|
||||
programs.hyprland = enabled;
|
||||
|
|
@ -60,16 +53,6 @@ mkOizysModule config "hyprland" {
|
|||
# dunst
|
||||
]);
|
||||
|
||||
services.getty = {
|
||||
extraArgs = [ "--skip-login" ];
|
||||
loginOptions = "-p -- ${config.oizys.user}";
|
||||
};
|
||||
|
||||
environment.etc = {
|
||||
"bashrc.local".text = activate-snippet;
|
||||
"zshenv.local".text = activate-snippet;
|
||||
};
|
||||
|
||||
nixpkgs.overlays = [
|
||||
(flake.overlay "hyprland-contrib")
|
||||
# (overlayFrom "nixpkgs-wayland")
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ var dryCmd = &cobra.Command{
|
|||
Use: "dry",
|
||||
Short: "poor man's nix flake check",
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
oizys.Dry(minimal, args...)
|
||||
oizys.Dry( minimal, args...)
|
||||
},
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -256,11 +256,6 @@ func NixBuild(minimal bool, rest ...string) {
|
|||
log.Info("nothing to build. exiting...")
|
||||
os.Exit(0)
|
||||
}
|
||||
if o.inCI {
|
||||
o.writeToGithubStepSummary("# Building Derivations:\n")
|
||||
// TODO: write as a markdown table with hash + name (without .drv)
|
||||
o.writeToGithubStepSummary(strings.Join(drvs, "\n"))
|
||||
}
|
||||
cmd.Args = append(cmd.Args, append(drvs, "--no-link")...)
|
||||
}
|
||||
if !o.inCI {
|
||||
|
|
|
|||
Loading…
Reference in a new issue