move flake packages to their dedicated package modules

This commit is contained in:
Seaswimmer 2024-11-20 11:40:42 -05:00
parent 0ee492277a
commit 92ed8a4d48
Signed by: cswimr
GPG key ID: 0EC431A8DA8F8087
3 changed files with 16 additions and 10 deletions

View file

@ -15,7 +15,7 @@
nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
catppuccin-vsc.url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz"; catppuccin-vsc.url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz";
}; };
outputs = { nixpkgs, home-manager, catppuccin, ... }@inputs: outputs = { nixpkgs, home-manager, ... }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = import nixpkgs { pkgs = import nixpkgs {
@ -38,7 +38,7 @@
./nixos/catppuccin.nix ./nixos/catppuccin.nix
./nixos/configuration.nix ./nixos/configuration.nix
./nixos/development.nix ./nixos/development.nix
./nixos/environment.nix #./nixos/environment.nix
./nixos/gaming.nix ./nixos/gaming.nix
./nixos/git.nix ./nixos/git.nix
./nixos/gui-pkgs.nix ./nixos/gui-pkgs.nix
@ -63,7 +63,7 @@
} }
# Catppuccin theme # Catppuccin theme
catppuccin.nixosModules.catppuccin inputs.catppuccin.nixosModules.catppuccin
{ {
catppuccin.enable = true; catppuccin.enable = true;
catppuccin.flavor = "mocha"; catppuccin.flavor = "mocha";
@ -88,7 +88,7 @@
imports = [ imports = [
./home-manager/cswimr.nix ./home-manager/cswimr.nix
./home-manager/vscode.nix ./home-manager/vscode.nix
catppuccin.homeManagerModules.catppuccin inputs.catppuccin.homeManagerModules.catppuccin
{ {
catppuccin.enable = true; catppuccin.enable = true;
catppuccin.flavor = "mocha"; catppuccin.flavor = "mocha";

View file

@ -1,4 +1,4 @@
{ pkgs, lib, ... }: { pkgs, inputs, system, lib, ... }:
let let
kdePackages = with pkgs.kdePackages; [ plasma-browser-integration ]; kdePackages = with pkgs.kdePackages; [ plasma-browser-integration ];
packages = with pkgs; [ packages = with pkgs; [
@ -8,11 +8,13 @@ let
ytmdesktop ytmdesktop
ktailctl ktailctl
wl-clipboard wl-clipboard
# we install xdg-desktop-portal-gtx so theming works from kde # we install xdg-desktop-portal-gtk so GTK theming works in KDE Plasma
xdg-desktop-portal-gtk xdg-desktop-portal-gtk
]; ];
flakePackages = with inputs; [ zen-browser.packages.${system}.specific ];
in { in {
environment.systemPackages = lib.lists.unique (kdePackages ++ packages); environment.systemPackages =
lib.lists.unique (kdePackages ++ packages ++ flakePackages);
programs.partition-manager.enable = true; programs.partition-manager.enable = true;

View file

@ -1,7 +1,8 @@
{ pkgs, ... }: { { pkgs, lib, inputs, system, ... }:
# List packages installed in system profile. To search, run: let
# List of packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ packages = with pkgs; [
wget wget
curl curl
git git
@ -50,6 +51,9 @@
nodejs nodejs
corepack corepack
]; ];
flakePackages = with inputs; [ compose2nix.packages.${system}.default ];
in {
environment.systemPackages = lib.lists.unique (packages ++ flakePackages);
# install docker # install docker
virtualisation.docker = { enable = true; }; virtualisation.docker = { enable = true; };