mirror of
https://github.com/alyraffauf/nixcfg.git
synced 2024-11-21 15:13:55 -05:00
removed nixos flatpak and live iso from flake
This commit is contained in:
Aly Raffauf
parent
d2b5ec99b8
commit
1562a8f24c
56
.github/workflows/build-iso.yml
vendored
56
.github/workflows/build-iso.yml
vendored
|
|
@ -1,56 +0,0 @@
|
|||
name: Build NixOS iso
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: "0 10 * * 2"
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
target: [
|
||||
live-gnome-unstable
|
||||
]
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- name: Cache date
|
||||
run: echo "DATE=$(date +'%Y-%m-%d %H:%M:%S')" >> $GITHUB_ENV
|
||||
|
||||
- name: Filename friendly date
|
||||
run: echo "BUILD_DATE=$(echo $DATE | sed -r -e 's/:/./g' -e 's/ /_/g')" >> $GITHUB_ENV
|
||||
|
||||
- name: Store branch name
|
||||
run: echo "BUILD_BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
|
||||
|
||||
- name: Store commit hash
|
||||
run: echo "BUILD_COMMIT=$(git rev-parse --short $GITHUB_SHA)" >> $GITHUB_ENV
|
||||
|
||||
- name: Generate output name
|
||||
run: echo "NAME=${BUILD_DATE}_${BUILD_BRANCH}_${BUILD_COMMIT}_nixos_iso_${{ matrix.target }}" >> $GITHUB_ENV
|
||||
|
||||
- name: Install Nix
|
||||
uses: cachix/install-nix-action@v20
|
||||
|
||||
- name: Check flake
|
||||
uses: workflow/nix-shell-action@v3.2.1
|
||||
with:
|
||||
script: nix flake check .
|
||||
|
||||
- name: Build image
|
||||
uses: workflow/nix-shell-action@v3.2.1
|
||||
with:
|
||||
script: nix build .#nixosConfigurations.${{ matrix.target }}.config.system.build.isoImage
|
||||
|
||||
- name: Optimize nix store
|
||||
uses: workflow/nix-shell-action@v3.2.1
|
||||
with:
|
||||
script: nix store optimise
|
||||
|
||||
- name: Upload iso
|
||||
uses: actions/upload-artifact@v3.1.2
|
||||
with:
|
||||
name: ${{ env.NAME }}
|
||||
path: result/iso/*.iso
|
||||
17
flake.lock
17
flake.lock
|
|
@ -40,22 +40,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-flatpak": {
|
||||
"locked": {
|
||||
"lastModified": 1708268179,
|
||||
"narHash": "sha256-NNVuhf84AeDTxadfSGnFqPHR0ED+QyM2gmu+Wyz6PrY=",
|
||||
"owner": "gmodena",
|
||||
"repo": "nix-flatpak",
|
||||
"rev": "a243cb0522f6240c194b873dde68e25370b06034",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "gmodena",
|
||||
"ref": "v0.3.0",
|
||||
"repo": "nix-flatpak",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1710123225,
|
||||
|
|
@ -106,7 +90,6 @@
|
|||
"inputs": {
|
||||
"home-manager": "home-manager",
|
||||
"home-manager-unstable": "home-manager-unstable",
|
||||
"nix-flatpak": "nix-flatpak",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||
|
|
|
|||
40
flake.nix
40
flake.nix
|
|
@ -29,14 +29,14 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
};
|
||||
|
||||
# Declarative Flatpaks.
|
||||
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.3.0";
|
||||
# # Declarative Flatpaks.
|
||||
# nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.3.0";
|
||||
|
||||
# Pre-baked hardware support for various devices.
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
};<nixos-hardware/framework/13-inch/7040-amd>
|
||||
};
|
||||
|
||||
outputs = inputs@{ nixpkgs, home-manager, nixpkgs-unstable, home-manager-unstable, nix-flatpak, nixos-hardware, ... }: {
|
||||
outputs = inputs@{ nixpkgs, home-manager, nixpkgs-unstable, home-manager-unstable, nixos-hardware, ... }: {
|
||||
|
||||
nixosConfigurations = {
|
||||
|
||||
|
|
@ -47,9 +47,6 @@
|
|||
./hosts/rustboro
|
||||
./desktop/kde
|
||||
|
||||
# Add managed flatpak module.
|
||||
nix-flatpak.nixosModules.nix-flatpak
|
||||
|
||||
# Add home-manager nixos module so home-manager config deploys on nixos-rebuild.
|
||||
home-manager-unstable.nixosModules.home-manager {
|
||||
home-manager.useGlobalPkgs = true;
|
||||
|
|
@ -69,9 +66,6 @@
|
|||
./hosts/petalburg
|
||||
./desktop/gnome
|
||||
|
||||
# Add managed flatpak module.
|
||||
nix-flatpak.nixosModules.nix-flatpak
|
||||
|
||||
# Add home-manager nixos module so home-manager config deploys on nixos-rebuild.
|
||||
home-manager-unstable.nixosModules.home-manager {
|
||||
home-manager.useGlobalPkgs = true;
|
||||
|
|
@ -92,9 +86,6 @@
|
|||
./modules/homelab
|
||||
./modules/steam
|
||||
|
||||
# Add managed flatpak module.
|
||||
nix-flatpak.nixosModules.nix-flatpak
|
||||
|
||||
# Add home-manager nixos module so home-manager config deploys on nixos-rebuild.
|
||||
home-manager-unstable.nixosModules.home-manager {
|
||||
home-manager.useGlobalPkgs = true;
|
||||
|
|
@ -103,29 +94,6 @@
|
|||
}
|
||||
];
|
||||
};
|
||||
|
||||
live-gnome-unstable = nixpkgs-unstable.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
modules = [
|
||||
(nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix")
|
||||
./system
|
||||
./desktop/gnome
|
||||
|
||||
# Add managed flatpak module.
|
||||
nix-flatpak.nixosModules.nix-flatpak
|
||||
|
||||
# Add installer.
|
||||
({ pkgs, ... }: {
|
||||
environment.systemPackages = [ pkgs.calamares-nixos pkgs.calamares-nixos-extensions ];
|
||||
})
|
||||
# Add home-manager nixos module so home-manager config deploys on nixos-rebuild.
|
||||
home-manager-unstable.nixosModules.home-manager {
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.nixos = import ./home/nixos;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
packages.x86_64-linux.default = home-manager.defaultPackage.x86_64-linux;
|
||||
|
|
|
|||
Loading…
Reference in a new issue