summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock34
-rw-r--r--flake.nix4
-rw-r--r--hosts/ahmed/ssh.nix2
-rw-r--r--pkgs/default.nix5
4 files changed, 16 insertions, 29 deletions
diff --git a/flake.lock b/flake.lock
index 660b056..7b9ac38 100644
--- a/flake.lock
+++ b/flake.lock
@@ -4,20 +4,19 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
- ],
- "utils": "utils"
+ ]
},
"locked": {
- "lastModified": 1685325875,
- "narHash": "sha256-tevlLIMPeVNNYPd9UgjHApAUoFAnw9iohqUyj+LPp88=",
+ "lastModified": 1693208669,
+ "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "b372d7f8d5518aaba8a4058a453957460481afbc",
+ "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-22.11",
+ "ref": "release-23.05",
"repo": "home-manager",
"type": "github"
}
@@ -44,16 +43,16 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1688392541,
- "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=",
+ "lastModified": 1694048570,
+ "narHash": "sha256-PEQptwFCVaJ+jLFJgrZll2shQ9VI/7xVhrCYkJo8iIw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b",
+ "rev": "4f77ea639305f1de0a14d9d41eef83313360638c",
"type": "github"
},
"original": {
"owner": "NixOS",
- "ref": "nixos-22.11",
+ "ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
@@ -64,21 +63,6 @@
"nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs"
}
- },
- "utils": {
- "locked": {
- "lastModified": 1667395993,
- "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
}
},
"root": "root",
diff --git a/flake.nix b/flake.nix
index 3ea2d4a..21245bc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,10 +1,10 @@
{
inputs = {
nixpkgs = {
- url = "github:NixOS/nixpkgs/nixos-22.11";
+ url = "github:NixOS/nixpkgs/nixos-23.05";
};
home-manager = {
- url = "github:nix-community/home-manager/release-22.11";
+ url = "github:nix-community/home-manager/release-23.05";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-darwin = {
diff --git a/hosts/ahmed/ssh.nix b/hosts/ahmed/ssh.nix
index f737437..dfe4c30 100644
--- a/hosts/ahmed/ssh.nix
+++ b/hosts/ahmed/ssh.nix
@@ -7,7 +7,7 @@
networking.firewall.allowedTCPPorts = [ 22 ];
services.openssh = {
enable = true;
- passwordAuthentication = false;
+ settings.PasswordAuthentication = false;
};
users.users = lib.genAttrs ["root" "linus"] (_: {
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 6fda8b3..b84e5b4 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -4,7 +4,7 @@ pkgs:
# duksebot = pkgs.callPackage ./duksebot { };
# Use patched version from Karl.
- smu = pkgs.smu.overrideAttrs (old: {
+ smu = (pkgs.smu.overrideAttrs (old: {
version = "2022-08-01";
src = pkgs.fetchFromGitHub {
owner = "karlb";
@@ -12,5 +12,8 @@ pkgs:
rev = "bd03c5944b7146d07a88b58a2dd0d264836e3322";
hash = "sha256-Jx7lJ9UTHAOCgPxF2p7ZoZBZ476bLXN5dI0vspusmGo=";
};
+ hardeningDisable = [ "fortify" ];
+ })).overrideDerivation(old: {
+ NIX_CFLAGS_COMPILE = (old.NIX_CFLAGS_COMPILE or "") + " -Wno-maybe-uninitialized";
});
}