diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index de4c16e..cb248d8 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -5,7 +5,7 @@ let zshFunctions = zshFWBook + "/functions.sh"; openPorts = [ 8000 - 8001 + 8001 ]; in { @@ -41,6 +41,10 @@ in ]; }; }; + + + # Tailscale + services.tailscale.enable = true; # Desktop Env services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.wayland = true; @@ -109,6 +113,9 @@ in # development vscode + # Run macos apps + darling-dmg + # mail thunderbird @@ -217,7 +224,7 @@ in "api.me.internal" ]; "127.0.0.1" = [ - "fwbook" + "fwbook" "auth.me.internal" "me.internal" "me.local" diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index d0f7051..2ee8564 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -27,6 +27,10 @@ amdgpu.enable = true; udevrules.coraltpu.enable = true; }; + server.k3s = { + enable = true; + envPath = "/opt/k3s/k3s.env"; + }; server.services = { ai.enable = true; jellyfin.enable = false; @@ -48,7 +52,7 @@ }; networkDrives.enable = true; }; - + networking.firewall.enable = false; users.users.ari.extraGroups = [ "input" ]; # firmware updater services.fwupd.enable = true; @@ -65,13 +69,13 @@ services.autosuspend.enable = false; services.xserver.displayManager.gdm.autoSuspend = false; - environment.systemPackages = with pkgs; [ - # steam-tui - # steam-run - # steamPackages.steamcmd - ollama - jellyfin - jellyfin-web - jellyfin-ffmpeg - ]; + # environment.systemPackages = with pkgs; [ + # # steam-tui + # # steam-run + # # steamPackages.steamcmd + # # ollama + # # jellyfin + # # jellyfin-web + # # jellyfin-ffmpeg + # ]; } diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index d7144d5..ba289d6 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -24,7 +24,11 @@ in skyg.networkDrives = { enable = true; }; - skyg.core.tailscaleRouting = "both"; + services.tailscale.enable = true; + services.tailscale.disableTaildrop = true; + services.tailscale.useRoutingFeatures = "both"; + services.tailscale.openFirewall = true; + # # Nix Stores services.nix-serve = { enable = true; diff --git a/modules/home/programs.nix b/modules/home/programs.nix index 9119b9c..499e668 100644 --- a/modules/home/programs.nix +++ b/modules/home/programs.nix @@ -20,8 +20,8 @@ }; lsd = { enable = true; - enableBashIntegration = true; - enableZshIntegration = true; + enableBashIntegration = true; + enableZshIntegration = true; }; starship = { enable = true; @@ -29,10 +29,10 @@ enableBashIntegration = true; enableZshIntegration = true; settings = { - env_var = { - variable = "SHELL"; - default = "unknown shell"; - }; + env_var = { + variable = "SHELL"; + default = "unknown shell"; + }; kubernetes = { disabled = false; }; @@ -56,9 +56,9 @@ sudo = { disabled = false; }; - memory_usage = { + memory_usage = { disabled = false; - }; + }; }; }; nushell = { @@ -76,20 +76,21 @@ zsh = { enable = true; autosuggestion = { - enable = true; - strategy = [ - "match_prev_cmd" - "history" - "completion" - ]; - }; - syntaxHighlighting.enable = true; + enable = true; + strategy = [ + "match_prev_cmd" + "history" + "completion" + ]; + }; + syntaxHighlighting.enable = true; }; zellij = { enable = true; settings = { theme = "nord"; session_serialization = false; + show_startup_tips = false; }; }; tmux = { diff --git a/modules/nixos/common/networking.nix b/modules/nixos/common/networking.nix index c80e447..0888b5f 100644 --- a/modules/nixos/common/networking.nix +++ b/modules/nixos/common/networking.nix @@ -9,10 +9,6 @@ in description = "Machine Hostname"; type = lib.types.str; }; - tailscaleRouting = lib.mkOption { - type = lib.types.str; - default = "client"; - }; }; }; config = { @@ -25,10 +21,6 @@ in # NFS Support services.nfs.server.enable = true; - # Tailscale - services.tailscale.enable = true; - services.tailscale.useRoutingFeatures = cfg.tailscaleRouting; - # Disable the flaky nm service systemd.services.NetworkManager-wait-online.enable = false; };