Compare commits
2 commits
771f6d9d84
...
3fc5fa3409
Author | SHA1 | Date | |
---|---|---|---|
3fc5fa3409 | |||
486a8ad7a5 |
2 changed files with 4 additions and 7 deletions
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
|
@ -14,6 +14,8 @@ jobs:
|
||||||
- system: durincore
|
- system: durincore
|
||||||
os: ubuntu-x86_64
|
os: ubuntu-x86_64
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
container:
|
||||||
|
image: docker.io/library/ubuntu:latest
|
||||||
steps:
|
steps:
|
||||||
# - name: Create nix mount point
|
# - name: Create nix mount point
|
||||||
# if: contains(matrix.os, 'ubuntu-x86_64')
|
# if: contains(matrix.os, 'ubuntu-x86_64')
|
||||||
|
@ -23,8 +25,8 @@ jobs:
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
# For compatibility with actions and debian
|
# For compatibility with actions and debian
|
||||||
- name: Install sudo
|
# - name: Install sudo
|
||||||
run: apt update && apt install -y sudo
|
# run: apt update && apt install -y sudo
|
||||||
- name: Install Nix
|
- name: Install Nix
|
||||||
uses: https://github.com/cachix/install-nix-action@v26
|
uses: https://github.com/cachix/install-nix-action@v26
|
||||||
with:
|
with:
|
||||||
|
|
|
@ -94,7 +94,6 @@
|
||||||
inherit inputs outputs;
|
inherit inputs outputs;
|
||||||
# Import overlays for building nixosconfig with them.
|
# Import overlays for building nixosconfig with them.
|
||||||
overlays = import ./nixos/overlays { inherit inputs; };
|
overlays = import ./nixos/overlays { inherit inputs; };
|
||||||
|
|
||||||
# generate a base nixos configuration with the
|
# generate a base nixos configuration with the
|
||||||
# specified overlays, hardware modules, and any extraModules applied
|
# specified overlays, hardware modules, and any extraModules applied
|
||||||
mkNixosConfig =
|
mkNixosConfig =
|
||||||
|
@ -118,7 +117,6 @@
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
inherit inputs hostname system;
|
inherit inputs hostname system;
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
@ -129,7 +127,6 @@
|
||||||
modules = baseModules ++ hardwareModules ++ profileModules;
|
modules = baseModules ++ hardwareModules ++ profileModules;
|
||||||
specialArgs = { inherit self inputs nixpkgs; };
|
specialArgs = { inherit self inputs nixpkgs; };
|
||||||
# Add our overlays
|
# Add our overlays
|
||||||
|
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
overlays = builtins.attrValues overlays;
|
overlays = builtins.attrValues overlays;
|
||||||
|
@ -138,7 +135,6 @@
|
||||||
allowUnfreePredicate = _: true;
|
allowUnfreePredicate = _: true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
@ -168,7 +164,6 @@
|
||||||
profileModules = [
|
profileModules = [
|
||||||
./nixos/profiles/role-server.nix
|
./nixos/profiles/role-server.nix
|
||||||
{ home-manager.users.jahanson = ./nixos/home/jahanson/server.nix; }
|
{ home-manager.users.jahanson = ./nixos/home/jahanson/server.nix; }
|
||||||
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Reference in a new issue