From 32ddceba8f7aa23c4383401c91ebd651cbce3144 Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Fri, 23 May 2025 09:58:38 +0200
Subject: [PATCH] kardorf: use i3 instead of hyprland

---
 homes/julian/features/i3/i3/config-kardorf | 4 ++--
 homes/julian/kardorf.nix                   | 4 ++--
 hosts/kardorf/default.nix                  | 8 ++++----
 hosts/kardorf/hardware-configuration.nix   | 7 ++++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/homes/julian/features/i3/i3/config-kardorf b/homes/julian/features/i3/i3/config-kardorf
index 13d19c4..1695710 100644
--- a/homes/julian/features/i3/i3/config-kardorf
+++ b/homes/julian/features/i3/i3/config-kardorf
@@ -142,8 +142,8 @@ bindsym $mod+Shift+9 move container to workspace number $ws9; workspace $ws9
 bindsym $mod+Shift+0 move container to workspace number $ws10; workspace $ws10
 
 # Monitor config
-set $monitor_left "DVI-D-0"
-set $monitor_right "DVI-D-1"
+set $monitor_left "DVI-D-1"
+set $monitor_right "DVI-D-2"
 
 workspace $ws1 output $monitor_left
 workspace $ws2 output $monitor_left
diff --git a/homes/julian/kardorf.nix b/homes/julian/kardorf.nix
index a4f5712..e3edef1 100644
--- a/homes/julian/kardorf.nix
+++ b/homes/julian/kardorf.nix
@@ -11,8 +11,8 @@
     ./features/yazi
     ./features/emacs
 
-    ./features/hyprland
-    # ./features/i3
+    # ./features/hyprland
+    ./features/i3
 
     ./features/suites/cli
     ./features/suites/desktop
diff --git a/hosts/kardorf/default.nix b/hosts/kardorf/default.nix
index 8bfb270..8133bfb 100644
--- a/hosts/kardorf/default.nix
+++ b/hosts/kardorf/default.nix
@@ -6,13 +6,14 @@
     ../common/users/julian
     ../common/users/wolfi
 
+    ../common/optional/xserver.nix
     ../common/optional/remote-builder.nix
     ../common/optional/boot-efi.nix
 
-    ../common/optional/greetd.nix
+    # ../common/optional/greetd.nix
 
-    # ../common/optional/gdm.nix
-    # ../common/optional/i3.nix
+    ../common/optional/gdm.nix
+    ../common/optional/i3.nix
 
     ../common/optional/openssh.nix
 
@@ -32,7 +33,6 @@
 
   programs.kdeconnect.enable = true;
 
-  # services.xserver.desktopManager.xfce.enable = true;
   services.desktopManager.plasma6.enable = true;
 
   # Enable CUPS to print documents.
diff --git a/hosts/kardorf/hardware-configuration.nix b/hosts/kardorf/hardware-configuration.nix
index 352dbef..d0a7a18 100644
--- a/hosts/kardorf/hardware-configuration.nix
+++ b/hosts/kardorf/hardware-configuration.nix
@@ -80,9 +80,10 @@
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470;
-  # hardware.nvidia.modesetting.enable = true; # produces errors, display manager fails to start
+  # Use latest version of driver
+  # hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470;
+  hardware.nvidia.modesetting.enable = true; # produces errors, display manager fails to start
 
-  # hardware.nvidia.nvidiaSettings = true;
+  hardware.nvidia.nvidiaSettings = true;
   hardware.nvidia.open = false;
 }