From cafcdc89d7670960a213240edb4736821d0aac87 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Sun, 3 Mar 2024 02:58:06 +0100
Subject: [PATCH 1/4] base: remove unneeded discord override

---
 base/gui-programs.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/base/gui-programs.nix b/base/gui-programs.nix
index 31ee485..9a24bbd 100644
--- a/base/gui-programs.nix
+++ b/base/gui-programs.nix
@@ -53,6 +53,7 @@ in {
         (pkgs)
         chrysalis
         evince
+        discord
         feh
         firefox
         ffmpeg
@@ -72,8 +73,6 @@ in {
       inherit (pkgs.gnome) nautilus;
 
       inherit (pkgs.libsForQt5) okular;
-
-      discord = pkgs.discord.override {nss = pkgs.nss_latest;};
     };
 
     networking.networkmanager = {

From 524e5759755f6a508f821552546768cfd6c1977d Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Sun, 3 Mar 2024 02:58:38 +0100
Subject: [PATCH 2/4] base: remove a few programs from list

---
 base/gui-programs.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/base/gui-programs.nix b/base/gui-programs.nix
index 9a24bbd..9ca0aa5 100644
--- a/base/gui-programs.nix
+++ b/base/gui-programs.nix
@@ -51,8 +51,6 @@ in {
     environment.systemPackages = builtins.attrValues {
       inherit
         (pkgs)
-        chrysalis
-        evince
         discord
         feh
         firefox
@@ -70,8 +68,6 @@ in {
         zathura
         ;
 
-      inherit (pkgs.gnome) nautilus;
-
       inherit (pkgs.libsForQt5) okular;
     };
 

From 69674b104ef81b063254fe915efee478e24e445f Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Sun, 3 Mar 2024 03:02:09 +0100
Subject: [PATCH 3/4] base: remove firefox

it's installed from home-manager anyway
---
 base/gui-programs.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/base/gui-programs.nix b/base/gui-programs.nix
index 9ca0aa5..6c4c656 100644
--- a/base/gui-programs.nix
+++ b/base/gui-programs.nix
@@ -53,7 +53,6 @@ in {
         (pkgs)
         discord
         feh
-        firefox
         ffmpeg
         gimp-with-plugins
         imagemagick

From 2b77681552f07ce405c5845001198e7801158c09 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Sun, 3 Mar 2024 03:03:03 +0100
Subject: [PATCH 4/4] home: don't enable i3 by default

---
 base/gui-programs.nix | 1 -
 home/x/i3.nix         | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/base/gui-programs.nix b/base/gui-programs.nix
index 6c4c656..76e90f6 100644
--- a/base/gui-programs.nix
+++ b/base/gui-programs.nix
@@ -34,7 +34,6 @@ in {
           if config.my.gui.isNvidia
           then ["nvidia"]
           else options.services.xserver.videoDrivers.default;
-        windowManager.i3.enable = true;
         layout = "fr";
         xkbVariant = "us";
         libinput = {
diff --git a/home/x/i3.nix b/home/x/i3.nix
index 665a237..0fefa09 100644
--- a/home/x/i3.nix
+++ b/home/x/i3.nix
@@ -6,11 +6,12 @@
 }: let
   inherit
     (lib)
+    mkEnableOption
     mkIf
     mkOptionDefault
     ;
 
-  isEnabled = config.my.home.x.enable;
+  isEnabled = config.my.home.x.i3.enable;
 
   myTerminal =
     # FIXME: fix when terminal is setup in home
@@ -26,6 +27,10 @@
 
   i3Theme = config.my.theme.i3Theme;
 in {
+  options.my.home.x.i3 = {
+    enable = mkEnableOption "i3wm configuration";
+  };
+
   config = mkIf isEnabled {
     my.home = {
       flameshot.enable = true;