bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Flake update + fix ntfy in loki + remote network manager in freya

Browse source
This commit is contained in:
Filippo Berto 2024-03-30 00:15:39 +01:00
parent 556f1d2745
commit fe3593c552
Signed by: bertof
GPG key ID: 9DBF7E6A1D2CE9ED
5 changed files with 46 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

54
flake.lock generated
View file

@ -211,11 +211,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1703887061, "lastModified": 1709087332,
"narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "gitignore.nix", "repo": "gitignore.nix",
"rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -252,11 +252,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706981411, "lastModified": 1710888565,
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "652fda4ca6dafeb090943422c34ae9145787af37", "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -306,11 +306,11 @@
}, },
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1710031547, "lastModified": 1711241261,
"narHash": "sha256-pkUg3hOKuGWMGF9WEMPPN/G4pqqdbNGJQ54yhyQYDVY=", "narHash": "sha256-knrTvpl81yGFHIpm1SsLDApe0thFkw1cl3ISAMPmP/0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "630ebdc047ca96d8126e16bb664c7730dc52f6e6", "rev": "b2a1eeef8c185f6bd27432b053ff09d773244cbc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -327,11 +327,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710398463, "lastModified": 1711626141,
"narHash": "sha256-fQlYanU84E8uwBpcoTCcLCwU8cqn0eQ7nwTcrWfSngc=", "narHash": "sha256-0qV1pHeIyUZ18cp8ijQnMf7uV+Uk4+UqTCC6yGSGWvk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "efd4e38532b5abfaa5c9fc95c5a913157dc20ccb", "rev": "63194fceafbfe583a9eb7d16ab499adc0a6c0bc2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,11 +342,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1710123225, "lastModified": 1711352745,
"narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=", "narHash": "sha256-luvqik+i3HTvCbXQZgB6uggvEcxI9uae0nmrgtXJ17U=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba", "rev": "9a763a7acc4cfbb8603bb0231fec3eda864f81c0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -404,11 +404,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1704874635, "lastModified": 1710695816,
"narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -420,11 +420,11 @@
}, },
"nixpkgs-u": { "nixpkgs-u": {
"locked": { "locked": {
"lastModified": 1710272261, "lastModified": 1711523803,
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -436,11 +436,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1710399145, "lastModified": 1711707400,
"narHash": "sha256-yhGlmdqxfstngEs3qikYyqU93iqi39GLOiJ7XDWFdPQ=", "narHash": "sha256-ggjKcR3OEmPnaYYB8f7PNXoe9f6NwtHpk/PZID42Hc8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d3eeab67779382692725ac423b023edecbd8547e", "rev": "fb003bf6332198a6134312ae138182de9242a1e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -488,11 +488,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1708018599, "lastModified": 1711519547,
"narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", "narHash": "sha256-Q7YmSCUJmDl71fJv/zD9lrOCJ1/SE/okZ2DsrmRjzhY=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", "rev": "7d47a32e5cd1ea481fab33c516356ce27c8cef4a",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
instances/freya/hardware-configuration.nix
View file

@ -26,15 +26,15 @@
}; };
swapDevices = [ swapDevices = [
{ device = "/swapfile"; size = 1024 * 32; } { device = "/swapfile"; size = 1024 * 4; }
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction # still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.networkmanager.enable = lib.mkDefault true; # networking.networkmanager.enable = lib.mkDefault true;
# networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
# networking.interfaces.eth0.useDHCP = lib.mkDefault true; # networking.interfaces.eth0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlan0.useDHCP = lib.mkDefault true; # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
# networking.interfaces.ztmjfdwjkp.useDHCP = lib.mkDefault true; # networking.interfaces.ztmjfdwjkp.useDHCP = lib.mkDefault true;

7
instances/loki/configuration.nix
View file

@ -1,9 +1,14 @@
{ pkgs, ... }: { pkgs, config, ... }:
let let
hosts = import ../../hosts.nix; hosts = import ../../hosts.nix;
in in
{ {
age.secrets = {
ntfy-loki = { file = ../../secrets/ntfy-loki.age; owner = "bertof"; };
};
boot = { boot = {
binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ]; binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ];
# kernelPackages = pkgs.linuxPackages_latest; # kernelPackages = pkgs.linuxPackages_latest;

9
secrets/ntfy-loki.age Normal file
View file

@ -0,0 +1,9 @@
age-encryption.org/v1
-> ssh-ed25519 hGQASA odvKmiKKSeCtsXPgPUblhqOvBL7Imz8vYsmj9F0Co30
f89VAo79e4CeZKZZD5cpZ/ilEMrCJlw40K8NFEhNQo4
-> ssh-ed25519 4behFA LP4uZWWCu7Q35KDYF51EniIW6eyxvmK03e2CTBwf0nQ
zAIqVUaVdTTWkMlFPITCC8Te8AsYfcVFFxEEPBY3Ow8
-> ssh-ed25519 XgC3XA 1UXiZWup+ghZowSY2dBTr0SKJzbVHAj8ntFnVY3n9VA
OltvLR3zCfZ6lDzFW6mVb6CRBuazQMO+oc5zzbBpV+s
--- KuCji6gUCdL21oeGp/TMyr26kZc0y3Nfh7jk/87pfkA
<3#u 6æZæ··÷¬åô‡üsü‰XÔ¡lÐ;%ÊÂ,Mª-5½q²avmá»ææú¬õƒ2F®í\h[²xìr

1
secrets/secrets.nix
View file

@ -26,6 +26,7 @@ in
"kavita_token.age".publicKeys = devUsers ++ [ loki ]; "kavita_token.age".publicKeys = devUsers ++ [ loki ];
"nextcloud_admin_secret.age".publicKeys = devUsers ++ [ freya ]; "nextcloud_admin_secret.age".publicKeys = devUsers ++ [ freya ];
"ntfy-odin.age".publicKeys = devUsers ++ [ odin ]; "ntfy-odin.age".publicKeys = devUsers ++ [ odin ];
"ntfy-loki.age".publicKeys = devUsers ++ [ loki ];
"ntfy-freya.age".publicKeys = devUsers ++ [ freya ]; "ntfy-freya.age".publicKeys = devUsers ++ [ freya ];
"ntfy-thor.age".publicKeys = devUsers ++ [ thor ]; "ntfy-thor.age".publicKeys = devUsers ++ [ thor ];
"odin_wg_priv.age".publicKeys = devUsers ++ [ odin ]; "odin_wg_priv.age".publicKeys = devUsers ++ [ odin ];