Compare commits

...

3 commits

Author SHA1 Message Date
eb76d220f4
Fixed various Things for Pipeline to pass
All checks were successful
/ Check Nix Flake (push) Successful in 2m27s
2025-02-08 22:16:37 +01:00
14253d71b6
Added Sops to all Hosts, Added LoyAdjos Sops Key 2025-02-08 22:15:25 +01:00
959fd540dc
Added tmux 2025-02-08 22:13:08 +01:00
12 changed files with 66 additions and 25 deletions

View file

@ -1,6 +1,7 @@
keys:
- &server_kb-game-01 age165jt2q3uxp79k4jfsegnq7ul9j54l2rqsn87rq0qjkcv3y5krcmqsznyw7
- &client_LANA9Z age12v97unnfjmhm3ataxpl3mp89kxsr9hdqs4kmgsx8ys75m4ljey5qkf4t55
- &client_LoyAdjo age19tr9srawrft90s2a0cydqhuqt3f08aezmj82s43yhgzdte4fv4wstkchsz
creation_rules:
- path_regex: modules/nixos/services/minecraft/secrets.yaml$
key_groups:

View file

@ -42,13 +42,11 @@
# Modules for Host kb-game-01
systems.hosts.kb-game-01.modules = with inputs; [
lix-module.nixosModules.default
sops-nix.nixosModules.sops
];
# Modules for Host LANA7Z
systems.hosts.LANA9Z.modules = with inputs; [
lix-module.nixosModules.default
sops-nix.nixosModules.sops
];
# Modules for Host LoyAdjo
@ -63,6 +61,7 @@
# Modules that get imported to every NixOS system
systems.modules.nixos = with inputs; [
sops-nix.nixosModules.sops
];
outputs-builder = channels: { formatter = channels.nixpkgs.nixfmt-rfc-style; };

View file

@ -28,7 +28,6 @@ in {
libreoffice-qt
logseq
xournalpp
xournal
rnote
# Security
gnupg

View file

@ -60,6 +60,7 @@ in {
mangohud
prismlauncher
# Terminal Tools
tmux
mosh
btop
fastfetch

View file

@ -59,13 +59,15 @@ in
networking.firewall.allowedTCPPorts = [ 25565 ];
# Configure Plugin Luckperms
services.minecraft-servers.servers."velocity".files."plugins/luckperms/config.yml".value = {
storage-method = "mariadb";
data.address = "localhost:${toString config.services.mysql.settings.mysqld.port}";
data.database = "luckperms";
data.username = "luckperms";
data.password = builtins.readFile /run/secrets/minecraft/database/luckperms_password; # Secret created in ./database.nix
};
sops.templates."minecraft/velocity/plugin/luckperms/config.yml".path = "/srv/minecraft/velocity/plugins/luckperms/config.yml";
sops.templates."minecraft/velocity/plugin/luckperms/config.yml".content = ''
storage-method: mariadb
data:
address: localhost:${toString config.services.mysql.settings.mysqld.port}
database: luckperms
username: luckperms
password: ${config.sops.placeholder."minecraft/database/luckperms_password"}
'';
};

View file

@ -44,7 +44,7 @@
# Enable the X11 windowing system.
services.xserver.enable = true;
services.xserver.videoDrivers = [ "intel" "modesetting" "fbdev" "vesa" "intel_drv" "intel-media-sdk" ];
services.xserver.videoDrivers = [ "modesetting" "fbdev" "vesa" "intel_drv" "intel-media-sdk" ];
# Enable Desktop Environment.
services.displayManager.sddm.enable = true;
# services.displayManager.sddm.wayland.enable = true;

View file

@ -37,8 +37,8 @@
nixpkgs.hostPlatform = lib.mkDefault "i686-linux";
# networking.enableIntel3945ABGFirmware = true;
hardware.graphics.extraPackages = [ pkgs.intel-vaapi-driver pkgs.internal.intel-media-sdk pkgs.xorg.xf86videointel ];
hardware.graphics.extraPackages32 = [ pkgs.intel-vaapi-driver pkgs.internal.intel-media-sdk pkgs.xorg.xf86videointel ];
hardware.graphics.extraPackages = [ pkgs.intel-vaapi-driver pkgs.internal.intel-media-sdk ];
hardware.graphics.extraPackages32 = [ pkgs.intel-vaapi-driver pkgs.internal.intel-media-sdk ];
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.enableAllFirmware = true;
}

View file

@ -92,6 +92,7 @@
isNormalUser = true;
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIuvGIdO1nwuzq3YrjpxH84rpGhquNvRKz1SSPwKUsth kb @ Rubtrm"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGRlk8FEIN7P81SRVEkP1wjlBjsiUGcBcqzSbHVGB0sF root @ Ohybke"
];
};

View file

@ -2,7 +2,7 @@
{
imports = [ # Include the results of the hardware scan.
./vm.nix
./hardware.nix
];
# Configure Nix

View file

@ -0,0 +1,49 @@
{ config, lib, pkgs, modulesPath, inputs, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
# Configure NixOS
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
# Boot Parameters
boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "firewire_ohci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" "wl" ];
boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
# Filesystems
fileSystems."/" = {
device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-00000000-0000-0000-0000-000000000000".device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/0000-0000";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices = [
{
device = "/swapfile";
size = 4*1024;
}
];
# Network
networking.useDHCP = lib.mkDefault true;
# Hardware
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
# Virtual Machine Configuration
virtualisation.vmVariant = {
# following configuration is added only when building VM with build-vm
virtualisation = {
memorySize = 4*1024;
cores = 3;
};
};
}

View file

@ -1,10 +0,0 @@
{ config, lib, pkgs, modulesPath, ... }:
{
virtualisation.vmVariant = {
# following configuration is added only when building VM with build-vm
virtualisation = {
memorySize = 4*1024;
cores = 3;
};
};
}

View file

@ -139,7 +139,6 @@
tidal-hifi
iamb # Matrix with Vim-Binds
yazi
nerdfonts
scrcpy
ryujinx
razergenie