From 5bc34bfcfe70dc5e7556a7780358fe1654789470 Mon Sep 17 00:00:00 2001
From: foglar <kohout.fi.2023@skola.ssps.cz>
Date: Sat, 28 Dec 2024 13:09:44 +0100
Subject: [PATCH] Window manager - added configuration in flake.nix

---
 flake.nix                       |  8 ++++++--
 kogami/configuration.nix        |  3 ---
 nixos/home/desktop/desktops.nix | 22 +++++++++++++++++-----
 nixos/system/system.nix         | 16 +++++++++++++---
 4 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index b2494e0..d1d9506 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,14 +62,18 @@
       username = "shinya"; # konsta or shinya (else defaulting to shinya or none)
       hostname = "kogami"; # kogami or ginoza
 
-      shell = "zsh"; # bash, zsh, none
+      shell = "zsh"; # bash, zsh
       terminal = "kitty"; # kitty, alacritty, gnome-terminal
       browser = "librewolf"; # firefox, librewolf, qutebrowser
       editor = "neovim"; # neovim, vscode
 
       # List all themes: $ nix build nixpkgs#base16-schemes && ls result/share/themes
-      theme = "catppuccin-mocha"; #tokyo-night-dark, one-dark
+      theme = "catppuccin-mocha"; # tokyo-night-dark, one-dark
       background = "aurora_borealis.png";
+
+      plasma = false;
+      gnome = false;
+      hyprland = true;
     };
 
     system = "x86_64-linux";
diff --git a/kogami/configuration.nix b/kogami/configuration.nix
index b7235f4..044a24e 100644
--- a/kogami/configuration.nix
+++ b/kogami/configuration.nix
@@ -36,9 +36,6 @@
   sys = {
     audio.enable = true;
     desktop = {
-      plasma.enable = false;
-      gnome.enable = false;
-      hyprland.enable = true;
       steamdeck.enable = true;
     };
     fonts.packages = true;
diff --git a/nixos/home/desktop/desktops.nix b/nixos/home/desktop/desktops.nix
index 0fb6f5a..b2a37c1 100644
--- a/nixos/home/desktop/desktops.nix
+++ b/nixos/home/desktop/desktops.nix
@@ -1,5 +1,8 @@
-{lib, ...}:
 {
+  lib,
+  userSettings,
+  ...
+}: {
   imports = [
     ./hyprland/hyprland.nix
     ./kde/kde.nix
@@ -7,8 +10,17 @@
   ];
 
   desktop = {
-    gnome.enable = lib.mkDefault false;
-    kde.enable = lib.mkDefault false;
-    hyprland.enable = lib.mkDefault true;
+    gnome.enable =
+      if userSettings.gnome
+      then lib.mkDefault true
+      else lib.mkDefault false;
+    kde.enable =
+      if userSettings.plasma
+      then lib.mkDefault true
+      else lib.mkDefault false;
+    hyprland.enable =
+      if userSettings.hyprland
+      then lib.mkDefault true
+      else lib.mkDefault false;
   };
-}
\ No newline at end of file
+}
diff --git a/nixos/system/system.nix b/nixos/system/system.nix
index 7a2583a..c03afd9 100644
--- a/nixos/system/system.nix
+++ b/nixos/system/system.nix
@@ -1,6 +1,7 @@
 {
   lib,
   config,
+  userSettings,
   ...
 }: {
   imports = [
@@ -21,9 +22,18 @@
   sys = {
     audio.enable = lib.mkDefault true;
     desktop = {
-      plasma.enable = lib.mkDefault true;
-      gnome.enable = lib.mkDefault false;
-      hyprland.enable = lib.mkDefault true;
+      plasma.enable =
+        if userSettings.plasma == true
+        then lib.mkDefault true
+        else lib.mkDefault false;
+      gnome.enable =
+        if userSettings.gnome == true
+        then lib.mkDefault true
+        else lib.mkDefault false;
+      hyprland.enable =
+        if userSettings.hyprland == true
+        then lib.mkDefault true
+        else lib.mkDefault false;
     };
     fonts.packages = lib.mkDefault true;
     locales.enable = lib.mkDefault true;