daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-12-24 20:10:43 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:3bc01c914342900cb37aa3b9a50afe912cfc38d4
Branches Tags
daylin:main
daylin:flake-lock
..
compare: daylin:2e4e12f36949c1cd41ad82842293b5b76c9d9ced
Branches Tags
daylin:flake-lock
daylin:main

6 commits
3bc01c9143 ... 2e4e12f369

Author SHA1 Message Date
Daylin Morgan
2e4e12f369
pre-build oizys 2024-08-07 13:08:29 -05:00
Daylin Morgan
617ae20642
write info to step summary 2024-08-07 13:07:33 -05:00
Daylin Morgan
0beb4d04bb
don't run on push 2024-08-07 12:58:59 -05:00
Daylin Morgan
8e9fde6967
linting 2024-08-07 12:53:39 -05:00
Daylin Morgan
b6bbdb51fb
auto activate hyprland 2024-08-07 12:53:39 -05:00
daylin-bot
4b181be761 flake.lock: Update 
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=b0a70f63e3865eaa77f0b78a04b230aa583bc95c' (2024-08-06)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=ea728315410e220d73a993f17c83ae9dc9be9015' (2024-08-07)
• Updated input 'lix':
    'f84997cbef.tar.gz?narHash=sha256-cEemTAXvhRcjn7XxujIRglqEfAFgdlNulkRSFskowbo%3D' (2024-08-06)
  → 'ec7552ff74.tar.gz?narHash=sha256-fn8r4zVTCfLo1ruMbmzDB08N2giu3zWw/na2Jn/X6GQ%3D' (2024-08-07)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/d33cf80b603b3d0cddb48f9816cae707a59e2334' (2024-08-06)
  → 'github:nixos/nixpkgs/2a13929e1f191b3690dd2f2db13098b04adb9043' (2024-08-06)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/423d21c157c2a7b384ae9c766e25759576dceb87' (2024-08-06)
  → 'github:nix-community/nixpkgs-wayland/5acf5ce79d80e23a2426b8a553a4d4b5996fef46' (2024-08-07)
• Updated input 'pixi':
    'github:daylinmorgan/pixi-flake/433b4c14e9dc9ed8b0fb4d36ff7a092b8d6fa12e' (2024-07-22)
  → 'github:daylinmorgan/pixi-flake/7a3e2a90d0f35170c1a95cc194a3ba81acd5b63d' (2024-08-07)
• Updated input 'pixi/pixi-source':
    'github:prefix-dev/pixi/68062d9582b4c14c63f17791b96620908d4148be' (2024-07-22)
  → 'github:prefix-dev/pixi/608a65d977b9d87bae71c747f77989ad01c76ada' (2024-08-07)
• Updated input 'roc':
    'github:roc-lang/roc/13f60cde09ef01c003fe362bf46e592a0f4ae7c6' (2024-08-05)
  → 'github:roc-lang/roc/698bbc3cf1c279baf76b6015754aab58d5ffeffb' (2024-08-07)
• Updated input 'zig2nix':
    'github:Cloudef/zig2nix/32c6285061bbab4920b020ec9e9f4aa5c9a81750' (2024-08-06)
  → 'github:Cloudef/zig2nix/5a0307b91ad2cd6c60fd5817b6a88108e254730a' (2024-08-07)
• Updated input 'zls':
    'github:zigtools/zls/74b5a00f67ab4e5a848646411779221e6cc24b87' (2024-08-06)
  → 'github:zigtools/zls/d8084a342f40b444addf772fdef36a589299ebe6' (2024-08-06)
 2024-08-07 16:46:51 +00:00
9 changed files with 73 additions and 37 deletions
Show stats Expand all files Collapse all files

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

@ -51,6 +51,9 @@ jobs:
echo '${{ inputs.lockFile }}' > flake.lock echo '${{ inputs.lockFile }}' > flake.lock
git diff git diff
- name: Pre-build Oizys
run: nix build .
- name: Build - name: Build
run: | run: |
nix run . \ nix run . \

6
.github/workflows/push.yml vendored
View file

@ -1,10 +1,12 @@
name: Build NixOS name: Build NixOS
on: on:
push: # push:
# paths-ignore:
# - '**/*.md'
pull_request:
paths-ignore: paths-ignore:
- '**/*.md' - '**/*.md'
pull_request:
branches: branches:
- main - main

9
.github/workflows/update.yml vendored
View file

