From 9c3f5257bd13007fb67e95d4c12d8d1051e2aa90 Mon Sep 17 00:00:00 2001
From: Sakooooo <78461130+Sakooooo@users.noreply.github.com>
Date: Sun, 9 Jul 2023 01:03:46 +0300
Subject: [PATCH] har har har har har har har har har har

---
 modules/desktop/apps/default.nix                 |  2 +-
 modules/desktop/apps/keepassxc/default.nix       | 16 ++++++++++++++++
 modules/desktop/browsers/default.nix             |  6 ++++++
 modules/desktop/browsers/firefox/default.nix     | 16 ++++++++++++++++
 .../{apps => browsers}/qutebrowser/default.nix   |  4 ++--
 modules/desktop/bspwm/default.nix                |  1 +
 modules/desktop/default.nix                      |  1 +
 7 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 modules/desktop/apps/keepassxc/default.nix
 create mode 100644 modules/desktop/browsers/default.nix
 create mode 100644 modules/desktop/browsers/firefox/default.nix
 rename modules/desktop/{apps => browsers}/qutebrowser/default.nix (85%)

diff --git a/modules/desktop/apps/default.nix b/modules/desktop/apps/default.nix
index 6a80c727..45540746 100644
--- a/modules/desktop/apps/default.nix
+++ b/modules/desktop/apps/default.nix
@@ -1,5 +1,5 @@
 {
   imports = [
-    ./qutebrowser    
+    ./keepassxc
   ];
 }
diff --git a/modules/desktop/apps/keepassxc/default.nix b/modules/desktop/apps/keepassxc/default.nix
new file mode 100644
index 00000000..286c9c70
--- /dev/null
+++ b/modules/desktop/apps/keepassxc/default.nix
@@ -0,0 +1,16 @@
+{ outputs, options, config, lib, pkgs, ...}:
+with lib;
+let
+  cfg = config.modules.desktop.apps.keepassxc;
+in
+{
+  options.modules.desktop.apps.keepassxc = {
+    enable = mkEnableOption false;
+  };
+
+  config = mkIf cfg.enable {
+    users.users.sako.packages = with pkgs; [
+      keepassxc
+    ];
+  };
+}
diff --git a/modules/desktop/browsers/default.nix b/modules/desktop/browsers/default.nix
new file mode 100644
index 00000000..77a08ee3
--- /dev/null
+++ b/modules/desktop/browsers/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./qutebrowser    
+    ./firefox
+  ];
+}
diff --git a/modules/desktop/browsers/firefox/default.nix b/modules/desktop/browsers/firefox/default.nix
new file mode 100644
index 00000000..3325f73f
--- /dev/null
+++ b/modules/desktop/browsers/firefox/default.nix
@@ -0,0 +1,16 @@
+{ outputs, options, config, lib, pkgs, ...}:
+with lib;
+let
+  cfg = config.modules.desktop.browsers.firefox;
+in
+{
+  options.modules.browsers.firefox = {
+    enable = mkEnableOption false;
+  };
+
+  config = mkIf cfg.enable {
+    users.users.sako.packages = with pkgs; [
+      firefox
+    ];
+  };
+}
diff --git a/modules/desktop/apps/qutebrowser/default.nix b/modules/desktop/browsers/qutebrowser/default.nix
similarity index 85%
rename from modules/desktop/apps/qutebrowser/default.nix
rename to modules/desktop/browsers/qutebrowser/default.nix
index f533f3e9..df0531e4 100644
--- a/modules/desktop/apps/qutebrowser/default.nix
+++ b/modules/desktop/browsers/qutebrowser/default.nix
@@ -1,10 +1,10 @@
 { options, config, lib, pkgs, ...}:
 with lib;
 let
-  cfg = config.modules.desktop.apps.qutebrowser;
+  cfg = config.modules.desktop.browsers.qutebrowser;
 in
 {
-  options.modules.desktop.apps.qutebrowser = {
+  options.modules.desktop.browsers.qutebrowser = {
     enable = mkEnableOption false;
   };
 
diff --git a/modules/desktop/bspwm/default.nix b/modules/desktop/bspwm/default.nix
index c0431e66..988de5c2 100644
--- a/modules/desktop/bspwm/default.nix
+++ b/modules/desktop/bspwm/default.nix
@@ -12,6 +12,7 @@ in
     services.xserver = {
       enable = true;
       windowManager.bspwm.enable = true;
+      libinput.enable = true;
     };  
     users.users.sako.packages = with pkgs; [
       polybar
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 2defac94..9959bf56 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -2,6 +2,7 @@
   imports = [
     ./kitty
     ./bspwm
+    ./browsers
     ./apps
   ];
 }