From b2a2bdbd8ad175b4b9877bc08b1019108d5b62f9 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Wed, 2 Oct 2024 18:31:47 +0200 Subject: [PATCH] hosts: use cosmic desktop --- hosts/main/default.nix | 15 ++++++++++++--- hosts/tablet.nix | 13 ++++++++++--- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/hosts/main/default.nix b/hosts/main/default.nix index d35b5bc..62aeacb 100644 --- a/hosts/main/default.nix +++ b/hosts/main/default.nix @@ -1,4 +1,9 @@ -{ inputs, pkgs, ... }: +{ + inputs, + pkgs, + self, + ... +}: { imports = [ @@ -7,8 +12,8 @@ ../../nix-os/nvidia.nix ../../nix-os/docker.nix ../../nix-os/razer.nix - ../../nix-os/desktopManagers/gnome.nix - ../../nix-os/displayManagers/gdm.nix + ../../nix-os/desktopManagers/cosmic.nix + ../../nix-os/displayManagers/cosmic-greeter.nix ../../nix-os/shell.nix ../../nix-os/virtualization.nix ../../nix-os/polkit/disable-shutdown.nix @@ -36,6 +41,10 @@ hplip ]; + nixpkgs.overlays = [ + self.overlays.cosmicPackages + ]; + # nixos-vscode-server module needs this programs.nix-ld.enable = true; services.vscode-server = { diff --git a/hosts/tablet.nix b/hosts/tablet.nix index a9f656a..faf4c2a 100644 --- a/hosts/tablet.nix +++ b/hosts/tablet.nix @@ -1,4 +1,7 @@ -{ config, lib, pkgs, ... }: +{ + self, + ... +}: { imports = [ @@ -11,8 +14,8 @@ ../nix-os/gnupg.nix ../nix-os/polkit/network.nix - ../nix-os/desktopManagers/gnome.nix - ../nix-os/displayManagers/gdm.nix + ../nix-os/desktopManagers/cosmic.nix + ../../nix-os/displayManagers/cosmic-greeter.nix ../nix-os/udev.nix ]; @@ -25,6 +28,10 @@ networking.firewall.enable = true; hardware.sensor.iio.enable = true; + nixpkgs.overlays = [ + self.overlays.cosmicPackages + ]; + networking.firewall.allowedTCPPortRanges = [ # KDE Connect rec { from = 1714; to = from + 50; }