fit

modules/home/desktop/hyprland/default.nix

@@ -221,7 +221,6 @@ in {
           "$mod, Return, exec, $terminal"
           "$mod, Space, exec, $dlauncher"
           "$modShift, Space, exec, $launcher"
-          "$mod, Escape, exec, hyprctl switchxkblayout all next"
           "$modCtrl, Q, killactive"
           "$modCtrl, M, fullscreen"
           "$modCtrl, G, togglefloating"
@@ -345,6 +344,7 @@ in {
         #   "$modShift, period, resizeactive, 0 10"
         # ];
         bindl = [
+          "$mod, Escape, exec, hyprctl switchxkblayout all next"
           ", switch:on:Lid Switch, exec, hyprctl keyword monitor 'eDP-1, disable'"
           ", switch:off:Lid Switch, exec, hyprctl keyword monitor 'eDP-1, preferred, 1920x0, 1.2'"
           ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"

modules/home/programs/shell/fish.nix

@@ -33,7 +33,7 @@ in {
         enable = true;
         shellAliases = {
           cd = "z";
-          cat = "bat";
+          # cat = "bat";
           la = "ls -a";
           l = "ls -la";
         };

modules/nixos/desktop/cosmic.nix

@@ -0,0 +1,37 @@
+{
+  config,
+  inputs,
+  pkgs,
+  lib,
+  ...
+}: let
+  cfg = config.desktop.cosmic;
+in {
+  imports = with inputs; [
+    ./common/pipewire.nix
+    nixos-cosmic.nixosModules.default
+  ];
+  options = {
+    desktop.cosmic.enable =
+      lib.mkEnableOption "enable cosmic desktop";
+  };
+  config = lib.mkIf cfg.enable {
+    nix.settings = {
+      substituters = ["https://cosmic.cachix.org/"];
+      trusted-public-keys = ["cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="];
+    };
+    services.desktopManager.cosmic.enable = true;
+    services.displayManager.cosmic-greeter.enable = true;
+    xdg.portal = {
+      enable = true;
+      extraPortals = with pkgs; [
+        xdg-desktop-portal-cosmic
+        xdg-desktop-portal-gtk
+      ];
+      config.common.default = [
+        "cosmic"
+        "gtk"
+      ];
+    };
+  };
+}

modules/nixos/desktop/default.nix

@@ -1,6 +1,7 @@
 {
   imports = [
     ./niri.nix
+    ./cosmic.nix
     ./plasma.nix
     ./hyprland.nix
   ];