bad commit

2 files changed, 22 insertions, 4 deletions

diff --git a/hosts/laptop/cfg.nix b/hosts/laptop/cfg.nix
index f4befe8..a6347f4 100644
--- a/hosts/laptop/cfg.nix
+++ b/hosts/laptop/cfg.nix
@@ -2,17 +2,21 @@
   config,
   lib,
   pkgs,
+  inputs,
   ...
 }: {
   imports = [
+    inputs.hardware.nixosModules.common-cpu-intel
+    inputs.hardware.nixosModules.common-gpu-intel
     ../../profiles/core.nix
     ../../profiles/user.nix
     ../../profiles/ssh.nix
     ../../profiles/graphical.nix
     ../../mixins/tailscale.nix
     ../../mixins/cli.nix
-    # ../../mixins/greet.nix
+    ../../mixins/greet.nix
     ../../mixins/hyprland.nix
+    ../../mixins/sway.nix
   ];
 
   config = {
@@ -32,7 +36,6 @@
       };
       kernelModules = ["kvm-intel"];
       kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
-      # extraModulePackages = [ pkgs.linuxPackages_latest.rtw88-firmware ];
       kernelParams = [
         "console=ttyS0"
         "init_on_free=1"
@@ -60,7 +63,7 @@
     fileSystems."/" = {
       device = "none";
       fsType = "tmpfs";
-      options = ["noexec" "defaults" "size=2G" "mode=755"];
+      options = ["defaults" "size=2G" "mode=755"];
     };
 
     fileSystems."/boot" = {
@@ -87,5 +90,13 @@
     hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
     # greeter.initialSession = "env WLR_RENDERER=pixman sh -c ${pkgs.sway}/bin/sway";
+    greeter.initialSession = "${pkgs.fish}/bin/fish";
+
+    hardware.opengl = {
+      enable = true;
+      extraPackages = with pkgs; [ rocm-opencl-icd rocm-opencl-runtime ];
+      driSupport = true;
+      driSupport32Bit = true;
+    };
   };
 }
diff --git a/hosts/vm/cfg.nix b/hosts/vm/cfg.nix
index 5ceba52..8c56336 100644
--- a/hosts/vm/cfg.nix
+++ b/hosts/vm/cfg.nix
@@ -81,6 +81,13 @@
       algorithm = "zstd";
     };
 
-    greeter.initialSession = "env WLR_RENDERER=pixman sh -c ${pkgs.sway}/bin/sway";
+    greeter.initialSession = "sh -c ${pkgs.sway}/bin/sway";
+
+    hardware.opengl = {
+      enable = true;
+      extraPackages = with pkgs; [ rocm-opencl-icd rocm-opencl-runtime ];
+      driSupport = true;
+      driSupport32Bit = true;
+    };
   };
 }