From 1769e583d8961e51af91f4990586c69cb3ff9d3e Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sat, 14 Feb 2026 19:21:25 -0500 Subject: [PATCH 1/9] created vs vm --- flake.nix | 25 ++++++ modules/machine/thancred/configuration.nix | 83 +++++++++++++++++++ modules/machine/thancred/default.nix | 6 ++ .../thancred/hardware-configuration.nix | 3 + 4 files changed, 117 insertions(+) create mode 100644 modules/machine/thancred/configuration.nix create mode 100644 modules/machine/thancred/default.nix create mode 100644 modules/machine/thancred/hardware-configuration.nix diff --git a/flake.nix b/flake.nix index 8308122..d01a838 100644 --- a/flake.nix +++ b/flake.nix @@ -162,5 +162,30 @@ # } # ]; }; + + nixosConfigurations."thancred" = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { + inherit userName userEmail; + hostname = "thancred"; + role = "server"; + }; + modules = [ + myOverlays + ./modules/common + ./modules/machine/thancred + + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = extraSpecialArgs; + home-manager.backupFileExtension = "bak"; + home-manager.users.${userName}.imports = [ + ./home + ]; + } + ]; + }; }; } diff --git a/modules/machine/thancred/configuration.nix b/modules/machine/thancred/configuration.nix new file mode 100644 index 0000000..7ca30bd --- /dev/null +++ b/modules/machine/thancred/configuration.nix @@ -0,0 +1,83 @@ +{ + pkgs, + userName, + ... +}: { + imports = [ + ../../apps/gaming.nix + ../../pwrMgmt + ../../networking/core.nix + ../../virtualization/podman.nix + ]; + + # Enable flakes for NixOS + nix.settings.experimental-features = ["nix-command" "flakes"]; + + # Custom kernel/boot stuff + boot.kernelPackages = pkgs.linuxPackages_latest; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # Set your timezone + time.timeZone = "America/Detroit"; + + # Enable OpenSSH + services.openssh.enable = true; + + # Enable keyring + services.gnome.gnome-keyring.enable = true; + + # Enable GnuPG + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + + # Enable SUID wrappers (some programs need them) + programs.mtr.enable = true; + + # Enable Polkit + security.polkit.enable = true; + + # Power management (see ../../pwrMgmt/default.nix) + pwrMgmt = { + enable = true; + cpuFreqGovernor = "performance"; + powertop.enable = false; + }; + + gaming = { + vintage-story.enable = true; + }; + + networking = { + firewall = { + enable = true; + tcpPorts = { + allowedPorts = [ 42420 ]; + }; + udpPorts = { + allowedPorts = [ 42420 ]; + }; + }; + networkManager.enable = true; + }; + + # Podman module (see ../../virtualization/podman.nix) + # podman = { + # enable = true; + # extraPackages = with pkgs; [ + # docker-credential-helpers + # toolbox + # cosign + # crane + # podman-tui + # podman-desktop + # ]; + # }; + + # Add username to groups "wheel" and "video" - more may be added here later + users.users.${userName}.extraGroups = ["wheel" "podman" "network"]; + + system.stateVersion = "24.11"; +} diff --git a/modules/machine/thancred/default.nix b/modules/machine/thancred/default.nix new file mode 100644 index 0000000..3c4d411 --- /dev/null +++ b/modules/machine/thancred/default.nix @@ -0,0 +1,6 @@ +{ ... }: { + imports = [ + ./configuration.nix + ./hardware-configuration.nix + ]; +} diff --git a/modules/machine/thancred/hardware-configuration.nix b/modules/machine/thancred/hardware-configuration.nix new file mode 100644 index 0000000..c81f1da --- /dev/null +++ b/modules/machine/thancred/hardware-configuration.nix @@ -0,0 +1,3 @@ +{ ... }: { + # TODO: needs to filled out later +} -- 2.49.1 From 769ab6f72d9ddcbadc9e07501364a54c897c1e8d Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 15 Feb 2026 22:49:56 +0000 Subject: [PATCH 2/9] added hardware config --- .../thancred/hardware-configuration.nix | 33 +++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/modules/machine/thancred/hardware-configuration.nix b/modules/machine/thancred/hardware-configuration.nix index c81f1da..2305e76 100644 --- a/modules/machine/thancred/hardware-configuration.nix +++ b/modules/machine/thancred/hardware-configuration.nix @@ -1,3 +1,32 @@ -{ ... }: { - # TODO: needs to filled out later +# 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. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/profiles/qemu-guest.nix") + ]; + + boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/0a885c0e-cf31-43b7-9a91-6f9624758102"; + fsType = "xfs"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/C7B5-89D4"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/860c75ce-3afe-47cf-90d8-7612ab543a1e"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } -- 2.49.1 From 67fda15ca99b3d8e5aac64af7c445536a9605160 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 15 Feb 2026 18:31:15 -0500 Subject: [PATCH 3/9] modified gaming apps --- modules/apps/gaming.nix | 152 ++++++++++----------- modules/machine/cloud/configuration.nix | 1 + modules/machine/thancred/configuration.nix | 2 +- 3 files changed, 77 insertions(+), 78 deletions(-) diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix index e1a2c3f..f3f4d93 100644 --- a/modules/apps/gaming.nix +++ b/modules/apps/gaming.nix @@ -2,15 +2,12 @@ config, lib, pkgs, - aagl, - vintage-story, + vintage-story ? null, ... -}: let +} @ args: let cfg = config.gaming; + aagl = args.aagl or null; in { - imports = [ - aagl.nixosModules.default - ]; options.gaming = { steam = { @@ -153,84 +150,85 @@ in { config = let agl = cfg.aagl; - in { - programs.steam = lib.mkIf cfg.steam.enable { - enable = true; - remotePlay.openFirewall = cfg.steam.firewall.remotePlay; - localNetworkGameTransfers.openFirewall = cfg.steam.firewall.localNetworkGameTransfers; - }; + hasAagl = aagl != null; + in lib.mkMerge [ + { + programs.steam = lib.mkIf cfg.steam.enable { + enable = true; + remotePlay.openFirewall = cfg.steam.firewall.remotePlay; + localNetworkGameTransfers.openFirewall = cfg.steam.firewall.localNetworkGameTransfers; + }; - programs.gamemode = lib.mkIf cfg.gamemode.enable { - enable = true; - settings = cfg.gamemode.config; - }; + programs.gamemode = lib.mkIf cfg.gamemode.enable { + enable = true; + settings = cfg.gamemode.config; + }; - programs.gamescope = lib.mkIf cfg.gamescope.enable { - enable = true; + programs.gamescope = lib.mkIf cfg.gamescope.enable { + enable = true; - # Apply custom resolution if specified - args = - lib.optional (cfg.gamescope.settings.resolution != null) [ - "-w" - (toString cfg.gamescope.settings.resolution.width) - "-h" - (toString cfg.gamescope.settings.resolution.height) - ] - ++ lib.optional (cfg.gamescope.settings.refreshRate != null) [ - "-r" - (toString cfg.gamescope.settings.refreshRate) - ]; - }; + # Apply custom resolution if specified + args = + lib.optional (cfg.gamescope.settings.resolution != null) [ + "-w" + (toString cfg.gamescope.settings.resolution.width) + "-h" + (toString cfg.gamescope.settings.resolution.height) + ] + ++ lib.optional (cfg.gamescope.settings.refreshRate != null) [ + "-r" + (toString cfg.gamescope.settings.refreshRate) + ]; + }; - programs.anime-game-launcher = lib.mkIf agl.anime-game-launcher.enable { - enable = true; - }; + environment.systemPackages = + (lib.optionals cfg.lutris.enable ( + [cfg.lutris.package] ++ + (lib.optionals cfg.lutris.wine.enable [ + cfg.lutris.wine.package + pkgs.winetricks + ]) ++ + (lib.optionals cfg.lutris.compatibility.protonSupport [ + pkgs.protonup-ng + pkgs.protonup-qt + ]) ++ + cfg.lutris.compatibility.extraTools ++ + cfg.lutris.extraPackages + )) ++ + (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++ + (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++ + (lib.optionals (cfg.vintage-story.enable && vintage-story != null) [vintage-story.packages.${pkgs.system}.default]) ++ + (lib.optionals cfg.vkbasalt.enable [pkgs.vkbasalt pkgs.vkbasalt-cli]) ++ + (lib.optionals cfg.mangohud.enable [pkgs.mangohud]) ++ + (lib.optionals (cfg.vkbasalt.enable || cfg.mangohud.enable) [pkgs.goverlay pkgs.mesa-demos pkgs.vulkan-tools]); + } + (lib.optionalAttrs hasAagl { + programs.anime-game-launcher = lib.mkIf agl.anime-game-launcher.enable { + enable = true; + }; - programs.honkers-railway-launcher = lib.mkIf agl.honkers-railway-launcher.enable { - enable = true; - }; + programs.honkers-railway-launcher = lib.mkIf agl.honkers-railway-launcher.enable { + enable = true; + }; - programs.honkers-launcher = lib.mkIf agl.honkers-launcher.enable { - enable = true; - }; + programs.honkers-launcher = lib.mkIf agl.honkers-launcher.enable { + enable = true; + }; - programs.wavey-launcher = lib.mkIf agl.wavey-launcher.enable { - enable = true; - }; + programs.wavey-launcher = lib.mkIf agl.wavey-launcher.enable { + enable = true; + }; - programs.sleepy-launcher = lib.mkIf agl.sleepy-launcher.enable { - enable = true; - }; + programs.sleepy-launcher = lib.mkIf agl.sleepy-launcher.enable { + enable = true; + }; - environment.systemPackages = - (lib.optionals cfg.lutris.enable ( - [cfg.lutris.package] ++ - (lib.optionals cfg.lutris.wine.enable [ - cfg.lutris.wine.package - pkgs.winetricks - ]) ++ - (lib.optionals cfg.lutris.compatibility.protonSupport [ - pkgs.protonup-ng - pkgs.protonup-qt - ]) ++ - cfg.lutris.compatibility.extraTools ++ - cfg.lutris.extraPackages - )) ++ - (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++ - (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++ - (lib.optionals cfg.vintage-story.enable [vintage-story.packages.${pkgs.system}.default]) ++ - (lib.optionals cfg.vkbasalt.enable [pkgs.vkbasalt pkgs.vkbasalt-cli]) ++ - (lib.optionals cfg.mangohud.enable [pkgs.mangohud]) ++ - (lib.optionals (cfg.vkbasalt.enable || cfg.mangohud.enable) [pkgs.goverlay pkgs.mesa-demos pkgs.vulkan-tools]); - - nix.settings = let - inherit agl; - in (lib.mkIf - (agl.anime-game-launcher.enable || agl.honkers-railway-laucher.enable || agl.honkers-launcher.enable || agl.wavey-launcher.enable || agl.sleepy-launcher.enable) - { - substituters = [ "https://ezkea.cachix.org" ]; - trusted-public-keys = [ "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" ]; - } - ); - }; + nix.settings = lib.mkIf + (agl.anime-game-launcher.enable || agl.honkers-railway-launcher.enable || agl.honkers-launcher.enable || agl.wavey-launcher.enable || agl.sleepy-launcher.enable) + { + substituters = [ "https://ezkea.cachix.org" ]; + trusted-public-keys = [ "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" ]; + }; + }) + ]; } diff --git a/modules/machine/cloud/configuration.nix b/modules/machine/cloud/configuration.nix index 4e296b9..1ef65c0 100644 --- a/modules/machine/cloud/configuration.nix +++ b/modules/machine/cloud/configuration.nix @@ -20,6 +20,7 @@ in { (import ../../apps/flatpak.nix { inherit lib pkgs flatpakPackages userName aagl; }) + aagl.nixosModules.default ../../apps/gaming.nix ../../apps/appimage.nix ../../graphics diff --git a/modules/machine/thancred/configuration.nix b/modules/machine/thancred/configuration.nix index 7ca30bd..760976f 100644 --- a/modules/machine/thancred/configuration.nix +++ b/modules/machine/thancred/configuration.nix @@ -50,7 +50,7 @@ vintage-story.enable = true; }; - networking = { + network = { firewall = { enable = true; tcpPorts = { -- 2.49.1 From 45c8f7ec273b2c126b8a399301ade11e5e3e7360 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 15 Feb 2026 18:51:41 -0500 Subject: [PATCH 4/9] Revert "added hardware config" This reverts commit 769ab6f72d9ddcbadc9e07501364a54c897c1e8d. --- .../thancred/hardware-configuration.nix | 33 ++----------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/modules/machine/thancred/hardware-configuration.nix b/modules/machine/thancred/hardware-configuration.nix index 2305e76..c81f1da 100644 --- a/modules/machine/thancred/hardware-configuration.nix +++ b/modules/machine/thancred/hardware-configuration.nix @@ -1,32 +1,3 @@ -# 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. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/profiles/qemu-guest.nix") - ]; - - boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/0a885c0e-cf31-43b7-9a91-6f9624758102"; - fsType = "xfs"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/C7B5-89D4"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/860c75ce-3afe-47cf-90d8-7612ab543a1e"; } - ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +{ ... }: { + # TODO: needs to filled out later } -- 2.49.1 From a1e71488d818d252b924df8d4a6865d7a2ed094c Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 15 Feb 2026 18:52:30 -0500 Subject: [PATCH 5/9] Revert "modified gaming apps" This reverts commit 67fda15ca99b3d8e5aac64af7c445536a9605160. --- modules/apps/gaming.nix | 152 +++++++++++---------- modules/machine/cloud/configuration.nix | 1 - modules/machine/thancred/configuration.nix | 2 +- 3 files changed, 78 insertions(+), 77 deletions(-) diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix index f3f4d93..e1a2c3f 100644 --- a/modules/apps/gaming.nix +++ b/modules/apps/gaming.nix @@ -2,12 +2,15 @@ config, lib, pkgs, - vintage-story ? null, + aagl, + vintage-story, ... -} @ args: let +}: let cfg = config.gaming; - aagl = args.aagl or null; in { + imports = [ + aagl.nixosModules.default + ]; options.gaming = { steam = { @@ -150,85 +153,84 @@ in { config = let agl = cfg.aagl; - hasAagl = aagl != null; - in lib.mkMerge [ - { - programs.steam = lib.mkIf cfg.steam.enable { - enable = true; - remotePlay.openFirewall = cfg.steam.firewall.remotePlay; - localNetworkGameTransfers.openFirewall = cfg.steam.firewall.localNetworkGameTransfers; - }; + in { + programs.steam = lib.mkIf cfg.steam.enable { + enable = true; + remotePlay.openFirewall = cfg.steam.firewall.remotePlay; + localNetworkGameTransfers.openFirewall = cfg.steam.firewall.localNetworkGameTransfers; + }; - programs.gamemode = lib.mkIf cfg.gamemode.enable { - enable = true; - settings = cfg.gamemode.config; - }; + programs.gamemode = lib.mkIf cfg.gamemode.enable { + enable = true; + settings = cfg.gamemode.config; + }; - programs.gamescope = lib.mkIf cfg.gamescope.enable { - enable = true; + programs.gamescope = lib.mkIf cfg.gamescope.enable { + enable = true; - # Apply custom resolution if specified - args = - lib.optional (cfg.gamescope.settings.resolution != null) [ - "-w" - (toString cfg.gamescope.settings.resolution.width) - "-h" - (toString cfg.gamescope.settings.resolution.height) - ] - ++ lib.optional (cfg.gamescope.settings.refreshRate != null) [ - "-r" - (toString cfg.gamescope.settings.refreshRate) - ]; - }; + # Apply custom resolution if specified + args = + lib.optional (cfg.gamescope.settings.resolution != null) [ + "-w" + (toString cfg.gamescope.settings.resolution.width) + "-h" + (toString cfg.gamescope.settings.resolution.height) + ] + ++ lib.optional (cfg.gamescope.settings.refreshRate != null) [ + "-r" + (toString cfg.gamescope.settings.refreshRate) + ]; + }; - environment.systemPackages = - (lib.optionals cfg.lutris.enable ( - [cfg.lutris.package] ++ - (lib.optionals cfg.lutris.wine.enable [ - cfg.lutris.wine.package - pkgs.winetricks - ]) ++ - (lib.optionals cfg.lutris.compatibility.protonSupport [ - pkgs.protonup-ng - pkgs.protonup-qt - ]) ++ - cfg.lutris.compatibility.extraTools ++ - cfg.lutris.extraPackages - )) ++ - (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++ - (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++ - (lib.optionals (cfg.vintage-story.enable && vintage-story != null) [vintage-story.packages.${pkgs.system}.default]) ++ - (lib.optionals cfg.vkbasalt.enable [pkgs.vkbasalt pkgs.vkbasalt-cli]) ++ - (lib.optionals cfg.mangohud.enable [pkgs.mangohud]) ++ - (lib.optionals (cfg.vkbasalt.enable || cfg.mangohud.enable) [pkgs.goverlay pkgs.mesa-demos pkgs.vulkan-tools]); - } - (lib.optionalAttrs hasAagl { - programs.anime-game-launcher = lib.mkIf agl.anime-game-launcher.enable { - enable = true; - }; + programs.anime-game-launcher = lib.mkIf agl.anime-game-launcher.enable { + enable = true; + }; - programs.honkers-railway-launcher = lib.mkIf agl.honkers-railway-launcher.enable { - enable = true; - }; + programs.honkers-railway-launcher = lib.mkIf agl.honkers-railway-launcher.enable { + enable = true; + }; - programs.honkers-launcher = lib.mkIf agl.honkers-launcher.enable { - enable = true; - }; + programs.honkers-launcher = lib.mkIf agl.honkers-launcher.enable { + enable = true; + }; - programs.wavey-launcher = lib.mkIf agl.wavey-launcher.enable { - enable = true; - }; + programs.wavey-launcher = lib.mkIf agl.wavey-launcher.enable { + enable = true; + }; - programs.sleepy-launcher = lib.mkIf agl.sleepy-launcher.enable { - enable = true; - }; + programs.sleepy-launcher = lib.mkIf agl.sleepy-launcher.enable { + enable = true; + }; - nix.settings = lib.mkIf - (agl.anime-game-launcher.enable || agl.honkers-railway-launcher.enable || agl.honkers-launcher.enable || agl.wavey-launcher.enable || agl.sleepy-launcher.enable) - { - substituters = [ "https://ezkea.cachix.org" ]; - trusted-public-keys = [ "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" ]; - }; - }) - ]; + environment.systemPackages = + (lib.optionals cfg.lutris.enable ( + [cfg.lutris.package] ++ + (lib.optionals cfg.lutris.wine.enable [ + cfg.lutris.wine.package + pkgs.winetricks + ]) ++ + (lib.optionals cfg.lutris.compatibility.protonSupport [ + pkgs.protonup-ng + pkgs.protonup-qt + ]) ++ + cfg.lutris.compatibility.extraTools ++ + cfg.lutris.extraPackages + )) ++ + (lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++ + (lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++ + (lib.optionals cfg.vintage-story.enable [vintage-story.packages.${pkgs.system}.default]) ++ + (lib.optionals cfg.vkbasalt.enable [pkgs.vkbasalt pkgs.vkbasalt-cli]) ++ + (lib.optionals cfg.mangohud.enable [pkgs.mangohud]) ++ + (lib.optionals (cfg.vkbasalt.enable || cfg.mangohud.enable) [pkgs.goverlay pkgs.mesa-demos pkgs.vulkan-tools]); + + nix.settings = let + inherit agl; + in (lib.mkIf + (agl.anime-game-launcher.enable || agl.honkers-railway-laucher.enable || agl.honkers-launcher.enable || agl.wavey-launcher.enable || agl.sleepy-launcher.enable) + { + substituters = [ "https://ezkea.cachix.org" ]; + trusted-public-keys = [ "ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI=" ]; + } + ); + }; } diff --git a/modules/machine/cloud/configuration.nix b/modules/machine/cloud/configuration.nix index 1ef65c0..4e296b9 100644 --- a/modules/machine/cloud/configuration.nix +++ b/modules/machine/cloud/configuration.nix @@ -20,7 +20,6 @@ in { (import ../../apps/flatpak.nix { inherit lib pkgs flatpakPackages userName aagl; }) - aagl.nixosModules.default ../../apps/gaming.nix ../../apps/appimage.nix ../../graphics diff --git a/modules/machine/thancred/configuration.nix b/modules/machine/thancred/configuration.nix index 760976f..7ca30bd 100644 --- a/modules/machine/thancred/configuration.nix +++ b/modules/machine/thancred/configuration.nix @@ -50,7 +50,7 @@ vintage-story.enable = true; }; - network = { + networking = { firewall = { enable = true; tcpPorts = { -- 2.49.1 From c452ebff3c38f2fd33b223f531a20eef83b40de3 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 15 Feb 2026 19:05:42 -0500 Subject: [PATCH 6/9] real commit this time --- modules/machine/thancred/configuration.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/machine/thancred/configuration.nix b/modules/machine/thancred/configuration.nix index 7ca30bd..4d5d285 100644 --- a/modules/machine/thancred/configuration.nix +++ b/modules/machine/thancred/configuration.nix @@ -1,10 +1,10 @@ { pkgs, userName, + vintage-story, ... }: { imports = [ - ../../apps/gaming.nix ../../pwrMgmt ../../networking/core.nix ../../virtualization/podman.nix @@ -46,11 +46,7 @@ powertop.enable = false; }; - gaming = { - vintage-story.enable = true; - }; - - networking = { + network = { firewall = { enable = true; tcpPorts = { @@ -63,6 +59,10 @@ networkManager.enable = true; }; + environment.systemPackages = [ + vintage-story.packages.${pkgs.system}.default + ]; + # Podman module (see ../../virtualization/podman.nix) # podman = { # enable = true; -- 2.49.1 From ad7f01e41e3be1038601c68fbc6d43a22f8451be Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Sun, 15 Feb 2026 19:10:58 -0500 Subject: [PATCH 7/9] commit --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index d01a838..3284950 100644 --- a/flake.nix +++ b/flake.nix @@ -166,7 +166,7 @@ nixosConfigurations."thancred" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { - inherit userName userEmail; + inherit userName userEmail vintage-story; hostname = "thancred"; role = "server"; }; -- 2.49.1 From f2ee9819535b591e2ddf409252e69bcbffdc396a Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Mon, 16 Feb 2026 20:39:20 -0500 Subject: [PATCH 8/9] modifying thancred to match updated flake config --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index fbd674f..697a83a 100644 --- a/flake.nix +++ b/flake.nix @@ -178,7 +178,7 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = extraSpecialArgs; + home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = true; role = "server"; }; home-manager.backupFileExtension = "bak"; home-manager.users.${userName}.imports = [ ./home -- 2.49.1 From a3ef9fa59ed16e828efb69d40097aadd04cd0c16 Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Thu, 19 Feb 2026 02:44:23 +0000 Subject: [PATCH 9/9] changes to hardware config --- home/packages/.linux.nix.swp | Bin 0 -> 12288 bytes home/packages/linux.nix | 11 ------ .../thancred/hardware-configuration.nix | 33 ++++++++++++++++-- 3 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 home/packages/.linux.nix.swp diff --git a/home/packages/.linux.nix.swp b/home/packages/.linux.nix.swp new file mode 100644 index 0000000000000000000000000000000000000000..2b07d50ee68f98db774906efa25597b4ed5684c7 GIT binary patch literal 12288 zcmeI&Jx|*}7zgm9I~0{K@X#)mh%dY>w5aM@Bwhvx3u18Wi*vGbwtQzd5~3Ygkk~VJ z=QFgdd;wM@VCg652k3KdQdlZLosj+~{e3UKJIB8*$#oa^);H;$ToPPng(&(XeKsY; z&9M+h4|D6sA1IHV_obQG=4%k;rl*sjUT*jEfod0Fl!l42?M$0$D0#*MkHl>VK;S6? zmFoqo)18&&rA5E&&FguZd)0Z$4wwr82tWV=5P$##AOHafJaYk8Oo^}j4ll;<@p4@A zPXJAs)Z;EH2tWV=5P$##AOHafKmY;|fB*!Zp+Fc5aXKT!HOK$|Kl%QD#f@{$H_nK2 z!qJ>v&L_?)=PhTJ^NZL1=onXqj7wX&(pi>BRG&Z#oi*6$rTzul* zKA|4eJnE0f%gOP0`aqwx>r;^?c8wSL%?9auuNjcm#mdxD+YNt+o({#Ke_E@#+4}pa PkL1cqwMa@yNAJaN3jvYp literal 0 HcmV?d00001 diff --git a/home/packages/linux.nix b/home/packages/linux.nix index 79436a2..df40f8f 100644 --- a/home/packages/linux.nix +++ b/home/packages/linux.nix @@ -3,16 +3,5 @@ lib.mkIf pkgs.stdenv.isLinux { home.packages = with pkgs; [ imv xdg-utils - ] ++ lib.optionals isNixOS [ - betterdiscordctl - vesktop - xfce.thunar - pavucontrol - godot - aseprite - zathura - gpu-screen-recorder - gpu-screen-recorder-gtk - inetutils ]; } diff --git a/modules/machine/thancred/hardware-configuration.nix b/modules/machine/thancred/hardware-configuration.nix index c81f1da..382377f 100644 --- a/modules/machine/thancred/hardware-configuration.nix +++ b/modules/machine/thancred/hardware-configuration.nix @@ -1,3 +1,32 @@ -{ ... }: { - # TODO: needs to filled out later +# 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. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/profiles/qemu-guest.nix") + ]; + + boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/e2e621c1-0090-472a-99d9-61c6a87bd068"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/663E-15C0"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/60104b1a-4285-4dd1-be5e-3c3dee24515a"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } -- 2.49.1