Compare commits

...

2 commits

Author SHA1 Message Date
Bad
b9bcdc1fde Add peerix 2022-06-16 19:22:25 +02:00
Bad
c673bf76b9 Update flake.lock 2022-06-16 19:22:25 +02:00
4 changed files with 78 additions and 14 deletions

View file

@ -169,11 +169,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1655188051, "lastModified": 1655274385,
"narHash": "sha256-Cf/qNGb7Xw84TPPep0iIZLLhSXiFq9h+tt6TnfaQMrE=", "narHash": "sha256-WkkC+KMbdMWgFZ2M9kvwi77fzcGXqxMx5u4WA8clAjc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "522a4e99be1f8fcc94b94666c3a44677d668f539", "rev": "2278b01fe743e02b4a5d3d88f78d6492d497f2cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -246,6 +246,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_5": {
"flake": false,
"locked": {
"lastModified": 1627913399,
"narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1642700792, "lastModified": 1642700792,
@ -309,6 +325,21 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": {
"locked": {
"lastModified": 1634851050,
"narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c91f3de5adaf1de973b797ef7485e441a65b8935",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home": { "home": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
@ -338,11 +369,11 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1655130522, "lastModified": 1655221618,
"narHash": "sha256-5dzlxE4okyu+M39yeVtHWQXzDZQxFF5rUB1iY9R6Lb4=", "narHash": "sha256-ht8HRFthDKzYt+il+sGgkBwrv+Ex2l8jdGVpsrPfFME=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "13f08d71ceff5101321e0291854495a1ec153a5e", "rev": "6616de389ed55fba6eeba60377fc04732d5a207c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -405,11 +436,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1655043425, "lastModified": 1655221618,
"narHash": "sha256-A+oT+aQGhW5lXy8H0cqBLsYtgcnT5glmGOXWQDcGw6I=", "narHash": "sha256-ht8HRFthDKzYt+il+sGgkBwrv+Ex2l8jdGVpsrPfFME=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "914ef51ffa88d9b386c71bdc88bffc5273c08ada", "rev": "6616de389ed55fba6eeba60377fc04732d5a207c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -475,6 +506,28 @@
"type": "github" "type": "github"
} }
}, },
"peerix": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_4",
"nixpkgs": [
"nixos"
]
},
"locked": {
"lastModified": 1637002926,
"narHash": "sha256-Iix+XcgkspoV+iVC4wvbX6jZhoThC8dn0RSNUc+Z448=",
"owner": "cid-chan",
"repo": "peerix",
"rev": "4ada6bfb74ab46740adce091271e3bd7c8ade827",
"type": "github"
},
"original": {
"owner": "cid-chan",
"repo": "peerix",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
@ -488,17 +541,18 @@
"naersk": "naersk", "naersk": "naersk",
"nixos": "nixos", "nixos": "nixos",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nvfetcher": "nvfetcher" "nvfetcher": "nvfetcher",
"peerix": "peerix"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1655114284, "lastModified": 1655207011,
"narHash": "sha256-2yz3TexDtxXMMjYKn1SImavH3Zflkxte6/5ESncu5E4=", "narHash": "sha256-/ODWI5Iv6dhgMzhaKrcYorICY1rNfKl7L6aG/JlBB1M=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "7db73875ac0d9280ae93b14232249d9c1496583a", "rev": "65874dfff205335840cc9265ba06d74f234b719d",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -39,6 +39,9 @@
naersk.url = "github:nmattia/naersk"; naersk.url = "github:nmattia/naersk";
naersk.inputs.nixpkgs.follows = "nixos"; naersk.inputs.nixpkgs.follows = "nixos";
peerix.url = "github:cid-chan/peerix";
peerix.inputs.nixpkgs.follows = "nixos";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
fenix.url = "github:nix-community/fenix"; fenix.url = "github:nix-community/fenix";
# fenix.inputs.nixpkgs.follows = "nixos"; # fenix.inputs.nixpkgs.follows = "nixos";
@ -54,6 +57,7 @@
, fenix , fenix
, nvfetcher , nvfetcher
, deploy , deploy
, peerix
, ... , ...
} @ inputs: } @ inputs:
digga.lib.mkFlake digga.lib.mkFlake
@ -71,6 +75,7 @@
./pkgs/default.nix ./pkgs/default.nix
fenix.overlay fenix.overlay
peerix.overlay
]; ];
}; };
latest = { }; latest = { };
@ -98,6 +103,8 @@
digga.nixosModules.nixConfig digga.nixosModules.nixConfig
home.nixosModules.home-manager home.nixosModules.home-manager
agenix.nixosModules.age agenix.nixosModules.age
peerix.nixosModules.peerix
]; ];
}; };
imports = [ (digga.lib.importHosts ./hosts) ]; imports = [ (digga.lib.importHosts ./hosts) ];

View file

@ -0,0 +1,3 @@
{...}: {
services.peerix.enable = true;
}

View file

@ -1,7 +1,7 @@
{ profiles, ... }: { profiles, ... }:
with profiles; rec { with profiles; rec {
base = [ users.root core dnscrypt ]; base = [ users.root core dnscrypt ];
workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents pwn tor rust virtualization java networkmanager pipewire flatpak ]; workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents pwn tor rust virtualization java networkmanager pipewire flatpak peerix ];
desktop = workstation ++ [ users.mae-desk amd three_dee ]; desktop = workstation ++ [ users.mae-desk amd three_dee ];
lap = workstation ++ [ users.mae-lap laptop bluetooth print ]; lap = workstation ++ [ users.mae-lap laptop bluetooth print ];
} }