From 23cfa51d6cf7029acb71ca3bf492e89b8e21b074 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Thu, 25 Apr 2024 18:14:02 +0200 Subject: [PATCH] try out kubernetes --- flake.nix | 6 ++--- home-manager/hyprland/waybar.nix | 2 +- modules/graphical/hyprland.nix | 2 +- modules/services/default.nix | 2 +- modules/services/kubernetes.nix | 43 ++++++++++++++++++++++++++++++++ systems/vm/configuration.nix | 5 ++-- users/vm/home.nix | 1 - 7 files changed, 50 insertions(+), 11 deletions(-) create mode 100644 modules/services/kubernetes.nix diff --git a/flake.nix b/flake.nix index e5e54ab..8d6df78 100644 --- a/flake.nix +++ b/flake.nix @@ -109,17 +109,15 @@ nixosConfigurations."vm" = nixpkgs-unstable.lib.nixosSystem { inherit system; specialArgs = { - vars = import ./systems/userdata-default.nix // import ./systems/pc/userdata.nix; + vars = import ./systems/userdata-default.nix; pkgsVersion = nixpkgs-unstable; inherit inputs outputs; }; modules = [ ./modules ./users/vm - ./modules/collections/desktop.nix - ./systems/pc/configuration.nix + ./systems/vm/configuration.nix ({ config, pkgs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages nur.overlay]; }) - agenix.nixosModules.default home-manager-unstable.nixosModules.home-manager ]; }; diff --git a/home-manager/hyprland/waybar.nix b/home-manager/hyprland/waybar.nix index ac5dfb4..a369586 100644 --- a/home-manager/hyprland/waybar.nix +++ b/home-manager/hyprland/waybar.nix @@ -25,7 +25,7 @@ in spacing = 4; modules-left = [ "hyprland/workspaces" - "hyprland/window" + #"hyprland/window" ]; modules-center = []; modules-right = [ diff --git a/modules/graphical/hyprland.nix b/modules/graphical/hyprland.nix index 1fecac4..b4ab998 100644 --- a/modules/graphical/hyprland.nix +++ b/modules/graphical/hyprland.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, inputs, ... }: +{config, pkgs, lib, inputs, ... }: with lib; let cfg = config.custom.graphical.hyprland; diff --git a/modules/services/default.nix b/modules/services/default.nix index 59e291a..3dca1b1 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -1,6 +1,6 @@ { pkgs, config, ...}: { imports = [ - + ./kubernetes.nix ]; } diff --git a/modules/services/kubernetes.nix b/modules/services/kubernetes.nix new file mode 100644 index 0000000..035fb86 --- /dev/null +++ b/modules/services/kubernetes.nix @@ -0,0 +1,43 @@ +{ pkgs, config, lib, ...}: +# idk, dont need this +with lib; +let + cfg = config.custom.services.kubernetes; +in +{ + options.custom.services.kubernetes = { + enable = mkEnableOption "Enables kubernetes"; + }; + config = let + kubeMasterIP = "localhost"; + kubeMasterHostname = "localhost"; + in lib.mkIf cfg.enable { + + networking.firewall.allowedTCPPorts = [ + 6443 # k3s: required so that pods can reach the API server (running on port 6443 by default) + # 2379 # k3s, etcd clients: required if using a "High Availability Embedded etcd" configuration + # 2380 # k3s, etcd peers: required if using a "High Availability Embedded etcd" configuration + ]; + networking.firewall.allowedUDPPorts = [ + # 8472 # k3s, flannel: required if using multi-node for inter-node networking + ]; + services.k3s.enable = true; + services.k3s.role = "server"; + services.k3s.extraFlags = toString [ + # "--kubelet-arg=v=4" # Optionally add additional args to k3s + ]; + environment.systemPackages = with pkgs; [ + k3s + ]; + #services.kubernetes = { + # roles = ["master" "node"]; + # masterAddress = "localhost"; + # apiserverAddress = "https://localhost:6443"; + # apiserver = { + # advertiseAddress = "127.0.0.1"; + # securePort = 6443; + # allowPrivileged = true; + # }; + #}; + }; +} diff --git a/systems/vm/configuration.nix b/systems/vm/configuration.nix index 1d29e00..9b0197c 100644 --- a/systems/vm/configuration.nix +++ b/systems/vm/configuration.nix @@ -15,9 +15,8 @@ ld.enable = true; settings.enable = true; }; - graphical = { - hyprland.enable = true; - shared.enable = true; + services = { + kubernetes.enable = true; }; }; } diff --git a/users/vm/home.nix b/users/vm/home.nix index aff81c4..78621bb 100644 --- a/users/vm/home.nix +++ b/users/vm/home.nix @@ -7,7 +7,6 @@ imports = [ ../../home-manager/nvim.nix ../../home-manager/zsh.nix - ../../home-manager/hyprland-settings.nix inputs.nix-colors.homeManagerModule ]; }