Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: set up home-manager with garnix #162

Merged
merged 3 commits into from
Feb 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions .github/workflows/home.yml

This file was deleted.

40 changes: 0 additions & 40 deletions .github/workflows/nixos.yml

This file was deleted.

8 changes: 3 additions & 5 deletions .github/workflows/update-metals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@ jobs:

- name: "Install Nix ❄️"
uses: cachix/install-nix-action@v18

- name: "Install Cachix ❄️"
uses: cachix/cachix-action@v12
with:
name: gvolpe-nixos
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
extra_nix_config: |
trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
substituters = https://cache.garnix.io https://cache.nixos.org/

- name: "Fetch latest Metals"
id: fetcher
Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
nix-config
==========

[![CI Home](https://github.com/gvolpe/nix-config/workflows/Home/badge.svg)](https://github.com/gvolpe/nix-config/actions)
[![CI System](https://github.com/gvolpe/nix-config/workflows/NixOS/badge.svg)](https://github.com/gvolpe/nix-config/actions)

My current — and always evolving — NixOS configuration files, home-manager, neovim, etc.

![cowsay](imgs/cowsay.png)
Expand Down
7 changes: 5 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,19 @@
let
system = "x86_64-linux";
ci = import ./outputs/ci.nix { inherit inputs system; };
home = import ./outputs/home-conf.nix { inherit inputs system; };
in
{
homeConfigurations =
import ./outputs/home-conf.nix { inherit inputs system; };
homeConfigurations = home;

nixosConfigurations =
import ./outputs/nixos-conf.nix { inherit inputs system; };

packages.${system} = {
inherit (ci) metals metals-updater;
# for garnix: https://github.com/garnix-io/issues/issues/24
home-edp = home.gvolpe-edp.activationPackage;
home-hdmi = home.gvolpe-hdmi.activationPackage;
};
};
}
6 changes: 6 additions & 0 deletions garnix.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
builds:
exclude: []
include:
- '*.x86_64-linux.*'
- 'nixosConfigurations.dell-xps'
- 'nixosConfigurations.tongfang-amd'
1 change: 0 additions & 1 deletion switch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ set +x

activateHM() {
rm ~/.config/orage/oragerc.bak
rm -rf ~/.config/secrets
HOME_MANAGER_BACKUP_EXT=bak result/activate
hm-changes-report
}
Expand Down
1 change: 1 addition & 0 deletions system/cachix/gvolpe-nixos.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
nix.settings = {
substituters = [
"https://cache.cachix.io"
"https://gvolpe-nixos.cachix.org"
];
trusted-public-keys = [
Expand Down