nix fmt
This commit is contained in:
parent
9c72baf1c0
commit
00a8ac69cf
11 changed files with 78 additions and 93 deletions
12
.github/workflows/build-machines-and-homes.yml
vendored
12
.github/workflows/build-machines-and-homes.yml
vendored
|
@ -13,7 +13,6 @@ env:
|
|||
extra-experimental-features = nix-command flakes
|
||||
accept-flake-config = true
|
||||
TERM: ansi
|
||||
|
||||
jobs:
|
||||
build-machines:
|
||||
strategy:
|
||||
|
@ -37,15 +36,12 @@ jobs:
|
|||
remove-codeql: 'true'
|
||||
remove-docker-images: 'true'
|
||||
build-mount-path: /nix
|
||||
|
||||
- name: Install Nix
|
||||
uses: nixbuild/nix-quick-install-action@master
|
||||
|
||||
- name: Sync repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
persist-credentials: false
|
||||
|
||||
- name: Restore and cache Nix store
|
||||
uses: nix-community/cache-nix-action@v5.1.0
|
||||
with:
|
||||
|
@ -63,12 +59,10 @@ jobs:
|
|||
purge-primary-key: never
|
||||
# always save the cache
|
||||
save-always: true
|
||||
|
||||
- name: setup attic
|
||||
run: |
|
||||
nix profile install github:zhaofengli/attic
|
||||
attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
|
||||
|
||||
- name: build and cache
|
||||
run: |
|
||||
package=".#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel"
|
||||
|
@ -76,7 +70,6 @@ jobs:
|
|||
derivation="$(nix path-info --derivation "$package")"
|
||||
cache="$(nix-store --query --requisites --include-outputs "$derivation")"
|
||||
attic push main --stdin <<< "$cache"
|
||||
|
||||
build-homes:
|
||||
strategy:
|
||||
matrix:
|
||||
|
@ -99,14 +92,11 @@ jobs:
|
|||
remove-codeql: 'true'
|
||||
remove-docker-images: 'true'
|
||||
build-mount-path: /nix
|
||||
|
||||
- uses: nixbuild/nix-quick-install-action@master
|
||||
|
||||
- name: Sync repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
persist-credentials: false
|
||||
|
||||
- name: Restore and cache Nix store
|
||||
uses: nix-community/cache-nix-action@v5.1.0
|
||||
with:
|
||||
|
@ -124,12 +114,10 @@ jobs:
|
|||
purge-primary-key: never
|
||||
# always save the cache
|
||||
save-always: true
|
||||
|
||||
- name: setup attic
|
||||
run: |
|
||||
nix profile install github:zhaofengli/attic
|
||||
attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
|
||||
|
||||
- name: build and cache
|
||||
run: |
|
||||
package=".#homeConfigurations."${{ matrix.home }}".activationPackage"
|
||||
|
|
8
.github/workflows/build-packages.yml
vendored
8
.github/workflows/build-packages.yml
vendored
|
@ -16,7 +16,6 @@ env:
|
|||
extra-experimental-features = nix-command flakes
|
||||
accept-flake-config = true
|
||||
TERM: ansi
|
||||
|
||||
jobs:
|
||||
build-packages:
|
||||
strategy:
|
||||
|
@ -29,33 +28,26 @@ jobs:
|
|||
- ubuntu-24.04-arm
|
||||
- macos-latest
|
||||
- macos-13
|
||||
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- name: Install Nix
|
||||
uses: cachix/install-nix-action@v30
|
||||
|
||||
- name: Sync repository
|
||||
uses: actions/checkout@v4
|
||||
with:
|
||||
persist-credentials: false
|
||||
|
||||
- name: setup attic
|
||||
run: |
|
||||
nix profile install github:zhaofengli/attic
|
||||
attic login cy7 https://cache.cy7.sh "$ATTIC_TOKEN"
|
||||
|
||||
- run: nix build -L ${{ matrix.package }}
|
||||
|
||||
- name: cache result
|
||||
run: |
|
||||
derivation="$(nix path-info --derivation "${{ matrix.package }}")"
|
||||
cache="$(nix-store --query --requisites --include-outputs "$derivation")"
|
||||
attic push main --stdin <<< "$cache"
|
||||
|
||||
- name: prepare tarball to upload
|
||||
run: nix run github:nixos/nixpkgs#gnutar hcvf result.tar result
|
||||
|
||||
- name: upload result
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
|
|
|
@ -118,9 +118,8 @@ creation_rules:
|
|||
- age:
|
||||
- *chunk
|
||||
- *cy
|
||||
|
||||
- path_regex: secrets/services/searx.yaml
|
||||
key_groups:
|
||||
- age:
|
||||
- *chunk
|
||||
- *cy
|
||||
- *cy
|
||||
|
|
|
@ -10,8 +10,7 @@
|
|||
extensions =
|
||||
# if unfree
|
||||
# with pkgs.vscode-marketplace;
|
||||
with pkgs.open-vsx;
|
||||
[
|
||||
with pkgs.open-vsx; [
|
||||
vscodevim.vim
|
||||
jnoortheen.nix-ide
|
||||
github.github-vscode-theme
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
|
@ -6,20 +6,22 @@
|
|||
}:
|
||||
{
|
||||
virtualisation.oci-containers.containers = {
|
||||
immich-ml = let
|
||||
modelCache = "/opt/immich-ml";
|
||||
in {
|
||||
image = "ghcr.io/immich-app/immich-machine-learning:release";
|
||||
autoStart = true;
|
||||
pull = "newer";
|
||||
ports = [ "3003:3003" ];
|
||||
environment = {
|
||||
REDIS_HOSTNAME = "immich-redis";
|
||||
DB_HOSTNAME = "immich-db";
|
||||
immich-ml =
|
||||
let
|
||||
modelCache = "/opt/immich-ml";
|
||||
in
|
||||
{
|
||||
image = "ghcr.io/immich-app/immich-machine-learning:release";
|
||||
autoStart = true;
|
||||
pull = "newer";
|
||||
ports = [ "3003:3003" ];
|
||||
environment = {
|
||||
REDIS_HOSTNAME = "immich-redis";
|
||||
DB_HOSTNAME = "immich-db";
|
||||
};
|
||||
volumes = [ "${modelCache}:/cache" ];
|
||||
networks = [ "immich-net" ];
|
||||
};
|
||||
volumes = [ "${modelCache}:/cache" ];
|
||||
networks = [ "immich-net" ];
|
||||
};
|
||||
};
|
||||
|
||||
systemd.services.create-immich-net = rec {
|
||||
|
@ -33,4 +35,4 @@
|
|||
${lib.getExe pkgs.podman} network create immich-net
|
||||
'';
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -147,47 +147,49 @@
|
|||
"podman"
|
||||
];
|
||||
|
||||
environment.systemPackages = with pkgs; lib.flatten [
|
||||
tmux
|
||||
vim
|
||||
wget
|
||||
tree
|
||||
kitty
|
||||
borgbackup
|
||||
htop
|
||||
file
|
||||
dnsutils
|
||||
q
|
||||
age
|
||||
compsize
|
||||
wireguard-tools
|
||||
traceroute
|
||||
sops
|
||||
sbctl # secure boot
|
||||
lm_sensors
|
||||
sshfs
|
||||
openssl
|
||||
just
|
||||
killall
|
||||
lshw
|
||||
bubblewrap
|
||||
fuse-overlayfs
|
||||
dwarfs
|
||||
wineWowPackages.stagingFull
|
||||
(with gst_all_1; [
|
||||
gst-plugins-good
|
||||
gst-plugins-bad
|
||||
gst-plugins-ugly
|
||||
gst-plugins-base
|
||||
])
|
||||
vulkan-loader
|
||||
(heroic.override {
|
||||
extraPkgs = pkgs: [
|
||||
pkgs.gamescope
|
||||
pkgs.gamemode
|
||||
];
|
||||
})
|
||||
];
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
lib.flatten [
|
||||
tmux
|
||||
vim
|
||||
wget
|
||||
tree
|
||||
kitty
|
||||
borgbackup
|
||||
htop
|
||||
file
|
||||
dnsutils
|
||||
q
|
||||
age
|
||||
compsize
|
||||
wireguard-tools
|
||||
traceroute
|
||||
sops
|
||||
sbctl # secure boot
|
||||
lm_sensors
|
||||
sshfs
|
||||
openssl
|
||||
just
|
||||
killall
|
||||
lshw
|
||||
bubblewrap
|
||||
fuse-overlayfs
|
||||
dwarfs
|
||||
wineWowPackages.stagingFull
|
||||
(with gst_all_1; [
|
||||
gst-plugins-good
|
||||
gst-plugins-bad
|
||||
gst-plugins-ugly
|
||||
gst-plugins-base
|
||||
])
|
||||
vulkan-loader
|
||||
(heroic.override {
|
||||
extraPkgs = pkgs: [
|
||||
pkgs.gamescope
|
||||
pkgs.gamemode
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
environment.sessionVariables = {
|
||||
NIXOS_OZONE_WL = "1";
|
||||
|
|
|
@ -44,4 +44,4 @@ in
|
|||
reverse_proxy localhost:8091
|
||||
'';
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -44,4 +44,4 @@ in
|
|||
reverse_proxy 127.0.0.1:8090
|
||||
'';
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,4 +29,4 @@ in
|
|||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
final: prev: {
|
||||
bitwarden-desktop = prev.bitwarden-desktop.overrideAttrs (finalAttrs: prevAttrs: {
|
||||
patches = prevAttrs.patches ++ [
|
||||
./ssh-agent-no-confirm.patch
|
||||
];
|
||||
});
|
||||
}
|
||||
bitwarden-desktop = prev.bitwarden-desktop.overrideAttrs (
|
||||
finalAttrs: prevAttrs: {
|
||||
patches = prevAttrs.patches ++ [
|
||||
./ssh-agent-no-confirm.patch
|
||||
];
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
|
@ -14,14 +14,15 @@ in
|
|||
pkgFrom = flake: pkg: flake.packages.${prev.system}.${pkg};
|
||||
in
|
||||
{
|
||||
conduwuit =
|
||||
pkgFrom inputs.conduwuit "static-x86_64-linux-musl-all-features-x86_64-haswell-optimised";
|
||||
conduwuit = pkgFrom inputs.conduwuit "static-x86_64-linux-musl-all-features-x86_64-haswell-optimised";
|
||||
pixelflasher = nixpkgsFrom inputs.pixelflasher "pixelflasher";
|
||||
attic-server = pkgFrom inputs.attic "attic-server";
|
||||
attic = pkgFrom inputs.attic "attic";
|
||||
garage = ((pkgFrom inputs.garage "default").overrideAttrs {
|
||||
garage = (
|
||||
(pkgFrom inputs.garage "default").overrideAttrs {
|
||||
meta.mainProgram = "garage";
|
||||
});
|
||||
}
|
||||
);
|
||||
}
|
||||
)
|
||||
]
|
||||
|
|
Loading…
Add table
Reference in a new issue