mirror of
https://github.com/callumio/nixfiles.git
synced 2025-12-19 20:39:20 +00:00
Compare commits
1 commit
f24854615b
...
43636e2bc9
| Author | SHA1 | Date | |
|---|---|---|---|
|
43636e2bc9 |
10 changed files with 46 additions and 125 deletions
6
.github/workflows/ci.yml
vendored
6
.github/workflows/ci.yml
vendored
|
|
@ -9,15 +9,15 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: cachix/install-nix-action@v31
|
||||
- uses: cachix/install-nix-action@v30
|
||||
with:
|
||||
nix_path: nixpkgs=channel:nixos-unstable
|
||||
- name: Free Disk Space
|
||||
uses: jlumbroso/free-disk-space@main
|
||||
with:
|
||||
tool-cache: true
|
||||
- uses: DeterminateSystems/magic-nix-cache-action@v13
|
||||
- uses: cachix/cachix-action@v16
|
||||
- uses: DeterminateSystems/magic-nix-cache-action@v8
|
||||
- uses: cachix/cachix-action@v15
|
||||
with:
|
||||
name: callumio-public
|
||||
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
|
||||
|
|
|
|||
4
.github/workflows/update-flake.yml
vendored
4
.github/workflows/update-flake.yml
vendored
|
|
@ -12,9 +12,9 @@ jobs:
|
|||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
- name: Install Nix
|
||||
uses: cachix/install-nix-action@v31
|
||||
uses: cachix/install-nix-action@v30
|
||||
- name: Update flake.lock
|
||||
uses: DeterminateSystems/update-flake-lock@v27
|
||||
uses: DeterminateSystems/update-flake-lock@v24
|
||||
with:
|
||||
token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
|
||||
pr-labels: |
|
||||
|
|
|
|||
87
flake.lock
generated
87
flake.lock
generated
|
|
@ -26,11 +26,11 @@
|
|||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754433428,
|
||||
"narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
|
||||
"lastModified": 1750173260,
|
||||
"narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=",
|
||||
"owner": "ryantm",
|
||||
"repo": "agenix",
|
||||
"rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
|
||||
"rev": "531beac616433bac6f9e2a19feb8e99a22a66baf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -121,27 +121,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"copyparty": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"unstable"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754693757,
|
||||
"narHash": "sha256-hdw5A2GJQddldh0PWxs9U618aNmGtiIAcT2zHYJZ0to=",
|
||||
"owner": "9001",
|
||||
"repo": "copyparty",
|
||||
"rev": "392a4db55bc4d27300bff5bc82638513e6c900d3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "9001",
|
||||
"repo": "copyparty",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"locked": {
|
||||
"lastModified": 1731098351,
|
||||
|
|
@ -284,11 +263,11 @@
|
|||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"lastModified": 1754512310,
|
||||
"narHash": "sha256-gXE5lTYMOhpDJo+siLXW/3BzySPmLMD12GVB1QFVbyw=",
|
||||
"lastModified": 1753761817,
|
||||
"narHash": "sha256-FE908x/ihUlr5yn1f+PTMyOjcwotGUodzn7Ej6zZf5U=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "2008f9aa7a5ccde48bfc1de5a919be5898da09c2",
|
||||
"rev": "b657cfddb78408e9b53b4a8aaeaac71fc7ea182e",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -368,11 +347,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754487366,
|
||||
"narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
|
||||
"lastModified": 1754091436,
|
||||
"narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
|
||||
"rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -496,21 +475,6 @@
|
|||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1678901627,
|
||||
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
|
|
@ -853,11 +817,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1754689972,
|
||||
"narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=",
|
||||
"lastModified": 1754028485,
|
||||
"narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a",
|
||||
"rev": "59e69648d345d6e8fef86158c555730fa12af9de",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1044,7 +1008,7 @@
|
|||
"nvf_2": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_4",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flake-utils": "flake-utils",
|
||||
"mnw": "mnw",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"systems": "systems_3"
|
||||
|
|
@ -1107,11 +1071,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754416808,
|
||||
"narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=",
|
||||
"lastModified": 1750779888,
|
||||
"narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864",
|
||||
"rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1150,7 +1114,6 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"copyparty": "copyparty",
|
||||
"devour-flake": "devour-flake",
|
||||
"disko": "disko",
|
||||
"firefox-addons": "firefox-addons",
|
||||
|
|
@ -1299,11 +1262,11 @@
|
|||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754599117,
|
||||
"narHash": "sha256-AzAYdZlat002vCjCKWdFpGi2xUaiOU4DtIPnv1nomD8=",
|
||||
"lastModified": 1753979771,
|
||||
"narHash": "sha256-MdMdQymbivEWWkC5HqeLYtP8FYu0SqiSpiRlyw9Fm3Y=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "312dec38b2231b21f36903d1bdce96daa11548ff",
|
||||
"rev": "5b81b0c4fbab3517b39d63f493760d33287150ad",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1520,11 +1483,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754492133,
|
||||
"narHash": "sha256-B+3g9+76KlGe34Yk9za8AF3RL+lnbHXkLiVHLjYVOAc=",
|
||||
"lastModified": 1754061284,
|
||||
"narHash": "sha256-ONcNxdSiPyJ9qavMPJYAXDNBzYobHRxw0WbT38lKbwU=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "1298185c05a56bff66383a20be0b41a307f52228",
|
||||
"rev": "58bd4da459f0a39e506847109a2a5cfceb837796",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1550,11 +1513,11 @@
|
|||
},
|
||||
"unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1754498491,
|
||||
"narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=",
|
||||
"lastModified": 1753939845,
|
||||
"narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c2ae88e026f9525daf89587f3cbee584b92b6134",
|
||||
"rev": "94def634a20494ee057c76998843c015909d6311",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
17
flake.nix
17
flake.nix
|
|
@ -9,7 +9,7 @@
|
|||
} @ inputs: let
|
||||
mods = import ./modules;
|
||||
cLib = import ./lib {inherit (nixpkgs) lib;};
|
||||
mkLinuxSystem = mod: ovl:
|
||||
mkLinuxSystem = mod:
|
||||
nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {inherit inputs cLib;};
|
||||
modules =
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
inputs.agenix.nixosModules.default
|
||||
{
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.overlays = [self.overlays.default] ++ ovl;
|
||||
nixpkgs.overlays = [self.overlays.default];
|
||||
}
|
||||
]
|
||||
++ mod
|
||||
|
|
@ -39,8 +39,8 @@
|
|||
inherit (mods) homeManagerModules nixosModules;
|
||||
# TODO: use ./hosts/
|
||||
nixosConfigurations = {
|
||||
artemis = mkLinuxSystem [./hosts/artemis inputs.lanzaboote.nixosModules.lanzaboote] [];
|
||||
hermes = mkLinuxSystem [./hosts/hermes inputs.copyparty.nixosModules.default] [inputs.copyparty.overlays.default];
|
||||
artemis = mkLinuxSystem [./hosts/artemis inputs.lanzaboote.nixosModules.lanzaboote];
|
||||
hermes = mkLinuxSystem [./hosts/hermes];
|
||||
};
|
||||
diskoConfigurations = {}; # maybe?
|
||||
om.health.default = {nix-version.min-required = "2.18.5";};
|
||||
|
|
@ -105,6 +105,7 @@
|
|||
url = "github:ryantm/agenix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
# i don't need darwin!!!
|
||||
inputs.darwin.follows = "";
|
||||
};
|
||||
|
||||
|
|
@ -115,6 +116,7 @@
|
|||
|
||||
stylix = {
|
||||
url = "github:danth/stylix/release-25.05";
|
||||
#url = "github:danth/stylix/993fcabd83d1e0ee5ea038b87041593cc73c1ebe";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
|
|
@ -149,6 +151,8 @@
|
|||
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
|
||||
|
||||
systems.url = "github:nix-systems/default";
|
||||
#systems.url = "github:nix-systems/default-linux";
|
||||
#systems.url = "github:nix-systems/x86_64-linux";
|
||||
|
||||
treefmt-nix.url = "github:numtide/treefmt-nix";
|
||||
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -158,6 +162,7 @@
|
|||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# my custom programs
|
||||
nish = {
|
||||
url = "github:callumio/nish";
|
||||
inputs = {
|
||||
|
|
@ -178,9 +183,5 @@
|
|||
systems.follows = "systems";
|
||||
};
|
||||
};
|
||||
copyparty = {
|
||||
url = "github:9001/copyparty";
|
||||
inputs.nixpkgs.follows = "unstable";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
{config, ...}: let
|
||||
domain = "files.cleslie.uk";
|
||||
in {
|
||||
services = {
|
||||
cloudflare-dyndns.domains = [domain];
|
||||
copyparty = {
|
||||
enable = true;
|
||||
settings = {
|
||||
i = "127.0.0.1";
|
||||
p = [3210];
|
||||
};
|
||||
accounts = {
|
||||
c.passwordFile = config.age.secrets.copyparty-c.path;
|
||||
};
|
||||
volumes = {
|
||||
"/media" = {
|
||||
path = "/var/lib/media/library";
|
||||
access = {
|
||||
r = "*";
|
||||
rw = ["c"];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
caddy.virtualHosts.${domain}.extraConfig = ''
|
||||
reverse_proxy http://127.0.0.1:3210
|
||||
'';
|
||||
};
|
||||
age.secrets."copyparty-c" = {
|
||||
file = ../../secrets/copyparty-c.age;
|
||||
mode = "400";
|
||||
owner = "copyparty";
|
||||
};
|
||||
}
|
||||
|
|
@ -2,7 +2,6 @@
|
|||
imports = [
|
||||
./hardware-configuration.nix
|
||||
./configuration.nix
|
||||
./copyparty.nix
|
||||
./ddns.nix
|
||||
./quassel.nix
|
||||
./fail2ban.nix
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{inputs, ...}: {
|
||||
nix = {
|
||||
registry.nixpkgs.flake = inputs.nixpkgs;
|
||||
registry.unstable.flake = inputs.unstable;
|
||||
gc = {
|
||||
automatic = true;
|
||||
dates = "weekly";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 /RyXeg 9MmkRSN4Pxm/euJsg3CiOmfGURBb6OSPzluA80cYOAE
|
||||
QYMH4LFbOsK6kIExn68Bxaof+kam3TTbMcHhCJ412KY
|
||||
-> ssh-ed25519 aSaoJQ bDhF3Ibh5hG/E8kSOMYA2zsixtOrn39YfM8SQOH02Sc
|
||||
IryhokRkj3Hqb/09850ROdHu45e7ldHVE1yJJXsGjZ8
|
||||
--- xn812SYQ+FfSlMJ89BFtjNJZYVz7G1Tl63lhLF9jops
|
||||
ÞÓ?|†8ˆ` <0B> JæêEÈÁå·“TÈ7§Äâç‚æÛ“A…«5ÓW„]Çט"'Ä2„Ј*`J¯Üɧ½`O°üq±!<
|
||||
-> ssh-ed25519 /RyXeg p2ROUhWiDQDOjALQnhhf566js8ivYTsgwNfCaaoe6yQ
|
||||
UnCc2/4lb+PxnrKdAPVqwAyXavFGr8M3NV3+fSSdAU0
|
||||
-> ssh-ed25519 aSaoJQ hHqpvUCaH5RLAQwTdH1llfF/0aTraXtl25qFDaFhUwk
|
||||
+4VMHc3PGR9HBlVTw4anbYORQPgFl24WGF5pwmt7w20
|
||||
--- qa7ctM764SNg3u/ITk+6DRXbLqF1Lom1xgKysY9DrkE
|
||||
ô›Zš¾;Qš
|
||||
7î‡kÔ4%ú½ #<08>ŸÞåpqÃÅâvìyú]
ièeǺð]É©i¾Ó!4Ø=ÇsŒä‰<C3A4>JfÉ púH«sæò29½¥œs¯åF}µ‘˪ —#ói8ù
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
age-encryption.org/v1
|
||||
-> ssh-ed25519 /RyXeg L3snhcjG3XkMDoehtE1UyJ32D8vzLE8+D7ZQp4m+S0w
|
||||
FqrvB5ve6xLedf2N982uQB7FBRQinubVFSpJ1wj7fBw
|
||||
-> ssh-ed25519 aSaoJQ AHhV+ob0AO5/jkoNy/138Qjpnq6bgQJOS7gu9NxPagg
|
||||
5ie/QslRuqJBzOXHWulGIFnZXaPUHBbWhxKJnoCDsXg
|
||||
--- vhZK1PYh5jncrrXGGWiE0mvDCN/O/Rvh2WGYBBimC8w
|
||||
/NGëOtÏf¯Žm™ŒAx¨¼}šOñ¿£A±”´}¦<14>Èiå2Øtˆº¼~Ýq
ì]â
|
||||
|
|
@ -10,7 +10,6 @@ in {
|
|||
"mesh-conf-infra.age".publicKeys = keys.c ++ allSystems;
|
||||
"mesh-conf-cleslie.age".publicKeys = keys.c ++ allSystems;
|
||||
"forgejo-password.age".publicKeys = keys.c ++ [systems.hermes];
|
||||
"copyparty-c.age".publicKeys = keys.c ++ [systems.hermes];
|
||||
"cloudflare-api.age".publicKeys = keys.c ++ [systems.hermes];
|
||||
"vaultwarden-env.age".publicKeys = keys.c ++ [systems.hermes];
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue