Fachschaft/nixConfig
5
2
Fork 2
Code Issues 7 Pull requests 2 Projects 1 Wiki Activity

Compare commits

base: Fachschaft:2b0eec7dbf8727ece90dd7d7599b3c76302cc908
Branches Tags
Fachschaft:main
Fachschaft:nyarlathtop
...
compare: Fachschaft:23283f6141245c9bae7916be98864ce5786fce7c
Branches Tags
Fachschaft:main
Fachschaft:nyarlathtop

3 commits
2b0eec7dbf ... 23283f6141

Author SHA1 Message Date
Dennis Frieberg
23283f6141
fixed small error in trusted nix keys handling 2023-09-22 20:00:35 +02:00
Dennis Frieberg
fc1fb67061
first running config (fingers crossed) 2023-09-22 19:36:48 +02:00
Dennis Frieberg
10ec752fa6
updated dependencies 2023-09-22 15:32:16 +02:00
6 changed files with 42 additions and 17 deletions
Show stats Expand all files Collapse all files

42
flake.lock
View file

@ -21,11 +21,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1685662779, "lastModified": 1693611461,
"narHash": "sha256-cKDDciXGpMEjP1n6HlzKinN0H+oLmNpgeCTzYnsA2po=", "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "71fb97f0d875fd4de4994dfb849f2c75e17eb6c3", "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -39,14 +39,15 @@
"flake-compat": [], "flake-compat": [],
"nixpkgs": [], "nixpkgs": [],
"nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-22_11": "nixpkgs-22_11",
"nixpkgs-23_05": "nixpkgs-23_05",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1686468558, "lastModified": 1689976554,
"narHash": "sha256-K69Ojlx3N8I6tRTZsrKFMIqK4yrnJ6/PjfKZi3wchYg=", "narHash": "sha256-uWJq3sIhkqfzPmfB2RWd5XFVooGFfSuJH9ER/r302xQ=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "290d00f6db4e80467013728819ad73dd4a394d9a", "rev": "c63f6e7b053c18325194ff0e274dba44e8d2271e",
"revCount": 554, "revCount": 570,
"type": "git", "type": "git",
"url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git" "url": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git"
}, },
@ -57,11 +58,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1686412476, "lastModified": 1695145219,
"narHash": "sha256-inl9SVk6o5h75XKC79qrDCAobTD1Jxh6kVYTZKHzewA=", "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "21951114383770f96ae528d0ae68824557768e81", "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -86,14 +87,29 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-23_05": {
"locked": {
"lastModified": 1684782344,
"narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8966c43feba2c701ed624302b6a935f97bcbdf88",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.05",
"type": "indirect"
}
},
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"dir": "lib", "dir": "lib",
"lastModified": 1685564631, "lastModified": 1693471703,
"narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=", "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4f53efe34b3a8877ac923b9350c874e3dcd5dc0a", "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
nixos/machines/nyarlathotep/hardware-configuration.nix
View file

@ -2,7 +2,7 @@
imports = [ ]; imports = [ ];
boot.initrd.availableKernelModules = boot.initrd.availableKernelModules =
[ "ata_piix" "sr_mod" "xen_bklfront" ]; [ "ata_piix" "sr_mod" "xen_blkfront" ];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];

2
nixos/machines/nyarlathotep/network.nix
View file

@ -5,7 +5,7 @@
imports = [ ]; imports = [ ];
networking = { networking = {
interfaces.enX0.ipv4.addresses = [ { interfaces.enX0.ipv4.addresses = [ {
addresses = "192.168.0.28"; address = "192.168.0.28";
prefixLength = 16; prefixLength = 16;
} ]; } ];
defaultGateway = "192.168.0.155"; defaultGateway = "192.168.0.155";

2
nixos/roles/admins.nix
View file

@ -5,7 +5,7 @@ let
admins = { admins = {
nerf = { nerf = {
hashedPassword = hashedPassword =
"$6$rounds=424242$FaEtIXMUScxgAYyF$Fl8GbPFgiEv.1iwrhtVpTixG1BTJys3aIfLyTzocQYZV4JymrYEXtnyCTURmVDe8stxbxgDutmtlyElfn1DQc/"; "$y$j9T$SJcjUIcs3JYuM5oyxfEQa/$tUBQT07FK4cb9xm.A6ZKVnFIPNOYMOKC6Dt6hadCuJ7";
keys = [ keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEdA4LpEGUUmN8esFyrNZXFb2GiBID9/S6zzhcnofQuP nerf@nerflap2" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEdA4LpEGUUmN8esFyrNZXFb2GiBID9/S6zzhcnofQuP nerf@nerflap2"
]; ];

5
nixos/roles/default.nix
View file

@ -1,6 +1,9 @@
{pkgs, config, lib, ...} : { {pkgs, config, lib, ...} : {
imports = [ ./admins.nix ]; imports = [
./admins.nix
./nix_keys.nix
];
nix = { nix = {
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes experimental-features = nix-command flakes

6
nixos/roles/nix_keys.nix Normal file
View file

@ -0,0 +1,6 @@
{
imports = [ ];
nix.settings.trusted-public-keys = [
"nerflap2-1:pDZCg0oo9PxNQxwVSQSvycw7WXTl53PGvVeZWvxuqJc="
];
}