Commit d1235f62 authored by fpletz's avatar fpletz 🚧
Browse files

update deps

parent 1558f7ad
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1645970334, "lastModified": 1647903177,
"narHash": "sha256-6nn4YF9bPtkxkB7bM6yJO3m//p3sGilxNQFjm1epLEM=", "narHash": "sha256-9aWSpW/F8POA/7cuVpoqhVGfjAgcGRIinwxUaXmUpkk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ea85f4b1fdf3f25cf97dc49f4a9ec4eafda2ea25", "rev": "80b4360678fa7890964ba8e40a722985bf8d107e",
"type": "github" "type": "github"
}, },
"original": { "original": {
...@@ -105,11 +105,11 @@ ...@@ -105,11 +105,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1645800619, "lastModified": 1647521142,
"narHash": "sha256-fCamVUDH0+nACV1P/rqtoD4YGon5HhnW3bU/0IjA8qI=", "narHash": "sha256-ZwK8n5yCYHjmSLPqwXiebUyQxSHQ3HyKAxs4psksuVc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "05773c5d1584cebd5eda41675c3456dcabdef42a", "rev": "9f56b704ff3073436c3b93d63669ee773c592aa3",
"type": "github" "type": "github"
}, },
"original": { "original": {
...@@ -120,16 +120,16 @@ ...@@ -120,16 +120,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1646067580, "lastModified": 1647800324,
"narHash": "sha256-9uwFtbNnpTZ2byYtTZoD6NunyhCwhPylVleJ3qufKFk=", "narHash": "sha256-rjwoxrk16zfrcO5Torh6CbAd5GHsHrXw+EwxOvh9AUI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "93a789543ae6b5831ae8040532202caa927f314c", "rev": "9bc841fec1c0e8b9772afa29f934d2c7ce57da8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "master", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
description = "MuCCC Infrastructure Deployment"; description = "MuCCC Infrastructure Deployment";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/master"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
muccc-api = { muccc-api = {
url = "git+https://gitlab.muc.ccc.de/muCCC/api"; url = "git+https://gitlab.muc.ccc.de/muCCC/api";
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
}; };
loungepi = { name, nodes, pkgs, ... }: { loungepi = { name, nodes, pkgs, ... }: {
deployment.targetHost = "192.168.178.36";
deployment.allowLocalDeployment = true; deployment.allowLocalDeployment = true;
nixpkgs.system = "aarch64-linux"; nixpkgs.system = "aarch64-linux";
imports = [ imports = [
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
wget curl htop iftop tmux tcpdump rsync git lsof screen wget curl htop iftop tmux tcpdump rsync git lsof screen
alacritty.terminfo alacritty.terminfo
]; ];
documentation.nixos.enable = false;
programs.bash.enableCompletion = true; programs.bash.enableCompletion = true;
programs.vim.defaultEditor = true; programs.vim.defaultEditor = true;
programs.zsh.enable = true; programs.zsh.enable = true;
...@@ -39,10 +38,10 @@ ...@@ -39,10 +38,10 @@
recommendedGzipSettings = true; recommendedGzipSettings = true;
recommendedProxySettings = true; recommendedProxySettings = true;
appendHttpConfig = '' appendHttpConfig = ''
access_log syslog:server=unix:/dev/log; access_log syslog:server=unix:/dev/log;
''; '';
appendConfig = '' appendConfig = ''
error_log stderr info; error_log stderr info;
''; '';
}; };
...@@ -61,7 +60,7 @@ ...@@ -61,7 +60,7 @@
nix.registry.nixpkgs.flake = flakes.nixpkgs; nix.registry.nixpkgs.flake = flakes.nixpkgs;
nix.nixPath = lib.mkForce [ "nixpkgs=${flakes.nixpkgs}" "nixos-config=/dontuse" ]; nix.nixPath = lib.mkForce [ "nixpkgs=${flakes.nixpkgs}" "nixos-config=/dontuse" ];
security.acme.email = "fpletz@muc.ccc.de"; security.acme.defaults.email = "fpletz@muc.ccc.de";
security.acme.acceptTerms = true; security.acme.acceptTerms = true;
nix.gc = { nix.gc = {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment