From 917520936e64810be3f244085ac2acb9d920d2e5 Mon Sep 17 00:00:00 2001 From: Michael Thomson Date: Thu, 12 Feb 2026 15:47:45 -0500 Subject: [PATCH] removed macvm host --- flake.nix | 7 --- hosts/macvm/configuration.nix | 72 -------------------------- hosts/macvm/hardware-configuration.nix | 39 -------------- hosts/macvm/home.nix | 39 -------------- 4 files changed, 157 deletions(-) delete mode 100644 hosts/macvm/configuration.nix delete mode 100644 hosts/macvm/hardware-configuration.nix delete mode 100644 hosts/macvm/home.nix diff --git a/flake.nix b/flake.nix index 6293ad8..4b42865 100644 --- a/flake.nix +++ b/flake.nix @@ -46,13 +46,6 @@ ./hosts/thinkpad/configuration.nix ]; }; - macvm = nixpkgs.lib.nixosSystem { - system = "aarch64-linux"; - specialArgs = {inherit inputs;}; - modules = [ - ./hosts/macvm/configuration.nix - ]; - }; wsl = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit inputs;}; diff --git a/hosts/macvm/configuration.nix b/hosts/macvm/configuration.nix deleted file mode 100644 index c163bb3..0000000 --- a/hosts/macvm/configuration.nix +++ /dev/null @@ -1,72 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). -{ - config, - pkgs, - inputs, - ... -}: { - imports = [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - inputs.home-manager.nixosModules.default - ../../modules/nixos/bootloader.nix - ../../modules/nixos/user.nix - ../../modules/nixos/ssh.nix - ../../modules/nixos/bluetooth.nix - ../../modules/nixos/1password.nix - #../../modules/nixos/sway.nix - ../../modules/nixos/i3.nix - ../../modules/nixos/nm.nix - ../../modules/nixos/sound.nix - #../../modules/nixos/steam.nix - ../../modules/nixos/env.nix - ../../modules/nixos/docker.nix - ]; - - virtualisation.vmware.guest.enable = true; - - networking.hostName = "macvm"; - - nix.settings = { - trusted-users = ["mthomson"]; - - substituters = [ - "https://cache.nixos.org" - "https://nix-community.cachix.org" - ]; - - trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; - }; - - time.timeZone = "America/Toronto"; - - i18n.defaultLocale = "en_CA.UTF-8"; - - nixpkgs.config.allowUnfree = true; - - nix.settings.experimental-features = ["nix-command" "flakes"]; - - environment.systemPackages = with pkgs; [ - wget - git - curl - lsof - mesa - dconf - ]; - - home-manager = { - extraSpecialArgs = {inherit inputs;}; - useGlobalPkgs = true; - useUserPackages = true; - users = { - mthomson = import ./home.nix; - }; - }; - - system.stateVersion = "23.11"; -} diff --git a/hosts/macvm/hardware-configuration.nix b/hosts/macvm/hardware-configuration.nix deleted file mode 100644 index 04701f0..0000000 --- a/hosts/macvm/hardware-configuration.nix +++ /dev/null @@ -1,39 +0,0 @@ -# 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 = []; - - boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "sr_mod"]; - boot.initrd.kernelModules = []; - boot.kernelModules = []; - boot.extraModulePackages = []; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/9b7313b6-1939-4f81-b8fc-b17217fc59e7"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/EB32-81A0"; - fsType = "vfat"; - options = ["fmask=0077" "dmask=0077"]; - }; - - swapDevices = []; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.ens160.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; -} diff --git a/hosts/macvm/home.nix b/hosts/macvm/home.nix deleted file mode 100644 index 83355c9..0000000 --- a/hosts/macvm/home.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - config, - pkgs, - ... -}: { - imports = [ - #../../modules/home-manager/sway.nix - ../../modules/home-manager/i3 - ../../modules/home-manager/git.nix - ../../modules/home-manager/neovim - ../../modules/home-manager/wezterm - ../../modules/home-manager/zsh.nix - ../../modules/home-manager/tmux.nix - ../../modules/home-manager/taskwarrior.nix - ../../modules/home-manager/email-personal.nix - ../../modules/home-manager/syncthing.nix - ../../modules/home-manager/bitwarden.nix - ../../modules/home-manager/kubernetes.nix - ../../modules/home-manager/nix-index.nix - ../../modules/home-manager/bitwarden.nix - ../../modules/home-manager/direnv.nix - ../../modules/home-manager/jq.nix - ../../modules/home-manager/lazygit.nix - ../../modules/home-manager/man.nix - ../../modules/home-manager/gpg.nix - ../../modules/home-manager/latex.nix - #../../modules/home-manager/emacs - ]; - home.username = "mthomson"; - home.homeDirectory = "/home/mthomson"; - home.stateVersion = "23.11"; - - home.packages = with pkgs; [ - firefox - gcc - ]; - - programs.home-manager.enable = true; -}