@ -37,6 +37,9 @@ jobs:
nix flake update --commit-lock-file 2>> $GITHUB_STEP_SUMMARY nix flake update --commit-lock-file 2>> $GITHUB_STEP_SUMMARY
printf '```\n' >> $GITHUB_STEP_SUMMARY printf '```\n' >> $GITHUB_STEP_SUMMARY
- name: Pre-build oizys
run: nix build .
- name: Build - name: Build
run: | run: |
nix run . \ nix run . \
@ -79,6 +82,9 @@ jobs:
with: with:
purge-packages: 'true' purge-packages: 'true'
- name: Pre-build oizys
run: nix build .
- name: Build - name: Build
run: | run: |
@ -94,6 +100,9 @@ jobs:
- run: git checkout flake-lock - run: git checkout flake-lock
- name: Pre-build oizys
run: nix build .
- name: Build Updated - name: Build Updated
run: | run: |
system_attr=$(nix run . -- output --host "${{ matrix.host }}" --flake .) system_attr=$(nix run . -- output --host "${{ matrix.host }}" --flake .)

60
flake.lock
View file

@ -341,11 +341,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1722956902, "lastModified": 1723043089,
"narHash": "sha256-g3cAlVmRtnyqMZw88MKqVNM8eU88XzgNAlXdTkym5q8=", "narHash": "sha256-b01LQD32/xakBOFxabj8Mtz37ekvFwrM74VKNssUnko=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "b0a70f63e3865eaa77f0b78a04b230aa583bc95c", "rev": "ea728315410e220d73a993f17c83ae9dc9be9015",
"revCount": 5055, "revCount": 5067,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -534,11 +534,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1722957485, "lastModified": 1723036070,
"narHash": "sha256-cEemTAXvhRcjn7XxujIRglqEfAFgdlNulkRSFskowbo=", "narHash": "sha256-fn8r4zVTCfLo1ruMbmzDB08N2giu3zWw/na2Jn/X6GQ=",
"rev": "f84997cbefb2f2dd99e48f0ad39f747ed83d69e9", "rev": "ec7552ff7411592305d28ec4bfcb4ea55866ab36",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f84997cbefb2f2dd99e48f0ad39f747ed83d69e9.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ec7552ff7411592305d28ec4bfcb4ea55866ab36.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -715,11 +715,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1722928655, "lastModified": 1723043911,
"narHash": "sha256-2BAfUaRzrhHwT/JodTq++DUf/nljgoFEc5A79SS8ydU=", "narHash": "sha256-JAYd5Tq1AmrGK9MBup+WK6dq3rIvkpUHFAgBJ3d8irY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "423d21c157c2a7b384ae9c766e25759576dceb87", "rev": "5acf5ce79d80e23a2426b8a553a4d4b5996fef46",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -762,11 +762,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1722926584, "lastModified": 1722957468,
"narHash": "sha256-sLA+lfCxTkXf4o3JVxcfe+w9kAzauGfEnJ9roNbNng8=", "narHash": "sha256-SQ0TCC4aklOhN/OzcztrKqDLY8SjpIZcyvTulzhDXs0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d33cf80b603b3d0cddb48f9816cae707a59e2334", "rev": "2a13929e1f191b3690dd2f2db13098b04adb9043",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -816,11 +816,11 @@
"pixi-source": "pixi-source" "pixi-source": "pixi-source"
}, },
"locked": { "locked": {
"lastModified": 1721665957, "lastModified": 1723049033,
"narHash": "sha256-Kq5rZ5wRGLT/a7Gsdi0xBm6+FjPbHgpGUOWmYiZfv1A=", "narHash": "sha256-JMVvLQX+oJ5Gfck419poXJCIKOxWsZGRC23ize6hT6Y=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "pixi-flake", "repo": "pixi-flake",
"rev": "433b4c14e9dc9ed8b0fb4d36ff7a092b8d6fa12e", "rev": "7a3e2a90d0f35170c1a95cc194a3ba81acd5b63d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -832,16 +832,16 @@
"pixi-source": { "pixi-source": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1721638392, "lastModified": 1723023748,
"narHash": "sha256-N8nNB+FOD8n+W7jFYhq9JoEnLOq6xLMLBC77DiK3RLU=", "narHash": "sha256-m1qlDxZBEDUMNV+gRX2bbEdvBRp4lJv7C2ZZlEUA5Dg=",
"owner": "prefix-dev", "owner": "prefix-dev",
"repo": "pixi", "repo": "pixi",
"rev": "68062d9582b4c14c63f17791b96620908d4148be", "rev": "608a65d977b9d87bae71c747f77989ad01c76ada",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "prefix-dev", "owner": "prefix-dev",
"ref": "v0.26.1", "ref": "v0.27.0",
"repo": "pixi", "repo": "pixi",
"type": "github" "type": "github"
} }
@ -857,11 +857,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1722856566, "lastModified": 1723012587,
"narHash": "sha256-Yr9P/TyxgVVwgXIiu96up2hgWjMR0zWPbaihyNXp+r0=", "narHash": "sha256-IxV/7YKqeFoBFc1SXgUPdnWi34JkBieSzWM+gP8YzWI=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "13f60cde09ef01c003fe362bf46e592a0f4ae7c6", "rev": "698bbc3cf1c279baf76b6015754aab58d5ffeffb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1156,11 +1156,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722907357, "lastModified": 1722993798,
"narHash": "sha256-alp8wfWJtxLXKNuVXPjhWFtrGhp10/3Nle//1RkapgU=", "narHash": "sha256-cXzpRh+nUTBqo4mU+jzG4otZcpTfo29DC0apTmH2gtU=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "32c6285061bbab4920b020ec9e9f4aa5c9a81750", "rev": "5a0307b91ad2cd6c60fd5817b6a88108e254730a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1180,11 +1180,11 @@
"zig-overlay": "zig-overlay" "zig-overlay": "zig-overlay"
}, },
"locked": { "locked": {
"lastModified": 1722919037, "lastModified": 1722987529,
"narHash": "sha256-h8BG+XOCli8++tCojSo/cF39AIixVj3mO94b4cuqT94=", "narHash": "sha256-r7tnq70psZQXfLlDj+XzidBj352vfQFrICC7hfKHw7M=",
"owner": "zigtools", "owner": "zigtools",
"repo": "zls", "repo": "zls",
"rev": "74b5a00f67ab4e5a848646411779221e6cc24b87", "rev": "d8084a342f40b444addf772fdef36a589299ebe6",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
hosts/othalan/system.nix
View file

@ -10,7 +10,10 @@
hardware.sane = enabled // { hardware.sane = enabled // {
extraBackends = [ pkgs.hplipWithPlugin ]; 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/lenovo/thinkpad/x1/9th-gen/default.nix
# https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/common/pc/ssd/default.nix # https://github.com/NixOS/nixos-hardware/blob/c478b3d56969006e015e55aaece4931f3600c1b2/common/pc/ssd/default.nix

3
lib/generators.nix
View file

@ -12,9 +12,6 @@ let
mkOizysModule mkOizysModule
enabled enabled
enableAttrs enableAttrs
pkgsFromSystem
pkgFromSystem
overlayFrom
isNixFile isNixFile
flakeFromSystem flakeFromSystem
; ;

17
modules/desktop/window-managers/hyprland.nix
View file

@ -6,6 +6,13 @@
flake, flake,
... ...
}: }:
let
activate-snippet = ''
if [ -z "$WAYLAND_DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
exec Hyprland
fi
'';
in
mkOizysModule config "hyprland" { mkOizysModule config "hyprland" {
programs.hyprland = enabled; programs.hyprland = enabled;
@ -53,6 +60,16 @@ mkOizysModule config "hyprland" {
# dunst # 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 = [ nixpkgs.overlays = [
(flake.overlay "hyprland-contrib") (flake.overlay "hyprland-contrib")
# (overlayFrom "nixpkgs-wayland") # (overlayFrom "nixpkgs-wayland")

2
pkgs/oizys/cmd/dry.go
View file

@ -10,7 +10,7 @@ var dryCmd = &cobra.Command{
Use: "dry", Use: "dry",
Short: "poor man's nix flake check", Short: "poor man's nix flake check",
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
oizys.Dry( minimal, args...) oizys.Dry(minimal, args...)
}, },
} }

5
pkgs/oizys/internal/oizys/main.go
View file

@ -256,6 +256,11 @@ func NixBuild(minimal bool, rest ...string) {
log.Info("nothing to build. exiting...") log.Info("nothing to build. exiting...")
os.Exit(0) 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")...) cmd.Args = append(cmd.Args, append(drvs, "--no-link")...)
} }
if !o.inCI { if !o.inCI {