From 7c61d646a6d326f70ef6c8a281410eeebe959710 Mon Sep 17 00:00:00 2001 From: Nathan Date: Mon, 5 Jan 2026 15:20:14 -0600 Subject: [PATCH] may work --- flake.nix | 7 +- machines/laptop/flake.nix | 3 +- system/profiles/laptop/default.nix | 2 +- system/programs/default.nix | 2 +- system/programs/hyprland/default.nix | 6 +- .../services/containers/minecraft/default.nix | 65 ++----------------- system/users/default.nix | 10 ++- system/users/nathan/home-manager/default.nix | 2 +- system/users/nathan/system/default.nix | 4 +- 9 files changed, 23 insertions(+), 78 deletions(-) diff --git a/flake.nix b/flake.nix index 390a102..d0d8008 100644 --- a/flake.nix +++ b/flake.nix @@ -33,7 +33,6 @@ hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - #nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai"; nixvim.url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Moirai"; }; @@ -47,10 +46,10 @@ (name: ({ inherit name; - value = { ... } @ exputs: { + value = { ... }: { imports = [ - (import ./system (inputs // exputs)) - (import ./system/profiles/${name} (inputs // exputs)) + ./system + ./system/profiles/${name} ]; }; })) filtered) diff --git a/machines/laptop/flake.nix b/machines/laptop/flake.nix index cbb6b1a..ee5d3a4 100644 --- a/machines/laptop/flake.nix +++ b/machines/laptop/flake.nix @@ -26,8 +26,7 @@ nixosConfigurations."${host}" = nixpkgs.lib.nixosSystem { - specialArgs = { - }; + specialArgs = olympus.inputs; modules = [ { sysconfig.host = host; } diff --git a/system/profiles/laptop/default.nix b/system/profiles/laptop/default.nix index 4eb2f23..91be9e6 100644 --- a/system/profiles/laptop/default.nix +++ b/system/profiles/laptop/default.nix @@ -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; diff --git a/system/programs/default.nix b/system/programs/default.nix index 6bc4f6b..c9ee5d3 100644 --- a/system/programs/default.nix +++ b/system/programs/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: { +{ ... }: { imports = [ ./hyprland diff --git a/system/programs/hyprland/default.nix b/system/programs/hyprland/default.nix index d622add..f9f4f96 100644 --- a/system/programs/hyprland/default.nix +++ b/system/programs/hyprland/default.nix @@ -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; }; }; } diff --git a/system/services/containers/minecraft/default.nix b/system/services/containers/minecraft/default.nix index 1da6cd2..f614d85 100644 --- a/system/services/containers/minecraft/default.nix +++ b/system/services/containers/minecraft/default.nix @@ -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"; }; }; - }); + }; } diff --git a/system/users/default.nix b/system/users/default.nix index f7eb55a..2d1dcb4 100644 --- a/system/users/default.nix +++ b/system/users/default.nix @@ -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 diff --git a/system/users/nathan/home-manager/default.nix b/system/users/nathan/home-manager/default.nix index 3942c88..d32150b 100644 --- a/system/users/nathan/home-manager/default.nix +++ b/system/users/nathan/home-manager/default.nix @@ -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; diff --git a/system/users/nathan/system/default.nix b/system/users/nathan/system/default.nix index 02e7cca..abda731 100644 --- a/system/users/nathan/system/default.nix +++ b/system/users/nathan/system/default.nix @@ -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 ]; }; };