Compare commits
7 commits
855b932cbd
...
53fc3f2100
Author | SHA1 | Date | |
---|---|---|---|
![]() |
53fc3f2100 | ||
![]() |
6c8f40ff8f | ||
![]() |
7f48da24e9 | ||
![]() |
5a9e25cc6e | ||
![]() |
33a314b658 | ||
![]() |
386616404f | ||
![]() |
01cbabde79 |
17 changed files with 93 additions and 65 deletions
24
flake.lock
generated
24
flake.lock
generated
|
@ -296,11 +296,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1749195551,
|
||||
"narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=",
|
||||
"lastModified": 1749832440,
|
||||
"narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "4602f7e1d3f197b3cb540d5accf5669121629628",
|
||||
"rev": "db030f62a449568345372bd62ed8c5be4824fa49",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -312,11 +312,11 @@
|
|||
},
|
||||
"nixos-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1749285348,
|
||||
"narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
|
||||
"lastModified": 1749794982,
|
||||
"narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
|
||||
"rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -328,11 +328,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1749237914,
|
||||
"narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=",
|
||||
"lastModified": 1749727998,
|
||||
"narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265",
|
||||
"rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -403,11 +403,11 @@
|
|||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749389855,
|
||||
"narHash": "sha256-//wZBnlBJ7Ki5/ZdafiAZwVFZd/2HhKqEbOupo/HcRA=",
|
||||
"lastModified": 1749908208,
|
||||
"narHash": "sha256-0nf9P4kRAzsBvf5jbY7M3NlnGSwBzU50kJAYGZH5Ez4=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "bf5ab9df57a3d77847289c39c3a537bd6e6ac6f4",
|
||||
"rev": "67c8eca32f1baf158ffb9a56f28a2fc8e9852fb0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -1,37 +1,37 @@
|
|||
{pkgs, ...}:{
|
||||
{pkgs, rootPath, lib, ...}:{
|
||||
imports = [
|
||||
./boot.nix
|
||||
./hardware-configuration.nix
|
||||
(rootPath + /system_profiles/server.nix)
|
||||
(rootPath + /modules/pkg_mgrmnt/unattended-updates.nix)
|
||||
|
||||
#../../modules/hosting/wordpress-simple/kiezpalme.nix
|
||||
#../../modules/hosting/wordpress-simple/pertineo.nix
|
||||
../../modules/hosting/wordpress.nix
|
||||
../../modules/sec_auth/ssh-server.nix
|
||||
|
||||
../../system_profiles/server.nix
|
||||
(rootPath + /modules/hosting/wordpress-simple/kiezpalme.nix)
|
||||
(rootPath + /modules/hosting/wordpress-simple/pertineo.nix)
|
||||
#(rootPath + /modules/hosting/wordpress.nix)
|
||||
];
|
||||
|
||||
#services.mysql = {
|
||||
services.mysql = {
|
||||
enable = true;
|
||||
package = pkgs.mariadb;
|
||||
settings.mysqld.bind-address = "127.0.0.1";
|
||||
};
|
||||
|
||||
#services.cWordpress."example-site" = {
|
||||
# enable = true;
|
||||
# package = pkgs.mariadb;
|
||||
# sitePort = 80;
|
||||
#};
|
||||
|
||||
services.cWordpress."example-site" = {
|
||||
enable = true;
|
||||
sitePort = 80;
|
||||
};
|
||||
#services.cWordpress."example-site2" = {
|
||||
# enable = true;
|
||||
# sitePort = 81;
|
||||
#};
|
||||
|
||||
services.cWordpress."example-site2" = {
|
||||
enable = true;
|
||||
sitePort = 81;
|
||||
};
|
||||
|
||||
services.openssh.ports = [11522];
|
||||
services.openssh.ports = lib.mkForce [11522];
|
||||
users = let
|
||||
username = "root";
|
||||
in {
|
||||
users."${username}".openssh.authorizedKeys.keyFiles = [
|
||||
../../certificates/id_ed25519_ext-julia.pub
|
||||
(rootPath + /certificates/id_ed25519_ext-julia.pub)
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,10 +6,6 @@
|
|||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
|
||||
boot = {
|
||||
initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];
|
||||
initrd.kernelModules = [];
|
||||
|
|
|
@ -1,20 +1,18 @@
|
|||
{
|
||||
{rootPath, ...}: {
|
||||
imports = [
|
||||
./boot.nix
|
||||
./hardware-configuration.nix
|
||||
(rootPath + /system_profiles/server.nix)
|
||||
|
||||
../../modules/game/server/luanti
|
||||
../../modules/sec_auth/ssh-server.nix
|
||||
../../modules/pkg_mgrmnt/unattended-updates.nix
|
||||
|
||||
../../system_profiles/server.nix
|
||||
(rootPath + /modules/game/server/luanti)
|
||||
(rootPath + /modules/pkg_mgrmnt/unattended-updates.nix)
|
||||
];
|
||||
|
||||
users = let
|
||||
username = "root";
|
||||
in {
|
||||
users."${username}".openssh.authorizedKeys.keyFiles = [
|
||||
../../certificates/id_ed25519_game-luanti.pub
|
||||
(rootPath + /certificates/id_ed25519_game-luanti.pub)
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
@ -6,9 +6,6 @@
|
|||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
boot = {
|
||||
initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];
|
||||
initrd.kernelModules = [];
|
||||
|
|
|
@ -1,13 +0,0 @@
|
|||
{...}: {
|
||||
nixpkgs.config = {
|
||||
# Disable if you don't want unfree packages
|
||||
allowUnfree = true;
|
||||
};
|
||||
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
|
||||
../../system_profiles/defaults.nix
|
||||
../../system_profiles/mini-container.nix
|
||||
];
|
||||
}
|
|
@ -1,3 +0,0 @@
|
|||
{lib, ...}: {
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
}
|
7
hosts/srv-videoconf/default.nix
Normal file
7
hosts/srv-videoconf/default.nix
Normal file
|
@ -0,0 +1,7 @@
|
|||
{rootPath, ...}: {
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
|
||||
(rootPath + /system_profiles/server.nix)
|
||||
];
|
||||
}
|
33
hosts/srv-videoconf/hardware-configuration.nix
Normal file
33
hosts/srv-videoconf/hardware-configuration.nix
Normal file
|
@ -0,0 +1,33 @@
|
|||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{
|
||||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
boot = {
|
||||
initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];
|
||||
initrd.kernelModules = [];
|
||||
kernelModules = [];
|
||||
extraModulePackages = [];
|
||||
};
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/d290e12c-d93c-45f6-b737-135b551c1951";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{device = "/dev/disk/by-uuid/8c56f52e-568a-4e03-b22c-6d1c7de7c118";}
|
||||
];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.ens18.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
}
|
|
@ -11,7 +11,6 @@
|
|||
./locale.nix
|
||||
./networking.nix
|
||||
#./plymouth.nix # increases boot time too much
|
||||
#./serial-console.nix # probably only for servers
|
||||
./theming.nix
|
||||
];
|
||||
}
|
||||
|
|
|
@ -15,11 +15,11 @@ in {
|
|||
nixosConfigurations = builtins.mapAttrs (hostName: hostOptions: (hostHelper hostName hostOptions)) {
|
||||
crocoite = {stateVersion = "24.05";};
|
||||
|
||||
#jitsi = {stateVersion = "24.11";};
|
||||
#srv-videoconf = {stateVersion = "24.11";};
|
||||
|
||||
game-luanti = {stateVersion = "25.05";};
|
||||
|
||||
#ext-julia = {stateVersion = "24.11";};
|
||||
ext-julia = {stateVersion = "25.05";};
|
||||
};
|
||||
|
||||
# Your custom packages
|
||||
|
|
5
system_profiles/components/nixpkgs-ng.nix
Normal file
5
system_profiles/components/nixpkgs-ng.nix
Normal file
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
system = {
|
||||
rebuild.enableNg = false;
|
||||
};
|
||||
}
|
6
system_profiles/components/qemu.nix
Normal file
6
system_profiles/components/qemu.nix
Normal file
|
@ -0,0 +1,6 @@
|
|||
{modulesPath, ...}; {
|
||||
imports = [
|
||||
(modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
services.qemuGuest.enable = true;
|
||||
}
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
imports = [
|
||||
./components/nix-defaults.nix
|
||||
#./components/nixpkgs-ng.nix
|
||||
|
||||
./importers/desktop.nix
|
||||
./importers/general.nix
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{rootPath, ...}: {
|
||||
imports = [
|
||||
(rootPath + /modules/customisation.nix)
|
||||
(rootPath + /modules/sec_auth/ssh-server.nix)
|
||||
(rootPath + /modules/software/neovim.nix)
|
||||
(rootPath + /modules/software/packages/core.nix)
|
||||
];
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
imports = [
|
||||
./components/minify.nix
|
||||
./components/nix-defaults.nix
|
||||
./components/qemu.nix
|
||||
|
||||
./importers/general.nix
|
||||
./importers/server.nix
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue