Compare commits

..

5 commits

Author SHA1 Message Date
cy
67d0bc48c0
workflow: nix copy --all 2025-03-27 23:43:53 -04:00
cy
8106125edb
flake.lock: Update
Flake lock file updates:

• Updated input 'conduwuit':
    'github:girlbossceo/conduwuit/7bf92c8a3710eeff229bd86bc81a89daa94b66d5' (2025-03-18)
  → 'github:girlbossceo/conduwuit/33c5afe050491988ee8224af25b9b06e892f4b50' (2025-03-21)
• Updated input 'crane':
    'github:ipetkov/crane/66cb0013f9a99d710b167ad13cbd8cc4e64f2ddb' (2025-03-18)
  → 'github:ipetkov/crane/70947c1908108c0c551ddfd73d4f750ff2ea67cd' (2025-03-19)
• Updated input 'garage':
    'github:deuxfleurs-org/garage/6906a4ff12838da2a74bdaeb7e7cd05cd1d69699' (2025-03-17)
  → 'github:deuxfleurs-org/garage/14d2f2b18da015508d4a1e31b2f014da5188d516' (2025-03-21)
• Updated input 'home-manager':
    'github:nix-community/home-manager/fb74bb76d94a6c55632376c931fc108131260ee9' (2025-03-18)
  → 'github:nix-community/home-manager/b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52' (2025-03-27)
• Updated input 'lix-module':
    'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=a6da43f8193d9e329bba1795c42590c27966082e' (2025-03-13)
  → 'git+https://git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=fa69ae26cc32dda178117b46487c2165c0e08316' (2025-03-25)
• Updated input 'lix-module/lix':
    '20edd45ae8.tar.gz?narHash=sha256-gJ7QmlwsJ/QdwUjwTjifNo3v7OBQm2N6xa19l3mMWM4%3D&rev=20edd45ae816c73504ddfb9c678756e003ceeafd' (2025-03-13)
  → '6059cbb031.tar.gz?narHash=sha256-z652gNdFc/95Fheq4DzVObERYRo%2Bj9RdCF6tzkR8r80%3D&rev=6059cbb031e49e05dd5d16208e2e50d3ab2611db' (2025-03-22)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/2cfb4e1ca32f59dd2811d7a6dd5d4d1225f0955c' (2025-03-17)
  → 'github:nix-community/nix-index-database/36dc43cb50d5d20f90a28d53abb33a32b0a2aae6' (2025-03-23)
• Updated input 'nix-ld':
    'github:nix-community/nix-ld/bc1ecb8ca83507c764a3909f02f1acf53c033585' (2025-03-17)
  → 'github:nix-community/nix-ld/27a5f75260a086f391c0eca38a5e306b9823a0b4' (2025-03-24)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/2b3795787eba0066a2bc8bba7362422e5713840f' (2025-03-18)
  → 'github:nixos/nixpkgs/8b1bcd4edc0de0a950eb117a37c55294997588b5' (2025-03-27)
• Updated input 'nixpkgs-stable':
    'github:nixos/nixpkgs/da044451c6a70518db5b730fe277b70f494188f1' (2025-03-18)
  → 'github:nixos/nixpkgs/d02d88f8de5b882ccdde0465d8fa2db3aa1169f7' (2025-03-25)
• Updated input 'nixvim':
    'github:nix-community/nixvim/78f6166c23f80bdfbcc8c44b20f7f4132299a33f' (2025-03-17)
  → 'github:nix-community/nixvim/1c0dd320d9c4f250ac33382e11d370b7abe97622' (2025-03-26)
• Updated input 'nixvim/nuschtosSearch':
    'github:NuschtOS/search/86e2038290859006e05ca7201425ea5b5de4aecb' (2025-02-02)
  → 'github:NuschtOS/search/508752835128a3977985a4d5225ff241f7756181' (2025-03-22)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/87f0965f9f5b13fca9f38074eee8369dc767550d' (2025-03-18)
  → 'github:oxalica/rust-overlay/f93da1d26ba9963f34f94a6872b67a7939699543' (2025-03-28)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/787afce414bcce803b605c510b60bf43c11f4b55' (2025-03-17)
  → 'github:Mic92/sops-nix/67566fe68a8bed2a7b1175fdfb0697ed22ae8852' (2025-03-23)
