Merge branch 'zenix/hm-cosmic' into nixbook/cosmic

nixos/default.nix

@@ -45,12 +45,6 @@ in {
       }
     ];
   };
-  networking.hosts = {
-    "100.65.29.110" = ["zenix"];
-    "100.106.241.122" = ["alpine" "tristans.cloud"];
-    "100.71.130.111" = ["fcs-tristan-nixbook"];
-    "100.69.60.83" = ["google-pixel-8"];
-  };
 
   time.timeZone = lib.mkDefault "Europe/London";
 
@@ -59,7 +53,10 @@ in {
     useXkbConfig = true;
   };
 
-  services.avahi.enable = true;
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+  };
 
   i18n.defaultLocale = lib.mkDefault "en_GB.UTF-8";
 

nixos/programs/cosmic.nix

@@ -1,4 +1,8 @@
-{inputs, ...}: {
+{
+  inputs,
+  config,
+  ...
+}: {
   imports = [
     inputs.nixos-cosmic.nixosModules.default
   ];
@@ -8,4 +12,9 @@
   };
   services.desktopManager.cosmic.enable = true;
   services.displayManager.cosmic-greeter.enable = true;
+  services.system76-scheduler.enable = true;
+  home-manager.users.${config.user}.imports = [
+    (import "${inputs.home-manager-cosmic}/modules/programs/cosmic/.")
+    ../../home/desktop/cosmic/.
+  ];
 }

nixos/programs/pipewire.nix

@@ -1,4 +1,4 @@
-{
+{pkgs, ...}: {
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {

nixos/workstation.nix

@@ -13,15 +13,10 @@
 
   hardware.opentabletdriver.enable = true;
 
-  programs.nm-applet.enable = true;
-
-  services.printing.enable = true;
-
   services.dbus = {
     enable = true;
     packages = [pkgs.gcr];
   };
-  programs.light.enable = true;
   programs.dconf.enable = true;
 
   hardware.bluetooth.enable = true;