Skip to content

Commit

Permalink
fix: some fix
Browse files Browse the repository at this point in the history
build-check: fix flake target
update-repo: fix schedule
nixosConfigurations:
    remove test and add liveimg-gui-full, liveimg-cui-iso
    fix setting
  • Loading branch information
misumisumi committed May 12, 2024
1 parent 041d9af commit 521d8dc
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ jobs:

- name: Build check
if: steps.change.outputs.nix == 'true'
run: nix build --no-link ".#nixosConfigurations.test.config.system.build.toplevel"
run: nix build --no-link ".#nixosConfigurations.liveimg-gui-full.config.system.build.toplevel"
6 changes: 4 additions & 2 deletions .github/workflows/update-repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ name: update repository
on:
workflow_dispatch: # allows manual triggering
schedule:
- cron: "0 20 * * 5" # runs weekly on Saturday at 05:00 (JST)
- cron: "0 19 * * 5" # runs weekly on Saturday at 04:00 (JST)

permissions: read-all
permissions:
contents: write
pull-requests: write

jobs:
update-repo:
Expand Down
13 changes: 7 additions & 6 deletions machines/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,11 @@ let
};
in
{
test = settings {
liveimg-gui-full = settings {
hostname = "liveimg";
inherit user;
user = "nixos";
scheme = "full";
useNixOSWallpaper = true;
};
liveimg-gui = settings {
hostname = "liveimg";
Expand All @@ -66,17 +67,17 @@ in
scheme = "small";
useNixOSWallpaper = true;
};
liveimg-cui = settings {
liveimg-cui-iso = settings {
hostname = "liveimg";
user = "nixos";
wm = "";
scheme = "small";
scheme = "core";
};
liveimg-iso = settings {
liveimg-cui = settings {
hostname = "liveimg";
user = "nixos";
wm = "";
scheme = "core";
scheme = "small";
};
mother = settings {
hostname = "mother";
Expand Down
6 changes: 3 additions & 3 deletions machines/liveimg/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
./zfs.nix
] ++ lib.optional (wm == "gnome") ../../apps/gnome
++ lib.optionals (! lib.hasSuffix "iso" hostname) [
../../system/bluetooth
../../system/fonts
../../system/pulseaudio
../../settings/system/bluetooth
../../settings/system/fonts
../../settings/system/pulseaudio
./filesystem.nix
./gpu.nix
./hardware-configuration.nix
Expand Down
6 changes: 3 additions & 3 deletions machines/liveimg/home.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
}:
{
imports = lib.optionals (wm != "") [
../../apps/full/programs/firefox.nix
../../apps/full/programs/vivaldi.nix
../../apps/user/full/programs/firefox.nix
../../apps/user/full/programs/vivaldi.nix
]
++ (import ../../apps/full/ime)
++ (import ../../apps/user/full/ime)
;
}

0 comments on commit 521d8dc

Please sign in to comment.