diff --git a/flake.nix b/flake.nix index c358dcb..1419bbc 100644 --- a/flake.nix +++ b/flake.nix @@ -161,7 +161,7 @@ inputs.nixos-hardware.nixosModules.lenovo-legion-15arh05h ./nixos/profiles/hw-legion-15arh05h.nix disko.nixosModules.disko - (import ./nixos/profiles/disko-nixos.nix { disks = [ "/dev/nvme1n1" ]; }) + (import ./nixos/profiles/disko-nixos.nix { disks = [ "/dev/nvme0n1" ]; }) ]; profileModules = [ ./nixos/profiles/role-dev.nix @@ -171,6 +171,24 @@ ]; }; + "telchar" = mkNixosConfig { + # Framework 16 Ryzen 7 7840HS - Radeon 780M Graphics + # Nix dev laptop + hostname = "telchar"; + system = "x86_64-linux"; + hardwareModules = [ + inputs.nixos-hardware.nixosModules.framework-16-7040-amd + ./nixos/profiles/hw-framework-16-7840hs.nix + disko.nixosModules.disko + (import ./nixos/profiles/disko-nixos.nix { disks = [ "/dev/nvme0n1" ]; }) + ]; + profileModules = [ + ./nixos/profiles/role-dev.nix + ./nixos/profiles/role-workstation.nix + { home-manager.users.jahanson = ./nixos/home/jahanson/workstation.nix; } + ]; + }; + "varda" = mkNixosConfig { # Arm64 cax21 @ Hetzner # forgejo server diff --git a/nixos/hosts/telchar/default.nix b/nixos/hosts/telchar/default.nix new file mode 100644 index 0000000..5758ad9 --- /dev/null +++ b/nixos/hosts/telchar/default.nix @@ -0,0 +1,50 @@ +# 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, modulesPath, ... }: + +{ + imports = + [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + networking.hostId = "4488bd1a"; + networking.hostName = "telchar"; + boot = { + initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ]; + initrd.kernelModules = [ ]; + kernelModules = [ "kvm-amd" ]; + extraModulePackages = [ ]; + }; + + fileSystems."/" = { + device = "zroot/root"; + fsType = "zfs"; + }; + + fileSystems."/nix" = { + device = "zroot/nix"; + fsType = "zfs"; + }; + + fileSystems."/var" = { + device = "zroot/var"; + fsType = "zfs"; + }; + + fileSystems."/home" = { + device = "zroot/home"; + fsType = "zfs"; + }; + + swapDevices = [ ]; + + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + + # System settings and services. + mySystem = { + purpose = "Development"; + system.motd.networkInterfaces = [ "wlp1s0" ]; + }; +} diff --git a/nixos/profiles/hw-framework-16-7840hs.nix b/nixos/profiles/hw-framework-16-7840hs.nix new file mode 100644 index 0000000..d2e4dd7 --- /dev/null +++ b/nixos/profiles/hw-framework-16-7840hs.nix @@ -0,0 +1,32 @@ +{ lib, pkgs, ... }: +{ + # Support windows partition + mySystem = { + security.wheelNeedsSudoPassword = false; + }; + + boot = { + # for managing/mounting ntfs + supportedFilesystems = [ "nfs" ]; + + loader = { + grub = { + enable = true; + zfsSupport = true; + device = "nodev"; + mirroredBoots = [ + { devices = ["nodev"]; path = "/boot";} + ]; + }; + # efi = { + # canTouchEfiVariables = true; + # }; + }; + }; + + networking = { + useDHCP = lib.mkDefault true; + }; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; +} diff --git a/nixos/profiles/hw-legion-15arh05h.nix b/nixos/profiles/hw-legion-15arh05h.nix index e7fc7f9..0b5d2f7 100644 --- a/nixos/profiles/hw-legion-15arh05h.nix +++ b/nixos/profiles/hw-legion-15arh05h.nix @@ -10,7 +10,7 @@ boot = { # for managing/mounting ntfs - supportedFilesystems = [ "ntfs" ]; + supportedFilesystems = [ "ntfs" "nfs" ]; loader = { grub = {