diff --git a/flake.nix b/flake.nix index b835059..f59b9ae 100644 --- a/flake.nix +++ b/flake.nix @@ -92,6 +92,16 @@ inputs.disko.nixosModules.disko ]; }; + mew = nixpkgs-unstable.lib.nixosSystem { + system = systems.x86_64; + specialArgs = {inherit inputs stable_pkgs unstable_pkgs;}; + modules = [ + ./hosts/nixos/mew/configuration.nix + ./hosts/nixos/mew/disko.nix + inputs.home-manager-unstable.nixosModules.default + inputs.disko.nixosModules.disko + ]; + }; vaniville = nixpkgs.lib.nixosSystem { system = systems.x86_64; specialArgs = {inherit inputs stable_pkgs unstable_pkgs;}; diff --git a/hosts/nixos/mew/configuration.nix b/hosts/nixos/mew/configuration.nix index 1815108..2a37e91 100644 --- a/hosts/nixos/mew/configuration.nix +++ b/hosts/nixos/mew/configuration.nix @@ -28,7 +28,7 @@ yubikey.enable = true; yubikey.lock_on_remove = true; tailscale.enable = true; - syncthing.enable = true; + syncthing.enable = false; flatpak.enable = true; graphics = { enable = true; @@ -66,7 +66,7 @@ # boot (systemd is growing on me) boot = { - kernelModules = ["kvm-intel"]; + kernelModules = [ "kvm-amd" ]; extraModulePackages = []; loader = { systemd-boot.enable = true; # systemd your pretty cool ya know @@ -74,7 +74,7 @@ }; initrd = { systemd.enable = true; # better logging - availableKernelModules = ["xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod"]; + availableKernelModules = ["xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" "ahci"]; kernelModules = []; }; }; @@ -84,7 +84,7 @@ hostName = "mew"; # hostname useDHCP = lib.mkDefault true; interfaces = { - wlp0s20f3.useDHCP = lib.mkDefault true; + wlp7s0.useDHCP = lib.mkDefault true; }; firewall = { enable = true; @@ -108,4 +108,5 @@ # hardware shit nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/nixos/mew/disko.nix b/hosts/nixos/mew/disko.nix index 0409697..f85e551 100644 --- a/hosts/nixos/mew/disko.nix +++ b/hosts/nixos/mew/disko.nix @@ -3,7 +3,7 @@ disk = { main = { type = "disk"; - device = "/dev/disk/by-id/nvme-PC_SN530_NVMe_WDC_512GB_210513807733"; # disk id here + device = "/dev/disk/by-id/nvme-MTFDHBA512TDV-1AZ1AABHA_UJUND0170FW7O0"; # disk id here content = { type = "gpt"; partitions = { diff --git a/hosts/nixos/mew/hardware-configuration.nix b/hosts/nixos/mew/hardware-configuration.nix new file mode 100644 index 0000000..5c1b95e --- /dev/null +++ b/hosts/nixos/mew/hardware-configuration.nix @@ -0,0 +1,66 @@ +# 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 = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/mapper/crypted"; + fsType = "btrfs"; + options = [ "subvol=@root" ]; + }; + + boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/7f7cc335-c2ce-4595-a021-f7a4644e780b"; + + fileSystems."/nix" = + { device = "/dev/mapper/crypted"; + fsType = "btrfs"; + options = [ "subvol=@nix" ]; + }; + + fileSystems."/media/holocron/archives" = + { device = "systemd-1"; + fsType = "autofs"; + }; + + fileSystems."/media/holocron/blake" = + { device = "systemd-1"; + fsType = "autofs"; + }; + + fileSystems."/media/holocron/media" = + { device = "systemd-1"; + fsType = "autofs"; + }; + + fileSystems."/.swapvol" = + { device = "/dev/mapper/crypted"; + fsType = "btrfs"; + options = [ "subvol=@swap" ]; + }; + + fileSystems."/home" = + { device = "/dev/mapper/crypted"; + fsType = "btrfs"; + options = [ "subvol=@home" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/96E6-04E2"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} diff --git a/modules/system/graphics/default.nix b/modules/system/graphics/default.nix index c0405fc..8f6d390 100644 --- a/modules/system/graphics/default.nix +++ b/modules/system/graphics/default.nix @@ -57,12 +57,10 @@ in { # enable amd vulkan (program will choose this or regular) hardware.graphics.extraPackages = with pkgs; [ - amdvlk rocmPackages.clr.icd # enable open cl (compute framework like cuda) ]; # ^ but 32 bit hardware.graphics.extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk ]; # make hip work (extension on cli.icd ^)