From 3c1f616e2316c6802afb2f941a9bc951f7676b7b Mon Sep 17 00:00:00 2001
From: Julien Malka <julien@malka.sh>
Date: Sat, 4 Jun 2022 10:12:47 +0200
Subject: [PATCH] Updated newton to 22.05
---
base.nix | 2 +
flake.lock | 102 +++++++++++++++++-----------------
flake.nix | 4 +-
machines/newton/hardware.nix | 2 +-
modules/nginx/default.nix | 2 +-
modules/paperless/default.nix | 2 +-
6 files changed, 59 insertions(+), 55 deletions(-)
diff --git a/base.nix b/base.nix
index 8a73bca..1838a29 100644
--- a/base.nix
+++ b/base.nix
@@ -30,6 +30,8 @@
environment.variables.EDITOR = "nvim";
+ networking.firewall.checkReversePath = "loose";
+
security.pki.certificates = [
diff --git a/flake.lock b/flake.lock
index d67deef..4b556d6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -54,11 +54,11 @@
]
},
"locked": {
- "lastModified": 1651886851,
- "narHash": "sha256-kbXOJSf1uho0/7P54nZkJdJY3oAelIjyc6tfiRhaXJI=",
+ "lastModified": 1654113406,
+ "narHash": "sha256-70esZvhal+FsyU89mJRcAb+cDGHKt0sgZ6MlRr9Cplg=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "882bd8118bdbff3a6e53e5ced393932b351ce2f6",
+ "rev": "684e85d01d333be91c4875baebb05b93c7d2ffaa",
"type": "github"
},
"original": {
@@ -93,11 +93,11 @@
},
"locked": {
"dir": "contrib",
- "lastModified": 1652071951,
- "narHash": "sha256-jg/O2yBPJ/xR6hKZI4zPJlz8mKjdgKQcqQmBeY9n2js=",
+ "lastModified": 1654203681,
+ "narHash": "sha256-J9Z8VL48MqE2ycfe626TJYDY1pJNbamqf5DJ6kD6y5o=",
"owner": "neovim",
"repo": "neovim",
- "rev": "dbdd58e548fcf55848359b696275fd848756db7b",
+ "rev": "9745941ef620da86bf18f965f85e8fc2ce8206b5",
"type": "github"
},
"original": {
@@ -116,11 +116,11 @@
]
},
"locked": {
- "lastModified": 1652084226,
- "narHash": "sha256-WH2x3RJ0s3d48jA0GeIEhhhyG9e4rEmtxh0JIONCVVU=",
+ "lastModified": 1654244107,
+ "narHash": "sha256-QbpLCnknvWNelWOgjXzxm31A3HuHycDTeRLxdhGQBW8=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "6ad5194b7229f5d3b6db529844fa194e9e8b61f7",
+ "rev": "8f9e220b4eb1e92950f5f5c92dd9bc29c9e1859a",
"type": "github"
},
"original": {
@@ -131,57 +131,59 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1652020977,
- "narHash": "sha256-9hDlNbrxzD/pLlXmoQ6gzxbYiSAKrj7uHYUWNByLFlI=",
+ "lastModified": 1654181793,
+ "narHash": "sha256-kP4m7ZgFYj8fh7oW2L0uW0sJw/e0k1HY26HYJcvNEKM=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3c5ae9be1f18c790ea890ef8decbd0946c0b4c04",
+ "rev": "40e2b1ae0535885507ab01d7a58969934cf2713c",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-21.11",
+ "ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
- "nixpkgs-21_05": {
- "locked": {
- "lastModified": 1625692408,
- "narHash": "sha256-e9L3TLLDVIJpMnHtiNHJE62oOh6emRtSZ244bgYJUZs=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "c06613c25df3fe1dd26243847a3c105cf6770627",
- "type": "github"
- },
- "original": {
- "id": "nixpkgs",
- "ref": "nixos-21.05",
- "type": "indirect"
- }
- },
"nixpkgs-21_11": {
"locked": {
- "lastModified": 1638371214,
- "narHash": "sha256-0kE6KhgH7n0vyuX4aUoGsGIQOqjIx2fJavpCWtn73rc=",
+ "lastModified": 1653819578,
+ "narHash": "sha256-a1vaUl6VZz1NsWxMw0i5lRyHIOVUIuMZdQzV+4s+rY8=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a640d8394f34714578f3e6335fc767d0755d78f9",
+ "rev": "baa82d4b626288c7439eeea073a18aabbe435991",
"type": "github"
},
"original": {
- "id": "nixpkgs",
- "ref": "nixos-21.11",
- "type": "indirect"
+ "owner": "NixOS",
+ "ref": "release-21.11",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs-22_05": {
+ "locked": {
+ "lastModified": 1653822412,
+ "narHash": "sha256-xZwMDQ8MdNiTwE8dcKAX1h3qCmLtuudNGxmFUX3xIes=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "db78278ff296cf21eca7e8c08ee99707387a54fa",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "release-22.05",
+ "repo": "nixpkgs",
+ "type": "github"
}
},
"nur": {
"locked": {
- "lastModified": 1652113343,
- "narHash": "sha256-/oWymhWXVJvctnaplziyZP9DlNIdn6K6TX/PjosO1ZE=",
+ "lastModified": 1654248756,
+ "narHash": "sha256-LZuhksW59MwklXQPGlnqns07rz91NAqnDM7K5+s5Kro=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "405e40de38a8f2c6929fec436c01450b373912fe",
+ "rev": "5473c9e430d69b933cae009b0e686e1316c57718",
"type": "github"
},
"original": {
@@ -207,21 +209,19 @@
"nixpkgs": [
"nixpkgs"
],
- "nixpkgs-21_05": "nixpkgs-21_05",
- "nixpkgs-21_11": "nixpkgs-21_11",
"utils": "utils"
},
"locked": {
- "lastModified": 1638911354,
- "narHash": "sha256-hNhzLOp+dApEY15vwLAQZu+sjEQbJcOXCaSfAT6lpsQ=",
+ "lastModified": 1653423337,
+ "narHash": "sha256-TLNyDhwhQWimt5QWzFf/3B7lKk5isdICNRTwiCAhiB0=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
- "rev": "6e3a7b2ea6f0d68b82027b988aa25d3423787303",
+ "rev": "15cf252a0dfffb2420a60fbd6be3467c11026142",
"type": "gitlab"
},
"original": {
"owner": "simple-nixos-mailserver",
- "ref": "nixos-21.11",
+ "ref": "master",
"repo": "nixos-mailserver",
"type": "gitlab"
}
@@ -230,14 +230,16 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
- ]
+ ],
+ "nixpkgs-21_11": "nixpkgs-21_11",
+ "nixpkgs-22_05": "nixpkgs-22_05"
},
"locked": {
- "lastModified": 1649756291,
- "narHash": "sha256-KTll8bCINAzIUGaaMrbn9wb5nfhkXRLgmFrWGR/Dku0=",
+ "lastModified": 1653827546,
+ "narHash": "sha256-va51HFf7UwktvriIbe9pjRPMr7p8IaxrwcDlZe7twzI=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "c2614c4fe61943b3d280ac1892fcebe6e8eaf8c8",
+ "rev": "36b5901782e7fbfc191cace910f67f8b8743f678",
"type": "github"
},
"original": {
@@ -248,11 +250,11 @@
},
"unstable": {
"locked": {
- "lastModified": 1651726670,
- "narHash": "sha256-dSGdzB49SEvdOJvrQWfQYkAefewXraHIV08Vz6iDXWQ=",
+ "lastModified": 1654019511,
+ "narHash": "sha256-s3fcwUxa2rV2ZmSbdOtisNmXqeqnF9IFrvhPQL5GCBU=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01",
+ "rev": "692517bf851f2d8d999f0ad50f53fa1d2dd5c8f9",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 74e019a..b8f4458 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
{
description = "A flake for my personnal configurations";
inputs = {
- nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11";
+ nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
home-manager = {
url = "github:nix-community/home-manager";
@@ -27,7 +27,7 @@
};
simple-nixos-mailserver = {
- url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-21.11";
+ url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
inputs.nixpkgs.follows = "nixpkgs";
};
diff --git a/machines/newton/hardware.nix b/machines/newton/hardware.nix
index 6d8eb60..92b2d46 100644
--- a/machines/newton/hardware.nix
+++ b/machines/newton/hardware.nix
@@ -6,7 +6,7 @@
boot.zfs.requestEncryptionCredentials = true;
boot.loader.grub.copyKernels = true;
boot.loader.grub.efiSupport = false;
- boot.kernelPackages = pkgs.linuxPackages_5_10;
+ boot.kernelPackages = pkgs.linuxPackages_5_17;
boot.loader.grub.mirroredBoots = [
{ path = "/boot-1"; devices = [ "/dev/disk/by-id/ata-WDC_WD20EFRX-68EUZN0_WD-WCC4M1TVUVJV" ]; }
diff --git a/modules/nginx/default.nix b/modules/nginx/default.nix
index e85355d..34d37ac 100644
--- a/modules/nginx/default.nix
+++ b/modules/nginx/default.nix
@@ -15,7 +15,7 @@ in
config = mkIf cfg.enable {
networking.firewall.allowedTCPPorts = [ 80 443 ];
- security.acme.email = "${cfg.email}";
+ security.acme.defaults.email = "${cfg.email}";
security.acme.acceptTerms = true;
users.groups.nginx = { name = "nginx"; };
diff --git a/modules/paperless/default.nix b/modules/paperless/default.nix
index e9ed3d6..61cf599 100644
--- a/modules/paperless/default.nix
+++ b/modules/paperless/default.nix
@@ -24,7 +24,7 @@ in
config = mkIf cfg.enable (
mkMerge [{
- services.paperless-ng = {
+ services.paperless = {
enable = true;
user = cfg.user;
mediaDir = "/home/julien/papers";