From 09f84ab07bafac6aff93a4a0eaea1d57c9978c36 Mon Sep 17 00:00:00 2001
From: sajenim <its.jassy@pm.me>
Date: Tue, 18 Apr 2023 20:28:04 +0800
Subject: [PATCH] migrate wezterm + awesome to home-manager

---
 home-manager/home.nix   | 22 +++++++++++++++++++++-
 nixos/configuration.nix | 26 ++++++++++++--------------
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index af28e2e..d6f031d 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -18,7 +18,7 @@
     ./programs/nvim.nix
     ./programs/zsh.nix
     # Services
-    ./services/picom.nix
+    # ./services/picom.nix
   ];
 
   nixpkgs = {
@@ -38,6 +38,10 @@
       #     patches = [ ./change-hello-to-hi.patch ];
       #   });
       # })
+      (final: prev: {
+        awesome = inputs.nixpkgs-f2k.packages.${pkgs.system}.awesome-git;
+        wezterm = inputs.nixpkgs-f2k.packages.${pkgs.system}.wezterm-git;
+      })
     ];
     # Configure your nixpkgs instance
     config = {
@@ -63,10 +67,26 @@
       discord
       hilbish
       spotify
+      # nixpkgs-f2k
+      wezterm
+      # pkgs.unstable
       unstable.prismlauncher
     ];
   };
 
+  xsession = {
+    enable = true;
+    scriptPath = ".xsession-hm";
+    # Git version provided by nixpkgs-f2k
+    windowManager.awesome = {
+      enable = true;
+      luaModules = with pkgs.luaPackages; [
+        luarocks # it the package manager for Lua modules
+        luadbi-mysql # Database abstraction layer
+      ];
+    };
+  };
+
   # Setup user configuration
   xdg.configFile = {
     awesome =  { source = ../config/awesome;  recursive = true; };
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 94e367c..5ec5182 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -35,10 +35,6 @@
       #     patches = [ ./change-hello-to-hi.patch ];
       #   });
       # })
-      (final: prev: {
-        awesome = inputs.nixpkgs-f2k.packages.${pkgs.system}.awesome-git;
-        wezterm = inputs.nixpkgs-f2k.packages.${pkgs.system}.wezterm-git;
-      })
     ];
     # Configure your nixpkgs instance
     config = {
@@ -160,7 +156,7 @@
       blender freecad openscad
 
       # Misc
-      openrgb wezterm
+      openrgb
     ];
     
     # Completions for system packages
@@ -198,25 +194,27 @@
       # Configure display manager
       displayManager = {
         sddm.enable = true;
+        defaultSession = "plasma";
         # Setup dual monitors
         setupCommands = ''
           ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-A-0 --mode 1920x1080 --output DisplayPort-0 --mode 2560x1440 --right-of HDMI-A-0
         '';
       };
       
-      # Git version provided by nixpkgs-f2k
-      windowManager.awesome = {
-        enable = true;        
-        luaModules = with pkgs.luaPackages; [
-          luarocks # is the package manager for Lua modules
-          luadbi-mysql # Database abstraction layer
-        ];
+      desktopManager = {
+        plasma5.enable = true;
+        session = [{
+          name = "home-manager";
+          start = ''
+            ${pkgs.stdenv.shell} $HOME/.xsession-hm &
+            waitPID=$!
+          '';
+        }];
       };
-
-      desktopManager.plasma5.enable = true;
     };
   };
 
+
   # Install docker
   virtualisation.docker = {
     enable = true;