daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-11-09 20:33:15 -06:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: daylin:caab95d21f8f0c3d4a80a6f23dbfac9ad213e0d8
Branches Tags
daylin:main
daylin:flake-lock
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master
..
compare: daylin:7ffc03efe5bac50fe037f9103f2a94db0be29b7a
Branches Tags
daylin:flake-lock
daylin:main
daylin:oizys-cli-system-path
daylin:lix
daylin:update_flake_lock_action
daylin:laukaz
daylin:styx-stuff
daylin:algiz
daylin:master

1 commit
caab95d21f ... 7ffc03efe5

Author SHA1 Message Date
daylin-bot
7ffc03efe5 flake.lock: Update 
Flake lock file updates:

• Updated input 'lix':
    'f84997cbef.tar.gz?narHash=sha256-cEemTAXvhRcjn7XxujIRglqEfAFgdlNulkRSFskowbo%3D' (2024-08-06)
  → '2c48460850.tar.gz?narHash=sha256-cmGUqAeZuiiRB3Ja10gFMM4cjrSjdDbeuKnFWExb%2B1c%3D' (2024-08-06)
• 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/2c512b8dc9adc0ada535d23e6be30efafe09e81b' (2024-08-06)
• Updated input 'roc':
    'github:roc-lang/roc/13f60cde09ef01c003fe362bf46e592a0f4ae7c6' (2024-08-05)
  → 'github:roc-lang/roc/8032a988b3aa85f290a418f7e2d016175ebe8e1f' (2024-08-06)
• Updated input 'zls':
    'github:zigtools/zls/74b5a00f67ab4e5a848646411779221e6cc24b87' (2024-08-06)
  → 'github:zigtools/zls/d8084a342f40b444addf772fdef36a589299ebe6' (2024-08-06)
 2024-08-07 00:37:25 +00:00
9 changed files with 31 additions and 67 deletions
Show stats Expand all files Collapse all files

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

@ -51,9 +51,6 @@ 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,12 +1,10 @@
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,9 +37,6 @@ 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 . \
@ -82,9 +79,6 @@ jobs:
with: with:
purge-packages: 'true' purge-packages: 'true'
- name: Pre-build oizys
run: nix build .
- name: Build - name: Build
run: | run: |
@ -100,9 +94,6 @@ 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 .)

48
flake.lock
View file

@ -341,11 +341,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1723049685, "lastModified": 1722956902,
"narHash": "sha256-4XvkgHbUlkRXRsz+4aJr20+HtPlUfRwU+ddbKh417A0=", "narHash": "sha256-g3cAlVmRtnyqMZw88MKqVNM8eU88XzgNAlXdTkym5q8=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "2d552fbaa25f1457c3819521a2750dd30820271b", "rev": "b0a70f63e3865eaa77f0b78a04b230aa583bc95c",
"revCount": 5068, "revCount": 5055,
"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": 1723036070, "lastModified": 1722964233,
"narHash": "sha256-fn8r4zVTCfLo1ruMbmzDB08N2giu3zWw/na2Jn/X6GQ=", "narHash": "sha256-cmGUqAeZuiiRB3Ja10gFMM4cjrSjdDbeuKnFWExb+1c=",
"rev": "ec7552ff7411592305d28ec4bfcb4ea55866ab36", "rev": "2c48460850186e5fb8152e7882baf9e29bb5e884",
"type": "tarball", "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/2c48460850186e5fb8152e7882baf9e29bb5e884.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -715,11 +715,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1723043911, "lastModified": 1722986309,
"narHash": "sha256-JAYd5Tq1AmrGK9MBup+WK6dq3rIvkpUHFAgBJ3d8irY=", "narHash": "sha256-Veppi3c8c9XJ1CmgkOc5/oipPB/J8JPHbh3SHkMov3A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "5acf5ce79d80e23a2426b8a553a4d4b5996fef46", "rev": "2c512b8dc9adc0ada535d23e6be30efafe09e81b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -816,11 +816,11 @@
"pixi-source": "pixi-source" "pixi-source": "pixi-source"
}, },
"locked": { "locked": {
"lastModified": 1723049033, "lastModified": 1721665957,
"narHash": "sha256-JMVvLQX+oJ5Gfck419poXJCIKOxWsZGRC23ize6hT6Y=", "narHash": "sha256-Kq5rZ5wRGLT/a7Gsdi0xBm6+FjPbHgpGUOWmYiZfv1A=",
"owner": "daylinmorgan", "owner": "daylinmorgan",
"repo": "pixi-flake", "repo": "pixi-flake",
"rev": "7a3e2a90d0f35170c1a95cc194a3ba81acd5b63d", "rev": "433b4c14e9dc9ed8b0fb4d36ff7a092b8d6fa12e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -832,16 +832,16 @@
"pixi-source": { "pixi-source": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1723023748, "lastModified": 1721638392,
"narHash": "sha256-m1qlDxZBEDUMNV+gRX2bbEdvBRp4lJv7C2ZZlEUA5Dg=", "narHash": "sha256-N8nNB+FOD8n+W7jFYhq9JoEnLOq6xLMLBC77DiK3RLU=",
"owner": "prefix-dev", "owner": "prefix-dev",
"repo": "pixi", "repo": "pixi",
"rev": "608a65d977b9d87bae71c747f77989ad01c76ada", "rev": "68062d9582b4c14c63f17791b96620908d4148be",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "prefix-dev", "owner": "prefix-dev",
"ref": "v0.27.0", "ref": "v0.26.1",
"repo": "pixi", "repo": "pixi",
"type": "github" "type": "github"
} }
@ -857,11 +857,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1723012587, "lastModified": 1722987403,
"narHash": "sha256-IxV/7YKqeFoBFc1SXgUPdnWi34JkBieSzWM+gP8YzWI=", "narHash": "sha256-olYGUCzNttIJblgG5l+xH5VaBrEBYK0si4c1VpBjxxA=",
"owner": "roc-lang", "owner": "roc-lang",
"repo": "roc", "repo": "roc",
"rev": "698bbc3cf1c279baf76b6015754aab58d5ffeffb", "rev": "8032a988b3aa85f290a418f7e2d016175ebe8e1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1156,11 +1156,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722993798, "lastModified": 1722907357,
"narHash": "sha256-cXzpRh+nUTBqo4mU+jzG4otZcpTfo29DC0apTmH2gtU=", "narHash": "sha256-alp8wfWJtxLXKNuVXPjhWFtrGhp10/3Nle//1RkapgU=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "5a0307b91ad2cd6c60fd5817b6a88108e254730a", "rev": "32c6285061bbab4920b020ec9e9f4aa5c9a81750",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
hosts/othalan/system.nix
View file

@ -10,10 +10,7 @@
hardware.sane = enabled // { hardware.sane = enabled // {
extraBackends = [ pkgs.hplipWithPlugin ]; extraBackends = [ pkgs.hplipWithPlugin ];
}; };
users.users.daylin.extraGroups = [ users.users.daylin.extraGroups = ["scanner" "lp"];
"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,6 +12,9 @@ let
mkOizysModule mkOizysModule
enabled enabled
enableAttrs enableAttrs
pkgsFromSystem
pkgFromSystem
overlayFrom
isNixFile isNixFile
flakeFromSystem flakeFromSystem
; ;

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

@ -6,13 +6,6 @@
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;
@ -60,16 +53,6 @@ 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,11 +256,6 @@ 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 {