.sops.yaml

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

flake.nix

@@ -42,11 +42,13 @@
     # 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
@@ -61,7 +63,6 @@
 
     # 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; };

homes/x86_64-linux/kb@HyperC/default.nix

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

homes/x86_64-linux/kb@LoyAdjo/default.nix

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

modules/nixos/services/minecraft/velocity.nix

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

systems/i686-linux/Rubtrm/default.nix

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

systems/i686-linux/Rubtrm/hardware.nix

@@ -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 ];
+  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 ];
+  hardware.graphics.extraPackages32 = [ pkgs.intel-vaapi-driver pkgs.internal.intel-media-sdk pkgs.xorg.xf86videointel ];
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   hardware.enableAllFirmware = true;
 }

systems/x86_64-linux/LoyAdjo/default.nix

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

systems/x86_64-linux/U3ncSovm/default.nix

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

systems/x86_64-linux/U3ncSovm/hardware.nix

@@ -1,49 +0,0 @@
-{ 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;         
-    };
-  };
-
-}

systems/x86_64-linux/U3ncSovm/vm.nix

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

systems/x86_64-linux/voloxo/default.nix

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