diff --git a/common/desktop/vnc.nix b/common/desktop/vnc.nix deleted file mode 100644 index 60225ff..0000000 --- a/common/desktop/vnc.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, config, ...}: - -{ - services.xserver.enable = true; - services.xserver.displayManager.autoLogin = { - enable = true; - user = "regent"; - }; - - services.xserver.displayManager.sessionCommands = '' - ${pkgs.x11vnc}/bin/x11vnc -rfbauth $HOME/.vnc/passwd & - ''; - - services.xserver.desktopManager.xfce = { - enable = true; - } -}; diff --git a/flake.nix b/flake.nix index 8c3f80a..bbcf3d8 100755 --- a/flake.nix +++ b/flake.nix @@ -15,8 +15,6 @@ url = "github:0xc000022070/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - #microvm.url = "github:astro/microvm.nix"; - #microvm.inputs.nixpkgs.follows = "nixpkgs"; catppuccin.url = "github:catppuccin/nix"; home-manager = { @@ -48,13 +46,6 @@ ./hosts/focalor lix-module.nixosModules.default - /*microvm.nixosModules.host - { - microvm.autostart = [ - "windows" - ]; - }*/ - vscode-server.nixosModules.default agenix.nixosModules.default diff --git a/hosts/focalor/default.nix b/hosts/focalor/default.nix index 0ae05c4..41e15fc 100755 --- a/hosts/focalor/default.nix +++ b/hosts/focalor/default.nix @@ -6,7 +6,6 @@ # Host-specific hardware ./hardware.nix ./secrets.nix - ./vfio.nix # Common modules shared across hosts ../../common/system.nix @@ -17,7 +16,6 @@ # Desktop modules ../../common/desktop/core.nix ../../common/desktop/sway.nix - ../../common/desktop/vnc.nix # Nvidia ../../common/nvidia.nix @@ -36,35 +34,7 @@ networking.hostName = "focalor"; networking.hostId = "84bdc587"; - systemd.network = { - enable = true; - netdevs."br0" = { - netdevConfig = { - Name = "br0"; - Kind = "bridge"; - }; - }; - networks = { - "10-lan" = { - matchConfig.Name = ["enp5s0" "vm-*"]; - networkConfig = { - Bridge = "br0"; - }; - }; - "10-lan-bridge" = { - matchConfig.Name = "br0"; - networkConfig = { - Address = ["10.0.0.34/24" "2601:5c2:8400:26c0:aaa1:59ff:fe94:5aba/64"]; - Gateway = "10.0.0.1"; - DNS = ["10.0.0.210" "1.1.1.1"]; - IPv6AcceptRA = true; - }; - linkConfig.RequiredForOnline = "routable"; - }; - }; - }; - - /*networking = { + networking = { firewall.enable = false; firewall.trustedInterfaces = [ "tailscale0" @@ -72,7 +42,7 @@ nameservers = [ "10.0.0.210" "1.1.1.1" ]; useDHCP = true; firewall.allowedTCPPorts = [22 80 443 2456 2457 9000 9001 9002]; - };*/ + }; services.resolved = { enable = true; diff --git a/hosts/focalor/vfio.nix b/hosts/focalor/vfio.nix index eb144df..e0d1cfa 100644 --- a/hosts/focalor/vfio.nix +++ b/hosts/focalor/vfio.nix @@ -1,23 +1,19 @@ -{ config, lib, system, pkgs, modulesPath, inputs, ... }: - -{ - programs.virt-manager.enable = true; - virtualisation.spiceUSBRedirection.enable = true; - virtualisation.libvirtd = { - enable = true; - qemu = { - package = pkgs.qemu_kvm; - runAsRoot = true; - swtpm.enable = true; - ovmf = { - enable = true; - packages = [(pkgs.OVMF.override { - secureBoot = true; - tpmSupport = true; - }).fd]; - }; +programs.virt-manager.enable = true; +virtualisation.spiceUSBRedirection.enable = true; +virtualisation.libvirtd = { + enable = true; + qemu = { + package = pkgs.qemu_kvm; + runAsRoot = true; + swtpm.enable = true; + ovmf = { + enable = true; + packages = [(pkgs.OVMF.override { + secureBoot = true; + tpmSupport = true; + }).fd]; }; }; +}; - users.extraUsers.regent.extraGroups = [ "libvirtd" ]; -} \ No newline at end of file +users.extraUsers.regent.extraGroups = [ "libvirtd" ]; \ No newline at end of file