diff --git a/flake.nix b/flake.nix index a51e253..4897648 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,6 @@ }; outputs = { - self, nixpkgs, home-manager, ... diff --git a/info.nix b/info.nix index 709d72f..9e13648 100644 --- a/info.nix +++ b/info.nix @@ -18,5 +18,10 @@ neo = "nix run github:fred-drake/neovim#"; }; + apps = pkgs: + with pkgs; [ + delfin + ]; + touchpadSupport = false; } diff --git a/modules/app.nix b/modules/app.nix index c842eda..fb8db9a 100644 --- a/modules/app.nix +++ b/modules/app.nix @@ -1,5 +1,5 @@ -{pkgs, ...}: { - environment.systemPackages = [ - pkgs.delfin - ]; +{pkgs, ...}: let + info = import ../info.nix; +in { + environment.systemPackages = info.apps pkgs; } diff --git a/modules/desktop/app.nix b/modules/desktop/app.nix new file mode 100644 index 0000000..1c8eac9 --- /dev/null +++ b/modules/desktop/app.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: let + info = import ../../info.nix; +in { + home.packages = info.apps pkgs; +} diff --git a/modules/desktop/misc.nix b/modules/desktop/misc.nix index db14211..89f116a 100644 --- a/modules/desktop/misc.nix +++ b/modules/desktop/misc.nix @@ -1,4 +1,4 @@ -{...}: { +{ imports = [ ../../pkgs/btop/default.nix ]; diff --git a/nixos/desktop/configuration.nix b/nixos/desktop/configuration.nix index 3c96d32..a6d2e71 100644 --- a/nixos/desktop/configuration.nix +++ b/nixos/desktop/configuration.nix @@ -10,7 +10,7 @@ ./hardware-configuration.nix ../../modules/system.nix ../../modules/display-manager.nix - ../../modules/app.nix + # ../../modules/app.nix ]; environment.systemPackages = with pkgs; [