From de6a4169589419856257d68c22a4bbf5b64f15e5 Mon Sep 17 00:00:00 2001 From: Zynh Ludwig Date: Sun, 18 Aug 2024 00:00:38 -0700 Subject: [PATCH] flake: cleaning up vm hosts --- flake.nix | 8 -- hosts/nixos/configuration.nix | 135 ----------------------- hosts/nixos/hardware-configuration.nix | 31 ------ hosts/nixos/home.nix | 30 ------ hosts/sprite/configuration.nix | 137 ------------------------ hosts/sprite/hardware-configuration.nix | 34 ------ hosts/sprite/home.nix | 27 ----- 7 files changed, 402 deletions(-) delete mode 100644 hosts/nixos/configuration.nix delete mode 100644 hosts/nixos/hardware-configuration.nix delete mode 100644 hosts/nixos/home.nix delete mode 100644 hosts/sprite/configuration.nix delete mode 100644 hosts/sprite/hardware-configuration.nix delete mode 100644 hosts/sprite/home.nix diff --git a/flake.nix b/flake.nix index 50c3a91..962fda8 100644 --- a/flake.nix +++ b/flake.nix @@ -50,14 +50,6 @@ hostname = "snowhawk"; system = "x86_64-linux"; } - { - hostname = "sprite"; - system = "aarch64-linux"; - } - { - hostname = "nixos"; - system = "x86_64-linux"; - } ]; homeConfigurations = diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix deleted file mode 100644 index 1f93d28..0000000 --- a/hosts/nixos/configuration.nix +++ /dev/null @@ -1,135 +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`). - -{ pkgs, inputs, ... }: - -{ - imports = [ - inputs.home-manager.nixosModules.default - ../../modules - ]; - - # TODO: fix bootloader - - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable networking - networking.networkmanager.enable = true; - - fonts.packages = with pkgs; [ - (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) - ]; - - # Set your time zone. - time.timeZone = "America/Los_Angeles"; - - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Enable the XFCE Desktop Environment. - services.xserver.displayManager.lightdm.enable = true; - services.xserver.desktopManager.budgie.enable = true; - - # Configure keymap in X11 - services.xserver = { - xkb = { - layout = "us"; - variant = ""; - }; - }; - - # Enable CUPS to print documents. - services.printing.enable = true; - - services.envfs.enable = true; - - nix.settings = { - experimental-features = [ "nix-command" "flakes" ]; - auto-optimise-store = true; - }; - - programs.nix-ld.enable = true; - # programs.nix-ld.libraries = with pkgs; [ - # - # ]; - - # Define a user account. Don't forget to set a password with `passwd`. - users.users.ravenshade = { - isNormalUser = true; - description = "Zynh Ludwig"; - extraGroups = [ "networkmanager" "wheel" ]; - packages = with pkgs; [ - fish - ripgrep - lazygit - unzip - fzf - tree - - xclip - - rustup - gnumake - zig - gcc - go - python3 - nodejs_22 - # dotnet-sdk_8 - ]; - }; - - # Enable automatic login for the user. - services.displayManager.autoLogin = { - enable = true; - user = "ravenshade"; - }; - - home-manager = { - extraSpecialArgs = { inherit inputs; }; - users = { "ravenshade" = import ./home.nix; }; - # backupFileExtension = "backup"; - }; - - # programs.hyprland.enable = true; - # environment.sessionVariables.NIXOS_OZONE_WL = "1"; - - environment.systemPackages = with pkgs; [ - neovim - curl - git - killall - ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? -} diff --git a/hosts/nixos/hardware-configuration.nix b/hosts/nixos/hardware-configuration.nix deleted file mode 100644 index 0edb9c7..0000000 --- a/hosts/nixos/hardware-configuration.nix +++ /dev/null @@ -1,31 +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. -{ lib, ... }: - -{ - imports = [ ]; - - boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { - device = "/dev/disk/by-uuid/439bb7c9-9b00-4899-944b-d0606f4c90db"; - fsType = "ext4"; - }; - - 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.enp0s3.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - virtualisation.virtualbox.guest.enable = true; -} diff --git a/hosts/nixos/home.nix b/hosts/nixos/home.nix deleted file mode 100644 index 2a7185b..0000000 --- a/hosts/nixos/home.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ pkgs, inputs, ... }: - -{ - imports = [ - ../../home/modules - ]; - - snowhawk.neovim = { - enable = true; - package = inputs.neovim-overlay.packages.${pkgs.system}.default; - }; - snowhawk.alacritty.enable = true; - snowhawk.theme.enable = true; - snowhawk.projects.enable = true; - - xsession.numlock.enable = true; - - home.packages = with pkgs; [ - nix-output-monitor - (writeShellScriptBin "rebuild" '' - sudo nixos-rebuild switch --log-format internal-json -v |& nom --json - '') - ]; - - home.file = { }; - - # Let Home Manager install and manage itself. - programs.home-manager.enable = true; - home.stateVersion = "23.11"; -} diff --git a/hosts/sprite/configuration.nix b/hosts/sprite/configuration.nix deleted file mode 100644 index bb1e14f..0000000 --- a/hosts/sprite/configuration.nix +++ /dev/null @@ -1,137 +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`). - -{ pkgs, inputs, ... }: - -{ - imports = [ - inputs.home-manager.nixosModules.default - ../../modules - ]; - - # TODO: fix bootloader - - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable networking - networking.networkmanager.enable = true; - - fonts.packages = with pkgs; [ - (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) - ]; - - # Set your time zone. - time.timeZone = "America/Los_Angeles"; - - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Enable the XFCE Desktop Environment. - services.xserver.displayManager.lightdm.enable = true; - services.xserver.desktopManager.budgie.enable = true; - - # Configure keymap in X11 - services.xserver = { - xkb = { - layout = "us"; - variant = ""; - }; - }; - - # Enable CUPS to print documents. - services.printing.enable = true; - - services.envfs.enable = true; - - nix.settings = { - experimental-features = [ "nix-command" "flakes" ]; - auto-optimise-store = true; - }; - - programs.nix-ld.enable = true; - # programs.nix-ld.libraries = with pkgs; [ - # - # ]; - - # Define a user account. Don't forget to set a password with `passwd`. - users.users.ravenshade = { - isNormalUser = true; - description = "Zynh Ludwig"; - extraGroups = [ "networkmanager" "wheel" ]; - packages = with pkgs; [ - fish - ripgrep - lazygit - unzip - fzf - tree - - nix-output-monitor - - xclip - - rustup - gnumake - zig - gcc - go - python3 - nodejs_22 - # dotnet-sdk_8 - ]; - }; - - # Enable automatic login for the user. - services.displayManager.autoLogin = { - enable = true; - user = "ravenshade"; - }; - - home-manager = { - extraSpecialArgs = { inherit inputs; }; - users = { "ravenshade" = import ./home.nix; }; - # backupFileExtension = "backup"; - }; - - # programs.hyprland.enable = true; - # environment.sessionVariables.NIXOS_OZONE_WL = "1"; - - environment.systemPackages = with pkgs; [ - neovim - curl - git - killall - ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.11"; # Did you read the comment? -} diff --git a/hosts/sprite/hardware-configuration.nix b/hosts/sprite/hardware-configuration.nix deleted file mode 100644 index 812a5e0..0000000 --- a/hosts/sprite/hardware-configuration.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, modulesPath, ... }: - -{ - imports = [ (modulesPath + "/profiles/qemu-guest.nix") ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_pci" "usbhid" "usb_storage" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { - device = "/dev/disk/by-uuid/fa4ed906-f26b-40ec-859c-81813151c33a"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { - device = "/dev/disk/by-uuid/31B8-8850"; - fsType = "vfat"; - }; - - swapDevices = [ ]; - - networking.hostName = "sprite"; - # 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.enp0s1.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux"; -} diff --git a/hosts/sprite/home.nix b/hosts/sprite/home.nix deleted file mode 100644 index a14fa15..0000000 --- a/hosts/sprite/home.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ pkgs, inputs, ... }: - -{ - imports = [ - ../../home/modules - ]; - - snowhawk.neovim = { - enable = true; - package = inputs.neovim-overlay.packages.${pkgs.system}.default; - }; - snowhawk.alacritty.enable = true; - snowhawk.theme.enable = true; - snowhawk.projects.enable = true; - - xsession.numlock.enable = true; - - home.packages = with pkgs; [ - (writeShellScriptBin "rebuild" '' - sudo nixos-rebuild switch --log-format internal-json -v |& nom --json - '') - ]; - - # Let Home Manager install and manage itself. - programs.home-manager.enable = true; - home.stateVersion = "23.11"; -}