jonmro
/
pvv-nixos-config
forked from Drift/pvv-nixos-config
1
0
Fork 0
Code Pull Requests Activity

Upgrade to nixpkgs 23.05

This commit is contained in:
Oystein Kristoffer Tveit 2023-05-31 11:04:38 +02:00
parent d694724f5c
commit db44bcf4bc
Signed by untrusted user: oysteikt
GPG Key ID: 9F2F7D8250F35146
3 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
base.nix
View File

@ -13,7 +13,7 @@
# networking.defaultGateway = values.hosts.gateway; # networking.defaultGateway = values.hosts.gateway;
systemd.network.enable = true; systemd.network.enable = true;
services.resolved = { services.resolved = {
enable = lib.mkDefault true; enable = lib.mkDefault true;
dnssec = "false"; # Supposdly this keeps breaking and the default is to allow downgrades anyways... dnssec = "false"; # Supposdly this keeps breaking and the default is to allow downgrades anyways...
@ -67,14 +67,16 @@
kitty.terminfo kitty.terminfo
]; ];
programs.zsh.enable = true;
users.groups."drift".name = "drift"; users.groups."drift".name = "drift";
services.openssh = { services.openssh = {
enable = true; enable = true;
permitRootLogin = "yes";
extraConfig = '' extraConfig = ''
PubkeyAcceptedAlgorithms=+ssh-rsa PubkeyAcceptedAlgorithms=+ssh-rsa
''; '';
settings.PermitRootLogin = "yes";
}; };

26
flake.lock
View File

@ -20,16 +20,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1680879128, "lastModified": 1685474417,
"narHash": "sha256-ISFCCZ3/Dw5WK/6kFKwqA6gIEaOjqU/5NoB6Vge87sE=", "narHash": "sha256-wrHP9k8T4F7oLtAieMsrf7vCaRTGScSt4x52O7zw2Rg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fa98075869eb8264052548dde5c2ce9e68cf4cf1", "rev": "456af4e1746ddf18ade36c4d550c12ed8656ff00",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-22.11-small", "ref": "nixos-23.05-small",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -51,11 +51,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1680390120, "lastModified": 1685215858,
"narHash": "sha256-RyDJcG/7mfimadlo8vO0QjW22mvYH1+cCqMuigUntr8=", "narHash": "sha256-IRMFoDXA6cYx3ifVw3B2JcC4JrjT5v7tRAx2vro2Ffs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c1e2efaca8d8a3db6a36f652765d6c6ba7bb8fae", "rev": "ba6e4ddeb3e8ad3f3e3bec63dafbc9fe558729bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -81,11 +81,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1680404136, "lastModified": 1685434555,
"narHash": "sha256-06D8HJmRv4DdpEQGblMhx2Vm81SBWM61XBBIx7QQfo0=", "narHash": "sha256-aZl0yeaYX3T2L3W3yXOd3S9OfpS+8YUOT2b1KwrSf6E=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "b93eb910f768f9788737bfed596a598557e5625d", "rev": "876846cde9762ae563f018c17993354875e2538e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -96,11 +96,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1680882415, "lastModified": 1685471549,
"narHash": "sha256-trt2pwLDu1+kEtp3bx2DiYgg8CFWNbes+ujdAtSBO/U=", "narHash": "sha256-cdlkm7aum5dbfo4guI8G2gp6lrwkNy55kQYUrR5ahpA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cd07e0258cf73e1bcbd0c9abc5513baa091ee801", "rev": "224d494fe3f90dfbc0567fe49938b17b6e003b92",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
flake.nix
View File

@ -2,7 +2,7 @@
description = "PVV System flake"; description = "PVV System flake";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11-small"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05-small";
unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
@ -11,7 +11,7 @@
matrix-next.url = "github:dali99/nixos-matrix-modules"; matrix-next.url = "github:dali99/nixos-matrix-modules";
}; };
outputs = { self, nixpkgs, matrix-next, unstable, sops-nix, ... }@inputs: outputs = { self, nixpkgs, matrix-next, unstable, sops-nix, ... }@inputs:
let let
systems = [ systems = [
"x86_64-linux" "x86_64-linux"
@ -27,10 +27,20 @@
inherit unstable inputs; inherit unstable inputs;
values = import ./values.nix; values = import ./values.nix;
}; };
modules = [ modules = [
./hosts/${name}/configuration.nix ./hosts/${name}/configuration.nix
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
]; ];
pkgs = import nixpkgs {
inherit system;
overlays = [
(final: prev: {
mx-puppet-discord = prev.mx-puppet-discord.override { nodejs_14 = final.nodejs_18; };
})
];
};
} }
config config
); );