From 65297bf69c58aa5588654a67233772fef4dfa1ac Mon Sep 17 00:00:00 2001 From: halbg0tt Date: Wed, 1 Jul 2026 08:41:02 +0200 Subject: [PATCH] kekl --- flake.nix | 18 +++++++++++- hosts/kepler/configuration.nix | 2 +- {mod => hosts/kepler/mod}/boot.nix | 0 {mod => hosts/kepler/mod}/default.nix | 0 {mod => hosts/kepler/mod}/docker/default.nix | 0 {mod => hosts/kepler/mod}/docker/gluetun.nix | 0 .../kepler/mod}/docker/jdownloader.nix | 0 .../kepler/mod}/docker/qbittorrent.nix | 0 {mod => hosts/kepler/mod}/freedom/default.nix | 0 .../kepler/mod}/freedom/invidious.nix | 0 {mod => hosts/kepler/mod}/freedom/nitter.nix | 0 {mod => hosts/kepler/mod}/freedom/tor.nix | 0 {mod => hosts/kepler/mod}/freedom/unbound.nix | 0 {mod => hosts/kepler/mod}/git.nix | 0 {mod => hosts/kepler/mod}/gnupg.nix | 0 {mod => hosts/kepler/mod}/home/home.nix | 0 {mod => hosts/kepler/mod}/jellyfin.nix | 0 {mod => hosts/kepler/mod}/networking.nix | 0 {mod => hosts/kepler/mod}/pkgs.nix | 0 {mod => hosts/kepler/mod}/ssh.nix | 0 {mod => hosts/kepler/mod}/system.nix | 0 {mod => hosts/kepler/mod}/time.nix | 0 {mod => hosts/kepler/mod}/users.nix | 0 hosts/voyager/configuration.nix | 3 +- hosts/voyager/hardware-configuration.nix | 28 +++++++++++++++++++ hosts/voyager/modules/boot.nix | 13 +++++++++ hosts/voyager/modules/default.nix | 13 +++++++++ hosts/voyager/modules/dhcp.nix | 0 hosts/voyager/modules/firewall.nix | 0 hosts/voyager/modules/nat.nix | 0 hosts/voyager/modules/networking.nix | 21 ++++++++++++++ hosts/voyager/modules/system.nix | 7 +++++ hosts/voyager/modules/time.nix | 4 +++ hosts/voyager/modules/users.nix | 15 ++++++++++ 34 files changed, 120 insertions(+), 4 deletions(-) rename {mod => hosts/kepler/mod}/boot.nix (100%) rename {mod => hosts/kepler/mod}/default.nix (100%) rename {mod => hosts/kepler/mod}/docker/default.nix (100%) rename {mod => hosts/kepler/mod}/docker/gluetun.nix (100%) rename {mod => hosts/kepler/mod}/docker/jdownloader.nix (100%) rename {mod => hosts/kepler/mod}/docker/qbittorrent.nix (100%) rename {mod => hosts/kepler/mod}/freedom/default.nix (100%) rename {mod => hosts/kepler/mod}/freedom/invidious.nix (100%) rename {mod => hosts/kepler/mod}/freedom/nitter.nix (100%) rename {mod => hosts/kepler/mod}/freedom/tor.nix (100%) rename {mod => hosts/kepler/mod}/freedom/unbound.nix (100%) rename {mod => hosts/kepler/mod}/git.nix (100%) rename {mod => hosts/kepler/mod}/gnupg.nix (100%) rename {mod => hosts/kepler/mod}/home/home.nix (100%) rename {mod => hosts/kepler/mod}/jellyfin.nix (100%) rename {mod => hosts/kepler/mod}/networking.nix (100%) rename {mod => hosts/kepler/mod}/pkgs.nix (100%) rename {mod => hosts/kepler/mod}/ssh.nix (100%) rename {mod => hosts/kepler/mod}/system.nix (100%) rename {mod => hosts/kepler/mod}/time.nix (100%) rename {mod => hosts/kepler/mod}/users.nix (100%) create mode 100644 hosts/voyager/hardware-configuration.nix create mode 100644 hosts/voyager/modules/boot.nix create mode 100644 hosts/voyager/modules/default.nix create mode 100644 hosts/voyager/modules/dhcp.nix create mode 100644 hosts/voyager/modules/firewall.nix create mode 100644 hosts/voyager/modules/nat.nix create mode 100644 hosts/voyager/modules/networking.nix create mode 100644 hosts/voyager/modules/system.nix create mode 100644 hosts/voyager/modules/time.nix create mode 100644 hosts/voyager/modules/users.nix diff --git a/flake.nix b/flake.nix index 1358a82..31db19d 100644 --- a/flake.nix +++ b/flake.nix @@ -18,11 +18,27 @@ useGlobalPkgs = true; useUserPackages = true; extraSpecialArgs = { inherit inputs; }; - users.user = ./mod/home/home.nix; + users.user = ./hosts/kepler/mod/home/home.nix; }; } ]; }; + nixosConfigurations.voyager = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs system; }; + modules = [ + ./hosts/voyager/configuration.nix + #home-manager.nixosModules.home-manager + #{ + #home-manager = { + # useGlobalPkgs = true; + # useUserPackages = true; + # extraSpecialArgs = { inherit inputs; }; + # users.user = ./hosts/voyager/modules/home/home.nix; + #}; + #} + ]; + }; }; } diff --git a/hosts/kepler/configuration.nix b/hosts/kepler/configuration.nix index 1d17a95..cca7469 100644 --- a/hosts/kepler/configuration.nix +++ b/hosts/kepler/configuration.nix @@ -3,7 +3,7 @@ { imports = [ ./hardware-configuration.nix - ../../mod/default.nix + ./mod/default.nix ]; time.timeZone = "Europe/Berlin"; diff --git a/mod/boot.nix b/hosts/kepler/mod/boot.nix similarity index 100% rename from mod/boot.nix rename to hosts/kepler/mod/boot.nix diff --git a/mod/default.nix b/hosts/kepler/mod/default.nix similarity index 100% rename from mod/default.nix rename to hosts/kepler/mod/default.nix diff --git a/mod/docker/default.nix b/hosts/kepler/mod/docker/default.nix similarity index 100% rename from mod/docker/default.nix rename to hosts/kepler/mod/docker/default.nix diff --git a/mod/docker/gluetun.nix b/hosts/kepler/mod/docker/gluetun.nix similarity index 100% rename from mod/docker/gluetun.nix rename to hosts/kepler/mod/docker/gluetun.nix diff --git a/mod/docker/jdownloader.nix b/hosts/kepler/mod/docker/jdownloader.nix similarity index 100% rename from mod/docker/jdownloader.nix rename to hosts/kepler/mod/docker/jdownloader.nix diff --git a/mod/docker/qbittorrent.nix b/hosts/kepler/mod/docker/qbittorrent.nix similarity index 100% rename from mod/docker/qbittorrent.nix rename to hosts/kepler/mod/docker/qbittorrent.nix diff --git a/mod/freedom/default.nix b/hosts/kepler/mod/freedom/default.nix similarity index 100% rename from mod/freedom/default.nix rename to hosts/kepler/mod/freedom/default.nix diff --git a/mod/freedom/invidious.nix b/hosts/kepler/mod/freedom/invidious.nix similarity index 100% rename from mod/freedom/invidious.nix rename to hosts/kepler/mod/freedom/invidious.nix diff --git a/mod/freedom/nitter.nix b/hosts/kepler/mod/freedom/nitter.nix similarity index 100% rename from mod/freedom/nitter.nix rename to hosts/kepler/mod/freedom/nitter.nix diff --git a/mod/freedom/tor.nix b/hosts/kepler/mod/freedom/tor.nix similarity index 100% rename from mod/freedom/tor.nix rename to hosts/kepler/mod/freedom/tor.nix diff --git a/mod/freedom/unbound.nix b/hosts/kepler/mod/freedom/unbound.nix similarity index 100% rename from mod/freedom/unbound.nix rename to hosts/kepler/mod/freedom/unbound.nix diff --git a/mod/git.nix b/hosts/kepler/mod/git.nix similarity index 100% rename from mod/git.nix rename to hosts/kepler/mod/git.nix diff --git a/mod/gnupg.nix b/hosts/kepler/mod/gnupg.nix similarity index 100% rename from mod/gnupg.nix rename to hosts/kepler/mod/gnupg.nix diff --git a/mod/home/home.nix b/hosts/kepler/mod/home/home.nix similarity index 100% rename from mod/home/home.nix rename to hosts/kepler/mod/home/home.nix diff --git a/mod/jellyfin.nix b/hosts/kepler/mod/jellyfin.nix similarity index 100% rename from mod/jellyfin.nix rename to hosts/kepler/mod/jellyfin.nix diff --git a/mod/networking.nix b/hosts/kepler/mod/networking.nix similarity index 100% rename from mod/networking.nix rename to hosts/kepler/mod/networking.nix diff --git a/mod/pkgs.nix b/hosts/kepler/mod/pkgs.nix similarity index 100% rename from mod/pkgs.nix rename to hosts/kepler/mod/pkgs.nix diff --git a/mod/ssh.nix b/hosts/kepler/mod/ssh.nix similarity index 100% rename from mod/ssh.nix rename to hosts/kepler/mod/ssh.nix diff --git a/mod/system.nix b/hosts/kepler/mod/system.nix similarity index 100% rename from mod/system.nix rename to hosts/kepler/mod/system.nix diff --git a/mod/time.nix b/hosts/kepler/mod/time.nix similarity index 100% rename from mod/time.nix rename to hosts/kepler/mod/time.nix diff --git a/mod/users.nix b/hosts/kepler/mod/users.nix similarity index 100% rename from mod/users.nix rename to hosts/kepler/mod/users.nix diff --git a/hosts/voyager/configuration.nix b/hosts/voyager/configuration.nix index 9dac324..3409ca0 100644 --- a/hosts/voyager/configuration.nix +++ b/hosts/voyager/configuration.nix @@ -3,9 +3,8 @@ { imports = [ ./hardware-configuration.nix + ./modules/default.nix ]; - time.timeZone = "Europe/Berlin"; - } diff --git a/hosts/voyager/hardware-configuration.nix b/hosts/voyager/hardware-configuration.nix new file mode 100644 index 0000000..d4ca9f3 --- /dev/null +++ b/hosts/voyager/hardware-configuration.nix @@ -0,0 +1,28 @@ +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/dfbd029b-d568-41fc-93f3-43a6ac059661"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/1942-B7E9"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + swapDevices = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/voyager/modules/boot.nix b/hosts/voyager/modules/boot.nix new file mode 100644 index 0000000..fae17e9 --- /dev/null +++ b/hosts/voyager/modules/boot.nix @@ -0,0 +1,13 @@ +_: +{ + boot = { + loader = { + systemd-boot = { + enable = true; + }; + efi = { + canTouchEfiVariables = true; + }; + }; + }; +} diff --git a/hosts/voyager/modules/default.nix b/hosts/voyager/modules/default.nix new file mode 100644 index 0000000..31b6d41 --- /dev/null +++ b/hosts/voyager/modules/default.nix @@ -0,0 +1,13 @@ +{ config, pkgs, ... }: +{ + imports = [ + ./dhcp.nix + ./nat.nix + ./firewall.nix + ./users.nix + ./networking.nix + ./time.nix + ./system.nix + ./boot.nix + ]; +} diff --git a/hosts/voyager/modules/dhcp.nix b/hosts/voyager/modules/dhcp.nix new file mode 100644 index 0000000..e69de29 diff --git a/hosts/voyager/modules/firewall.nix b/hosts/voyager/modules/firewall.nix new file mode 100644 index 0000000..e69de29 diff --git a/hosts/voyager/modules/nat.nix b/hosts/voyager/modules/nat.nix new file mode 100644 index 0000000..e69de29 diff --git a/hosts/voyager/modules/networking.nix b/hosts/voyager/modules/networking.nix new file mode 100644 index 0000000..ff4ba82 --- /dev/null +++ b/hosts/voyager/modules/networking.nix @@ -0,0 +1,21 @@ +_: +{ + networking = { + hostName = "voyager"; + networkmanager = { enable = true; }; + firewall = { enable = false; }; + + interfaces = { + eno1 = { + ipv4.addresses = [{ + address = "10.11.0.10"; + prefixLength = 24; + }]; + }; + }; + defaultGateway = { + address = "10.11.0.1"; + interface = "eno1"; + }; + }; +} diff --git a/hosts/voyager/modules/system.nix b/hosts/voyager/modules/system.nix new file mode 100644 index 0000000..1c8fca3 --- /dev/null +++ b/hosts/voyager/modules/system.nix @@ -0,0 +1,7 @@ +_: +{ + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + system = { + stateVersion = "26.05"; + }; +} diff --git a/hosts/voyager/modules/time.nix b/hosts/voyager/modules/time.nix new file mode 100644 index 0000000..92f2aa3 --- /dev/null +++ b/hosts/voyager/modules/time.nix @@ -0,0 +1,4 @@ +_: +{ + time.timeZone = "Europe/Berlin"; +} diff --git a/hosts/voyager/modules/users.nix b/hosts/voyager/modules/users.nix new file mode 100644 index 0000000..2be8303 --- /dev/null +++ b/hosts/voyager/modules/users.nix @@ -0,0 +1,15 @@ +_: +{ + users.users.user = { + isNormalUser = true; + extraGroups = [ "wheel" "docker" "network" "plugdev" ]; + + openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDdCJK3NBMbGwvSxXq0kp/FzWUU0l0D1WX8f4vBubtZ7" ]; + }; + security = { + doas = { + enable = true; + extraConfig = "permit nopass keepenv :wheel"; + }; + }; +}