Merge branch 'main' into cosmic

nix-os/desktopManagers/cosmic.nix

@@ -0,0 +1,46 @@
+{pkgs, lib, ... }:
+
+let
+  nixos-cosmic = builtins.fetchGit {
+    url = "https://github.com/lilyinstarlight/nixos-cosmic.git";
+    # rev = "b61e7a0da2fa1d5f05d41e3db6386b2ac5f5079b";
+  };
+  cosmicPkgsMainDir = builtins.readDir "${nixos-cosmic}/pkgs";
+  cosmicPkgsDirs = builtins.filter (v: cosmicPkgsMainDir."${v}" == "directory") (builtins.attrNames cosmicPkgsMainDir);
+  cosmicPkgsOverlay = final: prev: builtins.listToAttrs (
+    builtins.map (v: {name = v; value = final.callPackage "${nixos-cosmic}/pkgs/${v}/package.nix" {};}) cosmicPkgsDirs
+  );
+in
+{
+  imports = [
+    "${nixos-cosmic}/nixos/cosmic/module.nix"
+  ];
+  config = {
+    services.xserver.desktopManager.cosmic.enable = true;
+    nixpkgs.overlays = [ cosmicPkgsOverlay ];
+  };
+  options = {
+    cosmic-applets = lib.mkOption {default = pkgs.cosmic-applets;};
+    cosmic-applibrary = lib.mkOption {default = pkgs.cosmic-applibrary;};
+    cosmic-bg = lib.mkOption {default = pkgs.cosmic-bg;};
+    cosmic-comp = lib.mkOption {default = pkgs.cosmic-comp;};
+    cosmic-design-demo = lib.mkOption {default = pkgs.cosmic-design;};
+    cosmic-edit = lib.mkOption {default = pkgs.cosmic-edit;};
+    cosmic-files = lib.mkOption {default = pkgs.cosmic-files;};
+    cosmic-icons = lib.mkOption {default = pkgs.cosmic-icons;};
+    cosmic-launcher = lib.mkOption {default = pkgs.cosmic-launcher;};
+    cosmic-notifications = lib.mkOption {default = pkgs.cosmic-notifications;};
+    cosmic-osd = lib.mkOption {default = pkgs.cosmic-osd;};
+    cosmic-panel = lib.mkOption {default = pkgs.cosmic-panel;};
+    cosmic-protocols = lib.mkOption {default = pkgs.cosmic-protocols;};
+    cosmic-randr = lib.mkOption {default = pkgs.cosmic-randr;};
+    cosmic-screenshot = lib.mkOption {default = pkgs.cosmic-screenshot;};
+    cosmic-session = lib.mkOption {default = pkgs.cosmic-session;};
+    cosmic-settings = lib.mkOption {default = pkgs.cosmic-settings;};
+    cosmic-settings-daemon = lib.mkOption {default = pkgs.cosmic-settings;};
+    cosmic-term = lib.mkOption {default = pkgs.cosmic-term;};
+    cosmic-workspaces-epoch = lib.mkOption {default = pkgs.cosmic-workspaces;};
+    wrapCosmicAppsHook = lib.mkOption {default = pkgs.wrapCosmicAppsHook;};
+    xdg-desktop-portal-cosmic = lib.mkOption {default = pkgs.xdg-desktop-portal-cosmic;};
+  };
+}

nix-os/desktopManagers/gnome.nix

@@ -0,0 +1,71 @@
+{pkgs, ... } @ moduleArgs:
+
+{
+  imports = [
+    ../unstable-packages.nix
+  ];
+  config = {
+    services.xserver.enable = true;
+    services.xserver.desktopManager.gnome.enable = true;
+
+    # environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+    programs.dconf.profiles.user.databases = [{
+      settings = import ../dconf-common.nix moduleArgs [
+        "org/gnome/desktop/background"
+        "org/gnome/desktop/interface"
+        "org/gnome/desktop/media-handling"
+        "org/gnome/desktop/peripherals/mouse"
+        "org/gnome/desktop/sound"
+        "org/gnome/mutter"
+        "org/gnome/SessionManager"
+        "org/gnome/settings-daemon/plugins/power"
+        "org/gnome/shell"
+        "org/gnome/shell/app-switcher"
+        "org/gnome/shell/extensions/color-picker"
+        "org/gnome/shell/extensions/pop-shell"
+        "org/gnome/shell/extensions/top-bar-organizer"
+        "org/gnome/shell/extensions/trayIconsReloaded"
+        "org/gnome/shell/extensions/vitals"
+        "org/gnome/shell/keybindings"
+        "org/gnome/desktop/default-applications/terminal"
+        "org/gnome/settings-daemon/plugins/media-keys"
+        "org/gnome/settings-daemon/plugins/media-keys/custom-keybinding/custom0"
+      ];
+    }];
+
+    environment.gnome.excludePackages = with pkgs; with pkgs.gnome; [
+      baobab
+      cheese
+      epiphany
+      evince
+      geary
+      gedit
+      gnome-characters
+      gnome-connections
+      gnome-console
+      gnome-disk-utility
+      gnome-font-viewer
+      gnome-logs
+      gnome-maps
+      gnome-text-editor
+      gnome-tour
+      seahorse
+      totem
+      yelp
+    ];
+
+    environment.systemPackages = with pkgs; [
+      gnomeExtensions.pop-shell
+      gnomeExtensions.vitals
+      gnomeExtensions.tray-icons-reloaded
+      gnomeExtensions.color-picker
+      gnomeExtensions.top-bar-organizer
+      # unstablePkgs.gnomeExtensions.translate-indicator
+      # translate-shell
+      pavucontrol
+      #FIXME: Apply the cursor theme also in GTK3 config
+      google-cursor
+    ];
+  };
+}

nix-os/desktopManagers/kde-plasma.nix

@@ -0,0 +1,16 @@
+{lib, config, pkgs, ...}:
+
+{
+  config = {
+    services.xserver.enable = true;
+    services.xserver.desktopManager.plasma5.enable = true;
+
+    # environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+    environment.systemPackages = with pkgs; [
+      libsForQt5.plasma-browser-integration
+      translate-shell
+      pavucontrol
+    ];
+  };
+}