• Updated input 'treefmt':
    'github:numtide/treefmt-nix/b3b938ab8ba2e8a0ce9ee9b30ccfa5e903ae5753' (2025-03-18)
  → 'github:numtide/treefmt-nix/29a3d7b768c70addce17af0869f6e2bd8f5be4b7' (2025-03-27)
• Updated input 'vscode-extensions':
    'github:nix-community/nix-vscode-extensions/32de9a383db6b555ac92877dd8b5b986f4151de7' (2025-03-18)
  → 'github:nix-community/nix-vscode-extensions/2473e00df450ad863f552f2cc8da78e6a942118d' (2025-03-28)
2025-03-27 23:42:22 -04:00
cy
36d1097c26
add cache priv key to nix.conf 2025-03-27 23:41:24 -04:00
cy
073e118366
rm helix; install minio-client 2025-03-27 23:41:07 -04:00
cy
9f47fb8a95
update caddy cloudflare plugin 2025-03-27 22:11:21 -04:00
8 changed files with 24 additions and 72 deletions

View file

@ -54,7 +54,7 @@ jobs:
- name: cache - name: cache
if: always() if: always()
run: | run: |
nix copy ".#nixosConfigurations."${{ matrix.machine }}".config.system.build.toplevel" --to "s3://nixcache?endpoint=s3.cy7.sh&secret-key=/home/runner/cache-priv-key.pem" nix copy --all --to 's3://nixcache?endpoint=s3.cy7.sh' --verbose
build-homes: build-homes:
strategy: strategy:
fail-fast: false fail-fast: false

View file

@ -128,3 +128,4 @@ creation_rules:
- age: - age:
- *yt - *yt
- *cy - *cy
- *chunk

55
flake.lock generated
View file

@ -448,30 +448,6 @@
"type": "github" "type": "github"
} }
}, },
"helix": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": "nixpkgs_4",
"rust-overlay": [
"rust-overlay"
]
},
"locked": {
"lastModified": 1743094823,
"narHash": "sha256-ZWBc4zCMlJXn5u6JN9lZLOasIaTqxc6RHEKP7w6Ktq4=",
"owner": "helix-editor",
"repo": "helix",
"rev": "7929c0719d739e248adfd80cd7e5b8e386a43938",
"type": "github"
},
"original": {
"owner": "helix-editor",
"repo": "helix",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -851,22 +827,6 @@
} }
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": {
"lastModified": 1740560979,
"narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5135c59491985879812717f4c9fea69604e7f26f",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1743082947, "lastModified": 1743082947,
"narHash": "sha256-wZ/bfXu9x025oNa4pVcwYbgVRSl2tf/izZTegPSljUQ=", "narHash": "sha256-wZ/bfXu9x025oNa4pVcwYbgVRSl2tf/izZTegPSljUQ=",
@ -997,14 +957,13 @@
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"garage": "garage", "garage": "garage",
"helix": "helix",
"home-manager": "home-manager", "home-manager": "home-manager",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"lix-module": "lix-module", "lix-module": "lix-module",
"nil": "nil", "nil": "nil",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nix-ld": "nix-ld", "nix-ld": "nix-ld",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_2",
"nixvim": "nixvim", "nixvim": "nixvim",
"nvim-github-theme": "nvim-github-theme", "nvim-github-theme": "nvim-github-theme",
@ -1038,11 +997,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743042789, "lastModified": 1743129211,
"narHash": "sha256-yPlxN0r3pQjUIwyX/qeWSTdpHjWy/AfmM0PK1bYkO18=", "narHash": "sha256-gE8t+U9miTwm2NYWS9dFY8H1/QB4ifaFDq1KdV9KEqo=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "b4d2dee9d16e7725b71969f28862ded3a94a7934", "rev": "f93da1d26ba9963f34f94a6872b67a7939699543",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1131,11 +1090,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743040433, "lastModified": 1743126894,
"narHash": "sha256-OskUn34vJJdealUG1rdOdnpBEBRfJfw9vKeqNyZKs+s=", "narHash": "sha256-FUsh0AWH3ndHvZsGkAf0Ng/wn8z9JydhhkICYoU4aEk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "14a6e019c40901428b97cdef2d873c18386c8e7f", "rev": "2473e00df450ad863f552f2cc8da78e6a942118d",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -91,11 +91,6 @@
flake-utils.follows = "flake-utils"; flake-utils.follows = "flake-utils";
}; };
}; };
helix = {
url = "github:helix-editor/helix";
inputs.flake-utils.follows = "flake-utils";
inputs.rust-overlay.follows = "rust-overlay";
};
nvim-github-theme = { nvim-github-theme = {
url = "github:projekt0n/github-nvim-theme"; url = "github:projekt0n/github-nvim-theme";

View file

@ -102,6 +102,7 @@
freetube freetube
gopls gopls
rust-analyzer rust-analyzer
minio-client
]; ];
home.sessionVariables = { home.sessionVariables = {
@ -151,17 +152,4 @@
}; };
programs.nix-index-database.comma.enable = true; programs.nix-index-database.comma.enable = true;
programs.helix = {
enable = true;
settings = {
theme = "github_dark";
editor = {
line-number = "relative";
lsp.display-messages = true;
};
keys.insert = {
"C-[" = "normal_mode";
};
};
};
} }

