diff --git a/flake.nix b/flake.nix index 00d2520..d42c145 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,8 @@ url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs-stable-nixos"; }; + + nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; }; outputs = diff --git a/nodes/hosts/common/configuration.nix b/nodes/hosts/common/configuration.nix index 4be269d..08c0a1d 100644 --- a/nodes/hosts/common/configuration.nix +++ b/nodes/hosts/common/configuration.nix @@ -1,14 +1,17 @@ -{ pkgs, ... }: +{ pkgs, inputs, ... }: { imports = [ + inputs.nix-flatpak.nixosModules.nix-flatpak ./programs/firefox.nix ./programs/general.nix ./programs/git.nix ./programs/kde.nix ./programs/steam.nix ./scripts/upgrade-diff.nix + ./services/cups.nix ./services/desktopmanager.nix ./services/displaymanager.nix + ./services/nix-flatpak.nix ./services/sound.nix ./system/bluetooth.nix ./system/locale.nix diff --git a/nodes/hosts/common/services/cups.nix b/nodes/hosts/common/services/cups.nix new file mode 100644 index 0000000..eec721a --- /dev/null +++ b/nodes/hosts/common/services/cups.nix @@ -0,0 +1,14 @@ +{ pkgs, ...}: { + # Enable CUPS to print documents. + services.printing = { + enable = true; + drivers = [ pkgs.cnijfilter2 ]; + }; + + # Automatic discovery of printers. + services.avahi = { + enable = true; + nssmdns4 = true; + openFirewall = true; + }; +} diff --git a/nodes/hosts/common/services/nix-flatpak.nix b/nodes/hosts/common/services/nix-flatpak.nix new file mode 100644 index 0000000..76d93e4 --- /dev/null +++ b/nodes/hosts/common/services/nix-flatpak.nix @@ -0,0 +1,6 @@ +{ pkgs, ...}: { + services.flatpak = { + enable = true; + update.onActivation = true; + }; +}