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/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 90ff3c1..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; @@ -50,7 +47,6 @@ ## Tools # Utilities bat - btrfs-progs duf fuseiso lm_sensors @@ -98,11 +94,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 + ]; } 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 ''