From 0154d6545684693bcbb48dfed0b62143ba3d2dfe Mon Sep 17 00:00:00 2001
From: Isshi0417 <isshi0417@gmail.com>
Date: Thu, 11 Jul 2024 11:23:46 +0900
Subject: [PATCH] Swap to AwesomeWM

---
 hosts/default/configuration.nix               | 29 +++++++++++++------
 hosts/default/home.nix                        |  9 +++---
 .../{catppuccin.nix => catppuccin-mocha.nix}  |  6 ----
 modules/home-manager/hyprland.nix             |  9 ------
 modules/nixos/alienware/alienware.nix         |  1 +
 modules/nixos/alienware/awesomewm/default.nix | 11 +++++++
 6 files changed, 37 insertions(+), 28 deletions(-)
 rename modules/home-manager/{catppuccin.nix => catppuccin-mocha.nix} (84%)
 delete mode 100644 modules/home-manager/hyprland.nix
 create mode 100644 modules/nixos/alienware/awesomewm/default.nix

diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index 9fe18b3..c81c85f 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -68,19 +68,13 @@
   # Enable the X11 windowing system.
   services.xserver.enable = true;
 
-  # Enable Hyprland
-  nix.settings = {
-    substituters = ["https://hyprland.cachix.org"];
-    trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
-  };
-
-  programs.hyprland = {
+  services.displayManager.sddm = {
     enable = true;
-    xwayland.enable = true;
+    package = pkgs.kdePackages.sddm;
+    wayland.enable = true;
   };
 
   # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
   services.xserver.desktopManager.gnome.enable = true;
 
   # Configure keymap in X11
@@ -161,6 +155,23 @@
     flavor = "mocha";
   };
 
+  fonts = {
+    enableDefaultPackages = true;
+    packages = with pkgs; [
+      noto-fonts
+      nerdfonts
+      font-awesome
+    ];
+
+    fontconfig = {
+      defaultFonts = {
+        serif = [ "Hack Nerd Font" ];
+        sansSerif = [ "DejaVuSansM Nerd Font" ];
+        monospace = [ "JetBrainsMono Nerd Font" ];
+      };
+    };
+  };
+
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
diff --git a/hosts/default/home.nix b/hosts/default/home.nix
index 0786673..f3d9a0a 100644
--- a/hosts/default/home.nix
+++ b/hosts/default/home.nix
@@ -7,8 +7,7 @@
     ../../modules/home-manager/shell/zsh.nix
     ../../modules/home-manager/vscode.nix
     #../../modules/home-manager/themes/basic-gtk.nix
-    ../../modules/home-manager/hyprland.nix
-    ../../modules/home-manager/catppuccin.nix
+    ../../modules/home-manager/catppuccin-mocha.nix
   ];
 
   # Allow Unfree
@@ -36,7 +35,6 @@
     ferdium
     git
     gh
-    kitty
 
     # School
     libreoffice-fresh
@@ -56,11 +54,14 @@
     corefonts
     noto-fonts
     mullvad-vpn
-    easyeffects
     transmission_4-gtk
     imagemagick
   ];
 
+  programs.kitty.enable = true;
+
+  services.easyeffects.enable = true;
+
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
   # plain files is through 'home.file'.
   home.file = {
diff --git a/modules/home-manager/catppuccin.nix b/modules/home-manager/catppuccin-mocha.nix
similarity index 84%
rename from modules/home-manager/catppuccin.nix
rename to modules/home-manager/catppuccin-mocha.nix
index a81fa3b..90fe816 100644
--- a/modules/home-manager/catppuccin.nix
+++ b/modules/home-manager/catppuccin-mocha.nix
@@ -48,10 +48,4 @@
     qt.style.catppuccin.enable = true;
     qt.style.catppuccin.accent = "mocha";
     qt.style.catppuccin.apply = true;
-
-    services.mako.catppuccin.enable = true;
-    services.mako.catppuccin.flavor = "mocha";
-
-    wayland.windowManager.hyprland.catppuccin.enable = true;
-    wayland.windowManager.hyprland.catppuccin.flavor = "mocha";
 }
\ No newline at end of file
diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix
deleted file mode 100644
index b231616..0000000
--- a/modules/home-manager/hyprland.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-    wayland.windowManager.hyprland = {
-        enable = true;
-        xwayland.enable = true;
-        systemd.enable = true;
-    };
-}
\ No newline at end of file
diff --git a/modules/nixos/alienware/alienware.nix b/modules/nixos/alienware/alienware.nix
index 2e8b5b4..f5aa17c 100644
--- a/modules/nixos/alienware/alienware.nix
+++ b/modules/nixos/alienware/alienware.nix
@@ -7,6 +7,7 @@
         ./hardware/ssd/ssd.nix
         ./gaming.nix
         ./nh.nix
+        ./awesomewm
     ];
 
     swapDevices = [{
diff --git a/modules/nixos/alienware/awesomewm/default.nix b/modules/nixos/alienware/awesomewm/default.nix
new file mode 100644
index 0000000..830c6e2
--- /dev/null
+++ b/modules/nixos/alienware/awesomewm/default.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+
+{
+    services.xserver.windowManager.awesome = {
+        enable = true;
+        luaModules = with pkgs.luaPackages; [
+            luarocks
+            luadbi-mysql
+        ];
+    };
+}
\ No newline at end of file