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

refactor: assorted updates #429

Merged
merged 14 commits into from
Jan 23, 2025
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
18 changes: 9 additions & 9 deletions .github/workflows/build-iso.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: DeterminateSystems/nix-installer-action@v16
with:
determinate: true
- uses: DeterminateSystems/magic-nix-cache-action@v8
- uses: DeterminateSystems/flakehub-cache-action@v1
- name: Nix Build ️❄️
id: build-iso
run: |
Expand Down Expand Up @@ -58,18 +58,18 @@ jobs:

publish-flakehub:
needs: [build-iso]
name: "Publish FlakeHub ❄️"
runs-on: "ubuntu-22.04"
name: Publish FlakeHub ❄️
runs-on: ubuntu-22.04
permissions:
id-token: "write"
contents: "read"
id-token: write
contents: read
steps:
- uses: "actions/checkout@v4"
- uses: "DeterminateSystems/nix-installer-action@v16"
- uses: actions/checkout@v4
- uses: DeterminateSystems/nix-installer-action@v16
with:
determinate: true
- uses: "DeterminateSystems/magic-nix-cache-action@v8"
- uses: "DeterminateSystems/flakehub-push@v5"
- uses: DeterminateSystems/flakehub-cache-action@v1
- uses: DeterminateSystems/flakehub-push@v5
with:
tag: ${{ needs.build-iso.outputs.ver }}
include-output-paths: true
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/build-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jobs:
package:
- defold
- heynote
- jan
- ollama
- open-webui
- station
Expand All @@ -37,7 +36,7 @@ jobs:

build-large-applications:
name: Build large applications
runs-on: blacksmith-2vcpu-ubuntu-2204
runs-on: ubuntu-22.04
strategy:
matrix:
package:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-servers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
build-host:
runs-on: blacksmith-2vcpu-ubuntu-2204
runs-on: ubuntu-22.04
strategy:
matrix:
host:
Expand All @@ -24,7 +24,7 @@ jobs:
- uses: DeterminateSystems/nix-installer-action@v16
with:
determinate: true
- uses: DeterminateSystems/magic-nix-cache-action@v8
- uses: DeterminateSystems/flakehub-cache-action@v1
- name: Building 👷 ${{ matrix.host }} 🐧
run: |
# Disable non-redist packages
Expand All @@ -41,7 +41,7 @@ jobs:
visibility: "public"

build-home:
runs-on: blacksmith-2vcpu-ubuntu-2204
runs-on: ubuntu-22.04
strategy:
matrix:
home:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-vms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- uses: DeterminateSystems/nix-installer-action@v16
with:
determinate: true
- uses: DeterminateSystems/magic-nix-cache-action@v8
- uses: DeterminateSystems/flakehub-cache-action@v1
- name: Building 👷 ${{ matrix.host }} ️🧟
run: |
nix build .#nixosConfigurations.${{ matrix.host }}.config.system.build.toplevel -L
Expand All @@ -46,7 +46,7 @@ jobs:
- uses: DeterminateSystems/nix-installer-action@v16
with:
determinate: true
- uses: DeterminateSystems/magic-nix-cache-action@v8
- uses: DeterminateSystems/flakehub-cache-action@v1
- name: Building 👷 ${{ matrix.home }} 🏚️
run: |
nix run nixpkgs#home-manager -- build --flake .#${{ matrix.home }} -L
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-workstations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
build-host:
runs-on: blacksmith-2vcpu-ubuntu-2204
runs-on: ubuntu-22.04
strategy:
matrix:
host:
Expand All @@ -24,7 +24,7 @@ jobs:
- uses: DeterminateSystems/nix-installer-action@v16
with:
determinate: true
- uses: DeterminateSystems/magic-nix-cache-action@v8
- uses: DeterminateSystems/flakehub-cache-action@v1
- name: Building 👷 ${{ matrix.host }} 🐧
run: |
# Disable non-redist packages
Expand All @@ -41,7 +41,7 @@ jobs:
visibility: "public"

build-home:
runs-on: blacksmith-2vcpu-ubuntu-2204
runs-on: ubuntu-22.04
strategy:
matrix:
home:
Expand All @@ -55,7 +55,7 @@ jobs:
- uses: DeterminateSystems/nix-installer-action@v16
with:
determinate: true
- uses: DeterminateSystems/magic-nix-cache-action@v8
- uses: DeterminateSystems/flakehub-cache-action@v1
- name: Building 👷 ${{ matrix.home }} 🏠
run: |
# Disable non-redist packages
Expand Down
42 changes: 11 additions & 31 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
nix-darwin.url = "github:LnL7/nix-darwin";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";

antsy-alien-attack-pico.url = "https://flakehub.com/f/wimpysworld/antsy-alien-attack-pico/*";
antsy-alien-attack-pico.inputs.nixpkgs.follows = "nixpkgs";
catppuccin.url = "https://flakehub.com/f/catppuccin/nix/*";
catppuccin-vsc.url = "https://flakehub.com/f/catppuccin/vscode/*";
catppuccin-vsc.inputs.nixpkgs.follows = "nixpkgs";
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Adapted from <https://github.com/Hatboxforses/Catppuccin-Gimp-Theme.git>

- Corrects typos in `gtkrc`
- Uses Work Sans font
- Scale toolbox fonts to 1.0
- Optimises the .png files
Loading
Loading