From 255c8ca4d073ec45c08fe337ac42feb659ad9b6d Mon Sep 17 00:00:00 2001 From: Kabbone Date: Sat, 5 Oct 2024 10:30:57 +0200 Subject: [PATCH] prototype fuji --- hosts/fuji/default.nix | 82 +++++++++++++++ hosts/fuji/hardware-configuration.nix | 138 ++++++++++++++++++++++++++ hosts/fuji/home.nix | 45 +++++++++ 3 files changed, 265 insertions(+) create mode 100644 hosts/fuji/default.nix create mode 100644 hosts/fuji/hardware-configuration.nix create mode 100644 hosts/fuji/home.nix diff --git a/hosts/fuji/default.nix b/hosts/fuji/default.nix new file mode 100644 index 0000000..2671b2d --- /dev/null +++ b/hosts/fuji/default.nix @@ -0,0 +1,82 @@ +# +# Specific system configuration settings for desktop +# +# flake.nix +# ├─ ./hosts +# │ └─ ./laptop +# │ ├─ default.nix * +# │ └─ hardware-configuration.nix +# └─ ./modules +# ├─ ./desktop +# │ └─ ./hyprland +# │ └─ hyprland.nix +# ├─ ./modules +# │ └─ ./programs +# │ └─ waybar.nix +# └─ ./hardware +# └─ default.nix +# + +{ config, nixpkgs, pkgs, user, lib, ... }: + +{ + imports = # For now, if applying to other system, swap files + [(import ./hardware-configuration.nix)] ++ # Current system hardware config @ /etc/nixos/hardware-configuration.nix + [(import ../../modules/wm/sway/default.nix)] ++ # Window Manager + (import ../../modules/wm/virtualisation) ++ # libvirt + Docker + [(import ../../modules/wm/virtualisation/kvm-amd.nix)] ++ # kvm module options + (import ../../modules/hardware); # Hardware devices + + boot = { # Boot options + kernelPackages = pkgs.linuxPackages_latest; + + loader = { # EFI Boot + systemd-boot.enable = lib.mkForce false; + efi = { + canTouchEfiVariables = true; + efiSysMountPoint = "/boot"; + }; + timeout = 1; # Grub auto select time + }; + + lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; + }; + }; + +# hardware.sane = { # Used for scanning with Xsane +# enable = false; +# extraBackends = [ pkgs.sane-airscan ]; +# }; +# hardware = { +# nitrokey.enable = true; +# }; + +# environment = { +# systemPackages = with pkgs; [ +## simple-scan +## intel-media-driver +## alacritty +# ]; +# }; + + services = { + #auto-cpufreq.enable = true; + blueman.enable = true; + printing = { # Printing and drivers for TS5300 + enable = true; + drivers = [ pkgs.gutenprint ]; + }; + avahi = { # Needed to find wireless printer + enable = true; + nssmdns4 = true; + publish = { # Needed for detecting the scanner + enable = true; + addresses = true; + userServices = true; + }; + }; + }; + +} diff --git a/hosts/fuji/hardware-configuration.nix b/hosts/fuji/hardware-configuration.nix new file mode 100644 index 0000000..67f7080 --- /dev/null +++ b/hosts/fuji/hardware-configuration.nix @@ -0,0 +1,138 @@ +# +# Hardware settings for Teclast F5 10" Laptop +# NixOS @ sda2 +# +# flake.nix +# └─ ./hosts +# └─ ./laptop +# └─ hardware-configuration.nix * +# +# 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")] ++ + [( import ../../modules/hardware/backup.nix )]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; + boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + boot.tmp.useTmpfs = false; + boot.tmp.cleanOnBoot = true; + zramSwap.enable = true; + + services.btrfs.autoScrub = { + enable = true; + interval = "monthly"; + fileSystems = [ + "/" + ]; + }; + + services.btrbk = { + instances = { + hf = { + onCalendar = "hourly"; + settings = { + incremental = "yes"; + snapshot_create = "ondemand"; + snapshot_dir = "@snapshots"; + timestamp_format = "long"; + + snapshot_preserve = "2m 2w 5d 5h"; + snapshot_preserve_min = "latest"; + + volume = { + "/mnt/snapshots/root" = { + snapshot_create = "always"; + subvolume = { + "@home" = {}; + }; + }; + }; + }; + }; + }; + }; + + fileSystems."/" = + { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2"; + fsType = "btrfs"; + options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@,discard=async" ]; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2"; + fsType = "btrfs"; + options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@home,discard=async" ]; + }; + + fileSystems."/srv" = + { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2"; + fsType = "btrfs"; + options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ]; + }; + + fileSystems."/nix" = + { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2"; + fsType = "btrfs"; + options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@nix,discard=async" ]; + }; + + fileSystems."/swap" = + { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2"; + fsType = "btrfs"; + options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@swap,discard=async" ]; + }; + + fileSystems."/mnt/snapshots/root" = + { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part2"; + fsType = "btrfs"; + options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvolid=5,discard=async" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-id/nvme-ADATA_SX8200PNP_2J3320119186-part1"; + fsType = "vfat"; + }; + + + swapDevices = [ { device = "/swap/swapfile"; } ]; + + networking = { + useDHCP = false; # Deprecated + hostName = "fuji"; + networkmanager = { + enable = false; + }; + firewall = { + enable = true; + #allowedUDPPorts = [ 24727 ]; + #allowedTCPPorts = [ 24727 ]; + }; + }; + + systemd.network = { + enable = true; + networks = { + "10-lan" = { + matchConfig.Name = "eno1"; + ntp = [ "192.168.2.1" ]; + networkConfig = { + DHCP = "yes"; + IPv6AcceptRA = true; + }; + }; + }; + }; + + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + #powerManagement.powertop.enable = true; + powerManagement = { + scsiLinkPolicy = "med_power_with_dipm"; + }; +} diff --git a/hosts/fuji/home.nix b/hosts/fuji/home.nix new file mode 100644 index 0000000..6945c1c --- /dev/null +++ b/hosts/fuji/home.nix @@ -0,0 +1,45 @@ +# +# Home-manager configuration for laptop +# +# flake.nix +# ├─ ./hosts +# │ └─ ./laptop +# │ └─ home.nix * +# └─ ./modules +# └─ ./desktop +# └─ ./hyprland +# └─ hyprland.nix +# + +{ pkgs, ... }: + +{ + imports = + [ + #../../modules/wm/hyprland/home.nix # Window Manager + #../../modules/wm/kde/home.nix # Window Manager + ../../modules/home.nix # Window Manager + ]; + + home = { # Specific packages for laptop + packages = with pkgs; [ + # Applications + #firefox + chromium + thunderbird + streamlink + streamlink-twitch-gui-bin + element-desktop + #nheko + pulsemixer + ]; + }; + + services = { # Applets + #blueman-applet.enable = true; # Bluetooth + network-manager-applet.enable = true; # Network + }; + + xsession.preferStatusNotifierItems = true; + +}