diff --git a/modules/home-manager/packages.nix b/modules/home-manager/packages.nix index 7b6c950..e00283e 100644 --- a/modules/home-manager/packages.nix +++ b/modules/home-manager/packages.nix @@ -17,6 +17,7 @@ ## Tools # Utilities + brightnessctl fastfetch firefox pavucontrol diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix index 21aa1b6..2b03ec1 100644 --- a/modules/nixos/common.nix +++ b/modules/nixos/common.nix @@ -27,7 +27,4 @@ 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 26e9f1f..90ff3c1 100644 --- a/modules/nixos/packages.nix +++ b/modules/nixos/packages.nix @@ -1,6 +1,9 @@ { pkgs, ... }: { + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + # Enable GPG. programs.gnupg.agent = { enable = true; @@ -47,6 +50,7 @@ ## Tools # Utilities bat + btrfs-progs duf fuseiso lm_sensors @@ -94,5 +98,11 @@ ## 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 473d6ca..2514b97 100644 --- a/specific/desktop/nixos.nix +++ b/specific/desktop/nixos.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { imports = [ @@ -138,18 +138,4 @@ # 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 1fbdbe1..9f00157 100644 --- a/specific/laptop/home-manager.nix +++ b/specific/laptop/home-manager.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { # @@ -53,20 +53,6 @@ }; }; - # - # PACKAGES # - # - - home.packages = with pkgs; [ - ## Tools - # Utilities - brightnessctl - ]; - - # - # MODULES # - # - # Add monitor configuration to hyprland modules.hyprland.extraConfig = # hyprlang ''