more work on hosts/ and modules/config

Signed-off-by: unexplrd <unexplrd@linerds.us>
2025-05-04 18:48:42 +03:00
parent a87f912600
commit 03bcc94645
27 changed files with 136 additions and 249 deletions
--- a/hosts/eldrid/boot/default.nix
+++ b/hosts/eldrid/boot/default.nix
@ -1,39 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  imports = with inputs;
-    [
-      chaotic.nixosModules.default
-      lanzaboote.nixosModules.lanzaboote
-    ]
-    ++ [
-      ./loader.nix
-    ];
-  boot = {
-    # kernelPackages = pkgs.linuxPackages_latest;
-    plymouth.enable = true;
-    consoleLogLevel = 0;
-    kernelPackages = pkgs.linuxPackages_cachyos;
-    kernelParams = [
-      "amd_iommu=force_isolation"
-      "debugfs=off"
-      "efi=disable_early_pci_dma"
-      "gather_data_sampling=force"
-      "intel_iommu=on"
-      "iommu.passthrough=0"
-      "iommu.strict=1"
-      "iommu=force"
-      "page_alloc.shuffle=1"
-      "vsyscall=none"
-      # "ia32_emulation=0"
-      # "lockdown=confidentiality"
-      # "module.sig_enforce=1"
-    ];
-    initrd = {
-      systemd.enable = true; # needed for auto-unlocking with TPM
-      systemd.tpm2.enable = false; # no TPM
-    };
-  };
-}
--- a/hosts/eldrid/boot/loader.nix
+++ b/hosts/eldrid/boot/loader.nix
@ -1,15 +0,0 @@
-{config, ...}: {
-  boot = {
-    lanzaboote = {
-      enable = false;
-      pkiBundle = "/var/lib/sbctl";
-    };
-    loader = {
-      efi.canTouchEfiVariables = true;
-      systemd-boot = {
-        enable = !config.boot.lanzaboote.enable;
-        consoleMode = "auto";
-      };
-    };
-  };
-}
--- a/hosts/eldrid/configuration.nix
+++ b/hosts/eldrid/configuration.nix
@ -2,29 +2,38 @@
  imports = with inputs; [
    self.nixosModules.desktop
    self.nixosModules.system
-    ./boot
    ./disko
    ./hardware
-    ./networking
-    ./nix
-    ../dunamis/programs.nix
-    ../dunamis/services.nix
-    ../dunamis/sops.nix
-    ../dunamis/users.nix
  ];

+  networking = {
+    networkmanager.enable = true;
+    # hostId = "";
+    hostName = "eldrid";
+  };
+
+  environment.memoryAllocator.provider = "mimalloc";
+  system.stateVersion = "25.05";
+  time.timeZone = "Europe/Kyiv";
+
  desktop.plasma.enable = true;

-  locale.ukrainian.enable = true;
-
-  module.stylix = {
-    enable = true;
-    theme = "nord";
+  module = {
+    config = {
+      secureBoot = true;
+      useIwd = true;
+    };
+    stylix = {
+      enable = true;
+      theme = "helios";
+    };
  };

+  locale.ukrainian.enable = true;
+  opentabletdriver.enable = false;
+  qmk-vial.enable = true;
  security.basic.enable = true;
-
-  system.stateVersion = "25.05";
+  virtual.libvirt.enable = false;

  swapDevices = [
    {
@ -32,8 +41,4 @@
      size = 8 * 1024; # eight gigs
    }
  ];
-
-  time.timeZone = "Europe/Kyiv";
-
-  # virtual.libvirt.enable = true;
 }
--- a/hosts/eldrid/nix/distributed-build.nix
+++ b/hosts/eldrid/nix/distributed-build.nix
--- a/hosts/eldrid/hardware/default.nix
+++ b/hosts/eldrid/hardware/default.nix
@ -1,8 +1,6 @@
 {
  imports = [
-    ./facter.nix
    ./laptop
-    ./vaapi/intel-media-driver.nix
  ];
  services = {
    logind = {
--- a/hosts/eldrid/hardware/facter.nix
+++ b/hosts/eldrid/hardware/facter.nix
@ -1,14 +0,0 @@
-{
-  config,
-  inputs,
-  ...
-}: let
-  inherit (inputs) mysecrets;
-  inherit (config.networking) hostName;
-in {
-  imports = with inputs; [
-    nixos-facter-modules.nixosModules.facter
-  ];
-  facter.reportPath = "${mysecrets}/facter/${hostName}.json";
-  systemd.network.wait-online.enable = false;
-}
--- a/hosts/eldrid/hardware/vaapi/intel-media-driver.nix
+++ b/hosts/eldrid/hardware/vaapi/intel-media-driver.nix
@ -1,7 +0,0 @@
-{pkgs, ...}: {
-  hardware.graphics.extraPackages = with pkgs; [
-    intel-compute-runtime
-    intel-media-driver
-    vpl-gpu-rt
-  ];
-}
--- a/hosts/eldrid/networking/default.nix
+++ b/hosts/eldrid/networking/default.nix
@ -1,9 +0,0 @@
-{
-  imports = [
-    ./network-manager.nix
-    ./host-name-id.nix
-  ];
-  networking = {
-    hosts = import ./hosts.nix;
-  };
-}
--- a/hosts/eldrid/networking/host-name-id.nix
+++ b/hosts/eldrid/networking/host-name-id.nix
@ -1,6 +0,0 @@
-{
-  networking = {
-    # hostId = "";
-    hostName = "eldrid";
-  };
-}
--- a/hosts/eldrid/networking/hosts.nix
+++ b/hosts/eldrid/networking/hosts.nix
@ -1,3 +0,0 @@
-{
-  "192.168.1.42" = ["dunamis"];
-}
--- a/hosts/eldrid/nix/common.nix
+++ b/hosts/eldrid/nix/common.nix
@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  nix = {
-    package = pkgs.lixPackageSets.latest.lix;
-    channel.enable = false;
-    daemonCPUSchedPolicy = "idle";
-    settings = {
-      experimental-features = ["nix-command" "flakes"];
-      builders-use-substitutes = true;
-    };
-  };
-}
--- a/hosts/eldrid/nix/default.nix
+++ b/hosts/eldrid/nix/default.nix
@ -1,7 +0,0 @@
-{
-  imports = [
-    ./common.nix
-    ./substituters.nix
-    ./distributed-build.nix
-  ];
-}
--- a/hosts/eldrid/nix/ssh-serve.nix
+++ b/hosts/eldrid/nix/ssh-serve.nix
@ -1,10 +0,0 @@
-{config, ...}: let
-  inherit (builtins) readFile;
-  inherit (config.users.users) user;
-in {
-  nix.sshServe = {
-    enable = true;
-    write = true;
-    keys = map (f: readFile f) user.openssh.authorizedKeys.keyFiles;
-  };
-}
--- a/hosts/eldrid/nix/substituters.nix
+++ b/hosts/eldrid/nix/substituters.nix
@ -1,16 +0,0 @@
-{
-  nix.settings = {
-    substituters = [
-      "https://cache.nixos.org/"
-      "https://chaotic-nyx.cachix.org/"
-      "https://cosmic.cachix.org/"
-      "https://nix-community.cachix.org/"
-    ];
-    trusted-public-keys = [
-      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-      "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
-      "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-}