View file

@ -1,4 +1,4 @@
{ inputs, ... }: { inputs, config, ... }:
{ {
nix = { nix = {
settings = { settings = {
@ -9,7 +9,7 @@
"root" "root"
"@wheel" "@wheel"
]; ];
trusted-public-keys = [ extra-trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8=" "nixcache.cy7.sh:DN3d1dt0wnXfTH03oVmTee4KgmdNdB0NY3SuzA8Fwx8="
]; ];
@ -17,6 +17,9 @@
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://nixcache.cy7.sh" "https://nixcache.cy7.sh"
]; ];
secret-key-files = [
config.sops.secrets.cache-priv-key.path
];
}; };
channel.enable = false; channel.enable = false;
optimise = { optimise = {
@ -74,4 +77,11 @@
services.thermald.enable = true; services.thermald.enable = true;
environment.enableAllTerminfo = true; environment.enableAllTerminfo = true;
sops.secrets.cache-priv-key = {
format = "binary";
sopsFile = ../secrets/cache-priv-key.pem;
mode = "0440";
group = "users";
};
} }

View file

@ -19,9 +19,9 @@ in
plugins = [ plugins = [
# error message will tell you the correct version tag to use # error message will tell you the correct version tag to use
# (still need the @ to pass nix config check) # (still need the @ to pass nix config check)
"github.com/caddy-dns/cloudflare@v0.0.0-20240703190432-89f16b99c18e" "github.com/caddy-dns/cloudflare@v0.0.0-20250228175314-1fb64108d4de"
]; ];
hash = "sha256-W09nFfBKd+9QEuzV3RYLeNy2CTry1Tz3Vg1U2JPNPPc="; hash = "sha256-YYpsf8HMONR1teMiSymo2y+HrKoxuJMKIea5/NEykGc=";
}; };
logFormat = lib.mkForce "level INFO"; logFormat = lib.mkForce "level INFO";
acmeCA = "https://acme-v02.api.letsencrypt.org/directory"; acmeCA = "https://acme-v02.api.letsencrypt.org/directory";

View file

@ -23,7 +23,6 @@ in
meta.mainProgram = "garage"; meta.mainProgram = "garage";
} }
); );
helix = pkgFrom inputs.helix "default";
} }
) )
] ]