From cfdb81ffdc26e6a53c0caad57290ebbac0f4c1e6 Mon Sep 17 00:00:00 2001
From: "Alexandre Cavalheiro S. Tiago da Silva" <contact@thewizard.link>
Date: Thu, 19 Sep 2024 00:50:56 -0300
Subject: [PATCH 1/3] fix(nixos): move specific packages to desktop

---
 modules/nixos/packages.nix |  7 -------
 specific/desktop/nixos.nix | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/modules/nixos/packages.nix b/modules/nixos/packages.nix
index 90ff3c1..7e07012 100644
--- a/modules/nixos/packages.nix
+++ b/modules/nixos/packages.nix
@@ -50,7 +50,6 @@
     ## Tools
     # Utilities
     bat
-    btrfs-progs
     duf
     fuseiso
     lm_sensors
@@ -98,11 +97,5 @@
     ## Libraries
     libsForQt5.qt5.qtgraphicaleffects
     libsForQt5.qt5.qtquickcontrols2
-    pkgsi686Linux.gperftools # Needed for TF2 rn :(
-
-    ## Hardware specific
-    openrazer-daemon # Razor products back-end
-    polychromatic # and it's front-end
-    vial
   ];
 }
diff --git a/specific/desktop/nixos.nix b/specific/desktop/nixos.nix
index 2514b97..473d6ca 100644
--- a/specific/desktop/nixos.nix
+++ b/specific/desktop/nixos.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
   imports = [
@@ -138,4 +138,18 @@
 
   # Enable WOL on my ethernet interface.
   networking.interfaces.enp5s0.wakeOnLan.enable = true;
+
+  #
+  # PACKAGES #
+  #
+  environment.systemPackages = with pkgs; [
+    ## Tools
+    # Utilities
+    btrfs-progs
+
+    ## Hardware specific
+    openrazer-daemon # Razor products back-end
+    polychromatic # and it's front-end
+    vial
+  ];
 }

From 96b14257362f2308be235a4482345400456ea5ca Mon Sep 17 00:00:00 2001
From: "Alexandre Cavalheiro S. Tiago da Silva" <contact@thewizard.link>
Date: Thu, 19 Sep 2024 00:51:17 -0300
Subject: [PATCH 2/3] fix(home-manager): move specific packages to laptop

---
 modules/home-manager/packages.nix |  1 -
 specific/laptop/home-manager.nix  | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/home-manager/packages.nix b/modules/home-manager/packages.nix
index e00283e..7b6c950 100644
--- a/modules/home-manager/packages.nix
+++ b/modules/home-manager/packages.nix
@@ -17,7 +17,6 @@
 
     ## Tools
     # Utilities
-    brightnessctl
     fastfetch
     firefox
     pavucontrol
diff --git a/specific/laptop/home-manager.nix b/specific/laptop/home-manager.nix
index 9f00157..1fbdbe1 100644
--- a/specific/laptop/home-manager.nix
+++ b/specific/laptop/home-manager.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
   #
@@ -53,6 +53,20 @@
     };
   };
 
+  #
+  # PACKAGES #
+  #
+
+  home.packages = with pkgs; [
+    ## Tools
+    # Utilities
+    brightnessctl
+  ];
+
+  #
+  # MODULES #
+  #
+
   # Add monitor configuration to hyprland
   modules.hyprland.extraConfig = # hyprlang
     ''

From 49ca0fa78bbc1e2e1be6531671621378c4485fe4 Mon Sep 17 00:00:00 2001
From: "Alexandre Cavalheiro S. Tiago da Silva" <contact@thewizard.link>
Date: Thu, 19 Sep 2024 00:51:34 -0300
Subject: [PATCH 3/3] fix(nixos): move allowUnfree to common to match
 home-manager

---
 modules/nixos/common.nix   | 3 +++
 modules/nixos/packages.nix | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix
index 2b03ec1..21aa1b6 100644
--- a/modules/nixos/common.nix
+++ b/modules/nixos/common.nix
@@ -27,4 +27,7 @@
   nix.settings.trusted-public-keys = [
     "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
   ];
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
 }
diff --git a/modules/nixos/packages.nix b/modules/nixos/packages.nix
index 7e07012..26e9f1f 100644
--- a/modules/nixos/packages.nix
+++ b/modules/nixos/packages.nix
@@ -1,9 +1,6 @@
 { pkgs, ... }:
 
 {
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-
   # Enable GPG.
   programs.gnupg.agent = {
     enable = true;