feat: niri, and so much more o.o

systems/goliath.nix

@@ -4,6 +4,7 @@ _: let
     lib,
     pkgs,
     tree,
+    inputs,
     ...
   }: let
     inherit (lib.lists) singleton;
@@ -45,7 +46,15 @@ _: let
         gaming
       ])
       ++ (with tree.nixos.environments; [
-        hyprland
+          #hyprland
+          niri
+      ]) ++ (with inputs.nixos-hardware.outputs.nixosModules; [
+        common-pc
+        common-pc-ssd
+        common-cpu-amd
+        common-cpu-amd-pstate
+        common-cpu-amd-zenpower
+        common-gpu-nvidia-nonprime
       ]);
 
     home-manager.users.kat.imports =
@@ -53,25 +62,25 @@ _: let
         graphical
       ])
       ++ (with tree.home.environments; [
-        hyprland
+          #hyprland
+          niri
       ]);
 
     networking.hostId = "c3b94e85";
 
-  home-manager.users.kat.wayland.windowManager.hyprland.settings = {
-      monitor = [
-    "DP-2, 3840x2160, 0x0, 1"
-    "HDMI-A-1, 1920x1080, auto-right, 1"
-      ];
-      env = [
-        "NVD_BACKEND,direct"
-        "ELECTRON_OZONE_PLATFORM_HINT,auto"
-        "LIBVA_DRIVER_NAME,nvidia"
-        "__GLX_VENDOR_LIBRARY_NAME,nvidia"
-        "NIXOS_OZONE_WL,1"
-        "__NV_DISABLE_EXPLICIT_SYNC,1"
-        "QT_QPA_PLATFORM,wayland;xcb"
-      ];
+    home-manager.users.kat.programs.niri.settings = {
+      outputs = {
+          "LG Electronics LG Ultra HD 0x0001AC91" = {
+            scale = 1.25;
+          };
+      };
+      environment = {
+        NVD_BACKEND = "direct";
+        ELECTRON_OZONE_PLATFORM_HINT = "auto";
+        LIBVA_DRIVER_NAME = "nvidia";
+        NIXOS_OZONE_WL = "1";
+        QT_QTA_PLATFORM = "wayland;xcb";
+      };
     };
 
       programs.ssh.extraConfig = ''

systems/goliath.nix.old

@@ -1,114 +0,0 @@
-_: let
-  hostConfig = {
-    config,
-    lib,
-    tree,
-    ...
-  }: let
-    inherit (lib.lists) singleton;
-    drives = {
-      root = {
-        raw = "/dev/disk/by-uuid/af144e7f-e35b-49e7-be90-ef7001cc2abd";
-        luks = "luks-af144e7f-e35b-49e7-be90-ef7001cc2abd";
-        result = {
-          device = "/dev/disk/by-uuid/cf7fc410-4e27-4797-8464-a409766928c1";
-          fsType = "ext4";
-        };
-      };
-      boot = rec {
-        raw = "/dev/disk/by-uuid/D0D8-F8BF";
-        result = {
-          device = raw;
-          fsType = "vfat";
-        };
-      };
-      swap = {
-        raw = "/dev/disk/by-uuid/111c4857-5d73-4e75-89c7-43be9b044ade";
-        luks = "luks-111c4857-5d73-4e75-89c7-43be9b044ade";
-        result = {
-          device = "/dev/disk/by-uuid/bebdb14c-4707-4e05-848f-5867764b7c27";
-        };
-      };
-    };
-  in {
-    imports =
-      (with tree.nixos.hardware; [
-        b550m-itx-ac
-      ])
-      ++ (with tree.nixos.profiles; [
-        graphical
-        wireless
-        gaming
-      ])
-      ++ (with tree.nixos.environments; [
-        kde
-      ]);
-
-    home-manager.users.kat.imports =
-      (with tree.home.profiles; [
-        graphical
-        devops
-      ])
-      ++ (with tree.home.environments; [
-        kde
-      ]);
-
-    boot = {
-      loader = {
-        grub = {
-          enableCryptodisk = true;
-        };
-      };
-      initrd = {
-        luks.devices = {
-          ${drives.swap.luks} = {
-            device = drives.swap.raw;
-            keyFile = "/crypto_keyfile.bin";
-          };
-          ${drives.root.luks}.device = drives.root.raw;
-        };
-        #
-        secrets = {
-          "/crypto_keyfile.bin" = null;
-        };
-        availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
-      };
-      kernelModules = ["nct6775"];
-      supportedFilesystems = ["ntfs"];
-    };
-
-    fileSystems = {
-      "/" = drives.root.result;
-      "/boot" = drives.boot.result;
-    };
-
-    swapDevices = singleton drives.swap.result;
-
-    services.openssh = {
-      hostKeys = [
-        {
-          bits = 4096;
-          path = "/var/lib/secrets/${config.networking.hostName}-osh-pk";
-          type = "rsa";
-        }
-        {
-          path = "/var/lib/secrets/${config.networking.hostName}-ed25519-osh-pk";
-          type = "ed25519";
-        }
-      ];
-      extraConfig = ''
-        HostCertificate /var/lib/secrets/${config.networking.hostName}-osh-cert
-        HostCertificate /var/lib/secrets/${config.networking.hostName}-osh-ed25519-cert
-      '';
-    };
-
-    system.stateVersion = "21.11";
-  };
-in {
-  arch = "x86_64";
-  ci.enable = false; # System currently not used
-  type = "NixOS";
-  modules = [
-    hostConfig
-  ];
-}

systems/koishi.nix

@@ -45,6 +45,7 @@ _: let
       ])
       ++ (with tree.nixos.profiles; [
         graphical
+        quiet-boot
         wireless
         laptop
           gaming
@@ -78,9 +79,6 @@ _: let
     swapDevices = [
         drives.swap.result
     ];
-    boot.loader = {
-      systemd-boot.enable = lib.mkForce false;
-    };
 
       home-manager.users.kat = {
         wayland.windowManager.hyprland.settings.monitor = [
@@ -88,7 +86,10 @@ _: let
         ];
       };
       boot = {
-        loader.grub.useOSProber = true;
+        loader = {
+          grub.useOSProber = true;
+          systemd-boot.enable = lib.mkForce false;
+        };
         extraModprobeConfig = "options snd_hda_intel power_save=0";
         extraModulePackages = [config.boot.kernelPackages.v4l2loopback.out];
       };