Add new laptop

systems/default.nix

@@ -20,6 +20,7 @@ let
 in
 {
   kuraokami = mkSystem "x86_64-unknown-linux-gnu" "kuraokami";
+  omoikane = mkSystem "x86_64-unknown-linux-gnu" "omoikane";
   yokai = mkSystem "aarch64-unknown-linux-gnu" "yokai";
   sukuna-biko-na = mkSystem "aarch64-unknown-linux-gnu" "sukuna-biko-na";
   benzaiten = mkSystem "x86_64-unknown-linux-gnu" "benzaiten";

systems/omoikane/default.nix

@@ -0,0 +1,84 @@
+{ config, pkgs, lib, nixos-hardware, self, ... }:
+
+{
+  imports = [
+    ./hardware.nix
+    nixos-hardware.nixosModules.framework-16-7040-amd
+    self.inputs.srvos.nixosModules.desktop
+  ];
+
+  jopejoe1 = {
+    audio = {
+      enable = true;
+    };
+    bluetooth.enable = true;
+    local.enable = true;
+    nix.enable = true;
+    plasma.enable = true;
+    printing.enable = true;
+    steam.enable = true;
+    ssh.enable = true;
+    sway.enable = true;
+    zerotierone.enable = true;
+    gui.enable = true;
+    keyboard = {
+      enable = true;
+      layout = "us";
+    };
+    user = {
+      jopejoe1.enable = true;
+      root.enable = true;
+    };
+    boot.systemd.enable = true;
+  };
+
+  services.xserver = {
+    xkbVariant = "altgr-intl";
+  };
+
+  services = {
+    pcscd.enable = true;
+    udev.packages = [ pkgs.yubikey-personalization ];
+    fwupd.enable = true;
+    libinput.enable = true;
+  };
+
+  time.timeZone = "Europe/Berlin";
+
+  hardware = {
+    opengl = {
+      enable = true;
+      driSupport32Bit = true;
+    };
+    gpgSmartcards.enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    localPkgs.prismlauncher-withExtraStuff
+    goverlay
+    libreoffice-qt
+    thunderbird
+  ];
+
+  programs = {
+    adb.enable = true;
+    dconf.enable = true;
+    xwayland.enable = true;
+    kdeconnect.enable = true;
+    gamemode.enable = true;
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+      pinentryPackage = pkgs.pinentry-qt;
+    };
+  };
+
+  nix.settings.system-features = [ "benchmark" "big-parallel" "kvm" "nixos-test" ];
+
+  boot.binfmt.emulatedSystems = [ "riscv64-linux" "aarch64-linux" ];
+  boot.plymouth = {
+    enable = true;
+  };
+
+  boot.initrd.systemd.enable = true;
+}

systems/omoikane/hardware.nix

@@ -0,0 +1,38 @@
+# 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") ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ "amdgpu" ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/6842a9de-c5fd-4648-b3b8-f76e56633825";
+      fsType = "ext4";
+    };
+
+  boot.initrd.luks.devices."luks-eaed8652-a306-4434-a187-71e6fcb13e71".device = "/dev/disk/by-uuid/eaed8652-a306-4434-a187-71e6fcb13e71";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/7C5A-EE45";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  fileSystems."/home/jopejoe1/Public/games" =
+    { device = "/dev/sda";
+      fsType = "bcachefs";
+      options = [ "compression=zstd" ];
+    };
+
+  swapDevices = [ ];
+
+  #nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}