Merge Codeberg's herdr-nixpkgs-follows commit with local pihole/TV-lockdown work
# Conflicts: # flake.lock
This commit is contained in:
Generated
+7
-21
@@ -2,15 +2,17 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"herdr": {
|
"herdr": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1790589489,
|
"lastModified": 1790642832,
|
||||||
"narHash": "sha256-Sn9W64W4KOga829nzathqymFvtwZsb/klyQFS/3Nq1A=",
|
"narHash": "sha256-dhAifTJeh8sfK0s/KzUZIo1qHlv+AFit3HOyCT+QC5E=",
|
||||||
"owner": "ogulcancelik",
|
"owner": "ogulcancelik",
|
||||||
"repo": "herdr",
|
"repo": "herdr",
|
||||||
"rev": "7f89b11a11160874ba89f3be7c64b29960bd2df3",
|
"rev": "9dc3a1df2b563df0637264fc0dffcd607c324ac5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -41,22 +43,6 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1779911860,
|
|
||||||
"narHash": "sha256-ubcLAcKBDCZjhxw/kH5DL5GdBZQdzLqpkTe7HonvJVs=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "c0a89c379b4ac67c7b13b051ddbd4e0dbc9b0eaf",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_2": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1790533781,
|
"lastModified": 1790533781,
|
||||||
"narHash": "sha256-hzJtu90JIQXnmgxKeP23CAx86G4L+dcQ+GHB1JK04qA=",
|
"narHash": "sha256-hzJtu90JIQXnmgxKeP23CAx86G4L+dcQ+GHB1JK04qA=",
|
||||||
@@ -74,7 +60,7 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"herdr": "herdr",
|
"herdr": "herdr",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs",
|
||||||
"rssdownloader-src": "rssdownloader-src"
|
"rssdownloader-src": "rssdownloader-src"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -8,7 +8,10 @@
|
|||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
herdr.url = "github:ogulcancelik/herdr";
|
herdr = {
|
||||||
|
url = "github:ogulcancelik/herdr";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
|
||||||
rssdownloader-src = {
|
rssdownloader-src = {
|
||||||
url = "git+https://codeberg.org/ulve/rssdownloader";
|
url = "git+https://codeberg.org/ulve/rssdownloader";
|
||||||
|
|||||||
@@ -144,6 +144,7 @@
|
|||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
wget
|
wget
|
||||||
curl
|
curl
|
||||||
|
google-chrome
|
||||||
];
|
];
|
||||||
|
|
||||||
fonts.packages = with pkgs; [
|
fonts.packages = with pkgs; [
|
||||||
|
|||||||
@@ -253,6 +253,10 @@
|
|||||||
User = "ulve";
|
User = "ulve";
|
||||||
IdentityFile = "~/.ssh/id_ed25519_nixserve";
|
IdentityFile = "~/.ssh/id_ed25519_nixserve";
|
||||||
};
|
};
|
||||||
|
"Host ssh.dev.azure.com" = {
|
||||||
|
User = "git";
|
||||||
|
IdentityFile = "~/.ssh/id_rsa_azuredevops";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user