Blunkall-Technologies/Olympus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

may work

Browse Source
This commit is contained in:
Nathan
2026-01-05 15:20:14 -06:00
parent ea3c826c63
commit 7c61d646a6
9 changed files with 23 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/profiles/laptop/default.nix
View File

@@ -16,7 +16,7 @@
# Bootloader.
boot = {
kernelPackages = pkgs.linuxKernel.packages.linux_6_16;
kernelPackages = pkgs.linuxKernel.packages.linux_6_18;
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;

2
system/programs/default.nix
View File

@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: {
{ ... }: {
imports = [
./hyprland

6
system/programs/hyprland/default.nix
View File

@@ -1,4 +1,4 @@
{ config, lib, pkgs, inputs, ... }: {
{ config, lib, pkgs, hyprland, ... }: {
options.sysconfig.programs.hyprland.enable = lib.options.mkOption {
type = lib.types.bool;
@@ -18,9 +18,9 @@
systemd.setPath.enable = true;
package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
package = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
portalPackage = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
};
};
}

65
system/services/containers/minecraft/default.nix
View File

@@ -12,68 +12,11 @@
};
};
imports = [
/*imports = [
nix-minecraft.nixosModules.minecraft-servers
];
];*/
config = lib.mkIf config.sysconfig.services.minecraft.enable {
nixpkgs.overlays = [ nix-minecraft.overlay ];
services.minecraft-servers = {
enable = true;
eula = true;
openFirewall = true;
dataDir = "/var/lib/mcservers";
#managementSystem.systemd-socket.enable = true; #temp
servers = {
bedrock = {
enable = true;
package = pkgs.fabricServers.fabric-1_21_8;
serverProperties = {
server-port = 25566;
gamemode = "survival";
difficulty = 2;
white-list = true;
motd = "Test";
};
whitelist = {
"MeasureTwice66" = "a4032062-293d-484d-a790-9f52475836bb";
"651sonic" = "936a3fb0-4548-4557-975b-7794e97a3afc";
"Griffin12_" = "6a1f56d9-f712-4723-a031-e5437a389bb3";
};
autoStart = true;
};
modded = {
enable = false;
#package = pkgs.fabricServers.fabric-1_21_1.override { loaderVersion = "0.16.14"; };
package = pkgs.fabricServers.fabric-1_21_1;
jvmOpts = [ "-Xms8000M" "-Xmx12000M" ];
serverProperties = {
server-port = 25566;
gamemode = "survival";
white-list = true;
allow-flight = true;
motd = "Ex-plo-sion!!!";
};
whitelist = {
"MeasureTwice66" = "a4032062-293d-484d-a790-9f52475836bb";
"651sonic" = "936a3fb0-4548-4557-975b-7794e97a3afc";
"Griffin12_" = "6a1f56d9-f712-4723-a031-e5437a389bb3";
};
autoStart = true;
symlinks = {
"mods" = ./mods;
};
};
};
};
} // (lib.mkIf config.sysconfig.virtualization.minecraft.enable {
config = lib.mkIf config.sysconfig.virtualization.minecraft.enable {
networking = {
firewall = {
@@ -172,5 +115,5 @@
system.stateVersion = "25.05";
};
};
});
};
}

10
system/users/default.nix
View File

@@ -1,12 +1,16 @@
{ config, lib, pkgs, inputs, ... }: {
{ config, lib, pkgs, ... } @ inputs: {
imports = let
dir = builtins.readDir ./.;
in (builtins.filter
in builtins.map (x: ./${x}) (builtins.filter
(file: (dir.${file} == "directory"))
(builtins.attrNames dir)
);
/*imports = [
./nathan
];*/
options.sysconfig = with lib; {
sshHostKeys = lib.mkOption {
@@ -117,7 +121,7 @@
backupFileExtension = "backup";
extraSpecialArgs = { inherit inputs; };
useUserPackages = true;
sharedModules = [
sharedModules = [
inputs.sops-nix.homeManagerModules.sops
];
users = builtins.listToAttrs (builtins.map

2
system/users/nathan/home-manager/default.nix
View File

@@ -37,7 +37,7 @@
nh.enable = lib.mkDefault true;
minimal = lib.mkDefault false;
hyprland.enable = lib.mkDefault config.homeconfig.graphical && !config.homeconfig.standalone;
hyprland.enable = lib.mkDefault (config.homeconfig.graphical && !config.homeconfig.standalone);
hyprlock.enable = lib.mkDefault config.homeconfig.hyprland.enable;
wal.enable = lib.mkDefault config.homeconfig.graphical;
hyprpanel.enable = lib.mkDefault config.homeconfig.hyprland.enable;

4
system/users/nathan/system/default.nix
View File

@@ -11,8 +11,8 @@
isNormalUser = true;
#hashedPasswordFile = lib.mkIf (cfg.hashedPasswordFile != null) cfg.hashedPasswordFile;
extraGroups = [ "networkmanager" ];
openssh.authorizedKeys.keys = lib.mkIf config.sysconfig.services.openssh.enable (cfg.ssh.keys ++ (map (z: config.sysconfig.sshHostKeys.${z}) cfg.ssh.hosts));
packages = with pkgs; lib.mkIf (cfg.home-manager.enable && cfg.home-manager.standalone) [ home-manager ];
openssh.authorizedKeys.keys = with config.sysconfig.users.nathan; lib.mkIf config.sysconfig.services.openssh.enable (ssh.keys ++ (map (z: config.sysconfig.sshHostKeys.${z}) ssh.hosts));
packages = with pkgs; with config.sysconfig.users.nathan; lib.mkIf (home-manager.enable && home-manager.standalone) [ home-manager ];
};
};