From 98b71eeddc60db3131ec77361f9308b3f24b56a4 Mon Sep 17 00:00:00 2001
From: Artur Manuel <balkenix@outlook.com>
Date: Wed, 16 Oct 2024 23:43:41 +0100
Subject: [PATCH] feat: more modules

---
 computers/shared/default.nix     |  3 +++
 computers/shared/git.nix         | 24 +++++++++++++++++++++++
 computers/shared/pipewire.nix    | 25 ++++++++++++++++++++++++
 computers/shared/qutebrowser.nix | 20 +++++++++++++++++++
 computers/toothless/default.nix  | 33 +++++++++++---------------------
 5 files changed, 83 insertions(+), 22 deletions(-)
 create mode 100644 computers/shared/git.nix
 create mode 100644 computers/shared/pipewire.nix
 create mode 100644 computers/shared/qutebrowser.nix

diff --git a/computers/shared/default.nix b/computers/shared/default.nix
index b6fa1c9..974e4e0 100644
--- a/computers/shared/default.nix
+++ b/computers/shared/default.nix
@@ -2,5 +2,8 @@
   imports = [
     ./fish.nix
     ./sddm.nix
+    ./git.nix
+    ./qutebrowser.nix
+    ./pipewire.nix
   ];
 }
diff --git a/computers/shared/git.nix b/computers/shared/git.nix
new file mode 100644
index 0000000..e0e03e4
--- /dev/null
+++ b/computers/shared/git.nix
@@ -0,0 +1,24 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.alqueva.git;
+in {
+  options.alqueva.git = {
+    enable = lib.mkEnableOption "git";
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.git = {
+      enable = true;
+      config = {
+        user = {
+          name = "Artur Manuel";
+          email = "balkenix@outlook.com";
+          signingKey = "~/.ssh/id_ed25519";
+        };
+      };
+    };
+  };
+}
diff --git a/computers/shared/pipewire.nix b/computers/shared/pipewire.nix
new file mode 100644
index 0000000..965e34a
--- /dev/null
+++ b/computers/shared/pipewire.nix
@@ -0,0 +1,25 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  cfg = config.alqueva.pipewire;
+in {
+  options.alqueva.pipewire = {
+    enable = lib.mkEnableOption "PipeWire";
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      pulse.enable = true;
+      wireplumber.enable = true;
+    };
+    environment.systemPackages = [
+      pkgs.pwvucontrol
+      pkgs.helvum
+    ];
+  };
+}
diff --git a/computers/shared/qutebrowser.nix b/computers/shared/qutebrowser.nix
new file mode 100644
index 0000000..bf94401
--- /dev/null
+++ b/computers/shared/qutebrowser.nix
@@ -0,0 +1,20 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: let
+  cfg = config.alqueva.qutebrowser;
+in {
+  options.alqueva.qutebrowser = {
+    enable = lib.mkEnableOption "qutebrowser";
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [
+      (pkgs.qutebrowser-qt5.override {
+        enableVulkan = true;
+      })
+    ];
+  };
+}
diff --git a/computers/toothless/default.nix b/computers/toothless/default.nix
index 95e65c0..eacb0d4 100644
--- a/computers/toothless/default.nix
+++ b/computers/toothless/default.nix
@@ -22,13 +22,6 @@
         notoPackage = pkgs.noto-fonts-lgc-plus;
       };
 
-      pipewire = {
-        enable = true;
-        alsa.enable = true;
-        pulse.enable = true;
-        wireplumber.enable = true;
-      };
-
       xserver.xkb = {
         layout = "us";
         options = "eurosign:e,ctrl:nocaps";
@@ -38,19 +31,9 @@
       openssh.enable = true;
     };
 
-    programs = {
-      git = {
-        enable = true;
-        config = {
-          user = {
-            name = "Artur Manuel";
-            email = "balkenix@outlook.com";
-            signingKey = "~/.ssh/id_ed25519";
-          };
-        };
-      };
-      neovim.enable = true;
-      chromium.enable = true;
+    hardware.graphics = {
+      enable = true;
+      enable32Bit = true;
     };
 
     environment.systemPackages = builtins.attrValues {
@@ -59,13 +42,19 @@
         nil
         statix
         deadnix
-        chromium
         alejandra
         wget
         ;
     };
 
-    alqueva.sddm.enable = true;
+    alqueva = {
+      sddm.enable = true;
+      git.enable = true;
+      qutebrowser.enable = true;
+      pipewire.enable = true;
+    };
+
+    programs.neovim.enable = true;
     networking.networkmanager.enable = true;
     time.timeZone = "Europe/London";
     i18n.defaultLocale = "en_GB.UTF-8";