diff --git a/flake.nix b/flake.nix index df9f62d..9fe5330 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; catppuccin-vsc.url = "https://flakehub.com/f/catppuccin/vscode/*.tar.gz"; }; - outputs = { nixpkgs, home-manager, catppuccin, ... }@inputs: + outputs = { nixpkgs, home-manager, ... }@inputs: let system = "x86_64-linux"; pkgs = import nixpkgs { @@ -38,7 +38,7 @@ ./nixos/catppuccin.nix ./nixos/configuration.nix ./nixos/development.nix - ./nixos/environment.nix + #./nixos/environment.nix ./nixos/gaming.nix ./nixos/git.nix ./nixos/gui-pkgs.nix @@ -63,7 +63,7 @@ } # Catppuccin theme - catppuccin.nixosModules.catppuccin + inputs.catppuccin.nixosModules.catppuccin { catppuccin.enable = true; catppuccin.flavor = "mocha"; @@ -88,7 +88,7 @@ imports = [ ./home-manager/cswimr.nix ./home-manager/vscode.nix - catppuccin.homeManagerModules.catppuccin + inputs.catppuccin.homeManagerModules.catppuccin { catppuccin.enable = true; catppuccin.flavor = "mocha"; diff --git a/nixos/gui-pkgs.nix b/nixos/gui-pkgs.nix index a508549..8873d88 100644 --- a/nixos/gui-pkgs.nix +++ b/nixos/gui-pkgs.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, inputs, system, lib, ... }: let kdePackages = with pkgs.kdePackages; [ plasma-browser-integration ]; packages = with pkgs; [ @@ -8,11 +8,13 @@ let ytmdesktop ktailctl 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 ]; + flakePackages = with inputs; [ zen-browser.packages.${system}.specific ]; in { - environment.systemPackages = lib.lists.unique (kdePackages ++ packages); + environment.systemPackages = + lib.lists.unique (kdePackages ++ packages ++ flakePackages); programs.partition-manager.enable = true; diff --git a/nixos/pkg.nix b/nixos/pkg.nix index 539cc38..bc462be 100755 --- a/nixos/pkg.nix +++ b/nixos/pkg.nix @@ -1,7 +1,8 @@ -{ pkgs, ... }: { - # List packages installed in system profile. To search, run: +{ pkgs, lib, inputs, system, ... }: +let + # List of packages installed in system profile. To search, run: # $ nix search wget - environment.systemPackages = with pkgs; [ + packages = with pkgs; [ wget curl git @@ -50,6 +51,9 @@ nodejs corepack ]; + flakePackages = with inputs; [ compose2nix.packages.${system}.default ]; +in { + environment.systemPackages = lib.lists.unique (packages ++ flakePackages); # install docker virtualisation.docker = { enable = true; };