\

@@ -1,197 +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
-      ./main-user.nix
-    ];
-
-  fileSystems."/mnt" =
-    { device = "/dev/mapper/volgrp-root";
-      fsType = "btrfs";
-      options = [ "subvol=5" ];
-    };
-
-  fileSystems."/mnt/home" =
-    { device = "/dev/mapper/volgrp-home";
-      fsType = "btrfs";
-      options = [ "subvol=5" ];
-    };
-  boot.initrd.luks.devices."nvme0n1p2_crypt".device = "/dev/disk/by-uuid/93922f23-d0ba-4405-adbb-9789d37e5985";
-  boot.initrd.luks.devices."nvme2n1p2_oldcrypt".device = "/dev/disk/by-uuid/44235dca-99e8-4ea8-9516-97d9f5a2d702";
-
-
-  # Add flakes
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  # Feel like I should be sure this is safe w/flakes first:
-  #system.autoUpgrade.enable = true;
-
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  # System name
-  networking.hostName = "supercell"; # Define your hostname.
-  # 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;
-
-  # Set your time zone.
-  time.timeZone = "America/New_York";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "en_US.UTF-8";
-    LC_IDENTIFICATION = "en_US.UTF-8";
-    LC_MEASUREMENT = "en_US.UTF-8";
-    LC_MONETARY = "en_US.UTF-8";
-    LC_NAME = "en_US.UTF-8";
-    LC_NUMERIC = "en_US.UTF-8";
-    LC_PAPER = "en_US.UTF-8";
-    LC_TELEPHONE = "en_US.UTF-8";
-    LC_TIME = "en_US.UTF-8";
-  };
-
-  # Enable the X11 windowing system.
-  # You can disable this if you're only using the Wayland session.
-  # services.xserver.enable = true;
-
-  # Enable the KDE Plasma Desktop Environment.
-  services.displayManager.sddm.enable = true;
-  services.displayManager.sddm.wayland.enable = true;
-  services.desktopManager.plasma6.enable = true;
-
-  # Configure keymap in X11 (presumably, XWayland uses something different?)
-  #services.xserver.xkb = {
-  #  layout = "us";
-  #  variant = "";
-  #};
-
-  # Enable CUPS to print documents.
-  # services.printing.enable = true;
-
-  # Enable sound with pipewire.
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-  };
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  # Pull defaults from main-user:
-  main-user.enable = true;
-  main-user.userName = "wolcen";
-  # And system-specific settings:
-  users.users.wolcen = {
-    description = "Chris Thompson";
-    openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEdxdKYrlwOolJpYxvWu6gW/60pzT6aKN6JHhnTSBFqN wolcen@typhoon" ];
-    extraGroups = [ "networkmanager" "wheel" ];
-  };
-
-  home-manager = {
-    extraSpecialArgs = { inherit inputs; };
-    users = {
-      "wolcen" = import ./home.nix;
-    };
-  };
-  
-  # Install firefox.
-  programs.firefox.enable = true;
-  # Add docker!
-  virtualisation.docker.enable = true;
-  virtualisation.docker.storageDriver = "btrfs"; # Only when using BTRFS! (wolcen approved!)
-  # Required for DDEV to add hosts files, if your DNS will not resolve addresses to localhost. 
-  environment.etc.hosts.mode = "0644";
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    neovim
-    wget
-    curl
-    tmux
-    whois
-    git
-    wl-clipboard-rs
-    dogdns
-    bat
-    nix-search-cli
-    lsof
-  ];
-
-  nixpkgs.config.permittedInsecurePackages = [
-    "electron-27.3.11"
-  ];
-
-  # 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;
-
-  # RX 6700 XT setup
-  hardware.graphics.extraPackages = [
-    pkgs.rocmPackages.clr.icd
-    pkgs.amdvlk
-    pkgs.libva
-  ];
-  # To enable Vulkan support for 32-bit applications, also add:
-  hardware.graphics.extraPackages32 = [
-    pkgs.driversi686Linux.amdvlk
-  ];
-    
-  # Force radv
-  environment.variables.AMD_VULKAN_ICD = "RADV";
-  # Or
-  #environment.variables.VK_ICD_FILENAMES =
-  #	"/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json";
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # 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 = "24.05"; # Did you read the comment?
-
-}

hosts/default/configuration.nix

@@ -11,33 +11,12 @@
       inputs.home-manager.nixosModules.default
       ./main-user.nix
     ];
-
-  fileSystems."/mnt" =
-    { device = "/dev/mapper/volgrp-root";
-      fsType = "btrfs";
-      options = [ "subvol=5" ];
-    };
-
-  fileSystems."/mnt/home" =
-    { device = "/dev/mapper/volgrp-home";
-      fsType = "btrfs";
-      options = [ "subvol=5" ];
-    };
-  boot.initrd.luks.devices."nvme0n1p2_crypt".device = "/dev/disk/by-uuid/93922f23-d0ba-4405-adbb-9789d37e5985";
-  boot.initrd.luks.devices."nvme2n1p2_oldcrypt".device = "/dev/disk/by-uuid/44235dca-99e8-4ea8-9516-97d9f5a2d702";
-
-
   # Add flakes
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
-
-  # Feel like I should be sure this is safe w/flakes first:
-  #system.autoUpgrade.enable = true;
-
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  # System name
   networking.hostName = "supercell"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
@@ -142,8 +121,6 @@
     wl-clipboard-rs
     dogdns
     bat
-    nix-search-cli
-    lsof
   ];
 
   nixpkgs.config.permittedInsecurePackages = [