c3d2/nix-config
c3d2
/
nix-config
24
7
Fork 3
Code Issues 12 Pull Requests 2 Releases Wiki Activity

Add c3d2 user module, update nixos-modules

This commit is contained in:
Sandro - 2023-01-03 05:31:48 +01:00
parent 2a4dfc5305
commit 1cb5212616
Signed by: sandro
GPG Key ID: 3AF5A43A3EECC2E5
3 changed files with 54 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/default.nix
View File

@ -11,6 +11,10 @@ lib.mkMerge [
zfs.forceImportRoot = false;
};
c3d2 = {
addKnownHosts = true;
};
documentation.nixos.enable = false;
environment = {
@ -128,11 +132,6 @@ lib.mkMerge [
};
};
# TODO: move to nixos-modules
services = {
zfs.autoScrub.enable = true;
};
systemd = {
# Do not break the boot
enableEmergencyMode = false;

63
flake.lock
View File

@ -155,6 +155,29 @@
"url": "https://gitea.c3d2.de/astro/buzzrelay"
}
},
"c3d2-user-module": {
"inputs": {
"nixos-modules": [
"nixos-modules"
],
"nixpkgs-lib": [
"nixos"
]
},
"locked": {
"lastModified": 1672719809,
"narHash": "sha256-LSPhjSSdPTTISCokUE//wvkAnndjmSzsMKZdwFcM1kg=",
"ref": "refs/heads/master",
"rev": "7dcb88931dbe7f5b9c57688a31e4e391e1080fe3",
"revCount": 1,
"type": "git",
"url": "https://gitea.c3d2.de/C3D2/nix-user-module.git"
},
"original": {
"type": "git",
"url": "https://gitea.c3d2.de/C3D2/nix-user-module.git"
}
},
"caveman": {
"inputs": {
"fenix": [
@ -381,14 +404,16 @@
},
"nixos-modules": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
"nixpkgs-lib": [
"nixos"
]
},
"locked": {
"lastModified": 1672699474,
"narHash": "sha256-twlcqg1dNfz7cKnjWPndlt0CQgq0QD+uCdQDvWiYXUE=",
"lastModified": 1672719740,
"narHash": "sha256-Q7t1b+THjGldMB/bxKj8IqUsvmEZiD+KTuFqPBXrR+E=",
"owner": "SuperSandro2000",
"repo": "nixos-modules",
"rev": "3d9678ed6079171ec434dfad9c3a9c8dc0d4403f",
"rev": "f8b9ee8d23760845528ace298769c71609cc29c6",
"type": "github"
},
"original": {
@ -397,21 +422,6 @@
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1671324337,
"narHash": "sha256-OZVfw69LQi2RckjPdooYrhw1I2vd28QdzEGJwI3w+jk=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "b4dd796b65c0bee6185fd2b5c84c2a207231e28f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"oparl-scraper": {
"flake": false,
"locked": {
@ -474,6 +484,7 @@
"bevy-mandelbrot": "bevy-mandelbrot",
"buzz2elastic": "buzz2elastic",
"buzzrelay": "buzzrelay",
"c3d2-user-module": "c3d2-user-module",
"caveman": "caveman",
"fenix": "fenix",
"flake-utils": "flake-utils",
@ -529,11 +540,11 @@
]
},
"locked": {
"lastModified": 1672626196,
"narHash": "sha256-BfdLrMqxqa4YA1I1wgPBQyu4FPzL0Tp4WI2C5S6BuYo=",
"lastModified": 1672712534,
"narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "c8bf9c162bb3f734cf357846e995eb70b94e2bcd",
"rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f",
"type": "github"
},
"original": {
@ -768,11 +779,11 @@
]
},
"locked": {
"lastModified": 1672094890,
"narHash": "sha256-8tkgoE9sdkWFBUv1DSb2JqHLGruEvRVuyIlTA1WawCA=",
"lastModified": 1672714743,
"narHash": "sha256-OwuzYuT6X+KmgNkiQ3p0bCpqf/l2ud6BmDFm6F7GlvU=",
"ref": "refs/heads/master",
"rev": "14bdeccb453b7faafe53f656cdf8d439308d34b8",
"revCount": 1713,
"rev": "7a872426e7ccea53da8add16b7a5dade4703f47d",
"revCount": 1714,
"type": "git",
"url": "https://gitea.c3d2.de/zentralwerk/network.git"
},

15
flake.nix
View File

@ -11,7 +11,6 @@
nixos.url = "github:SuperSandro2000/nixpkgs/nixos-22.11";
nixos-mobilizon.url = "github:minijackson/nixpkgs/init-mobilizon";
nixos-hardware.url = "github:nixos/nixos-hardware";
nixos-modules.url = "github:SuperSandro2000/nixos-modules";
# nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# nixos-unstable-simd.url = "github:SuperSandro2000/nixpkgs/nixos-unstable-simd";
@ -75,6 +74,13 @@
naersk.inputs.nixpkgs.follows = "nixpkgs";
};
};
c3d2-user-module = {
url = "git+https://gitea.c3d2.de/C3D2/nix-user-module.git";
inputs = {
nixos-modules.follows = "nixos-modules";
nixpkgs-lib.follows = "nixos";
};
};
fenix = {
url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixos";
@ -109,6 +115,10 @@
nixpkgs.follows = "nixos";
};
};
nixos-modules = {
url = "github:SuperSandro2000/nixos-modules";
inputs.nixpkgs-lib.follows = "nixos";
};
oparl-scraper = {
url = "github:offenesdresden/ratsinfo-scraper/oparl";
flake = false;
@ -200,7 +210,7 @@
};
};
outputs = inputs@{ self, alert2muc, fenix, harmonia, heliwatch, microvm, naersk, nixos, nixos-hardware, nixos-modules, buzz2elastic, buzzrelay, caveman, oparl-scraper, scrapers, secrets, skyflake, sshlogd, sops-nix, spacemsg, ticker, tigger, yammat, zentralwerk, ... }:
outputs = inputs@{ self, alert2muc, c3d2-user-module, fenix, harmonia, heliwatch, microvm, naersk, nixos, nixos-hardware, nixos-modules, buzz2elastic, buzzrelay, caveman, oparl-scraper, scrapers, secrets, skyflake, sshlogd, sops-nix, spacemsg, ticker, tigger, yammat, zentralwerk, ... }:
let
inherit (nixos) lib;
@ -253,6 +263,7 @@
})
self.nixosModules.c3d2
c3d2-user-module.nixosModule
nixos-modules.nixosModule
./config
./modules/audio-server.nix