Replace unstable pop-shell with material-shell

kachick · Sep 18, 2024 · c8949a8 · c8949a8
1 parent 637f5a6
commit c8949a8
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 55 deletions.
diff --git a/home-manager/gnome.nix b/home-manager/gnome.nix
@@ -28,7 +28,8 @@ in
           [
             appindicator
             # blur-my-shell # Don't use this extension, it often makes flicker. See GH-775
-            pop-shell
+            # pop-shell # Don't use this extension, often unstable and inactive maintained in these months
+            material-shell
             clipboard-history
             kimpanel
             removable-drive-menu
@@ -146,12 +147,12 @@ in
       };
 
       "org/gnome/settings-daemon/plugins/media-keys" = {
-        # control-center = [ "<Super>comma" ]; # I set this because of inspired by vscode, but disable to avoid conflict of pop-shell minimizerr
-        www = [ "<Super>w" ]; # Prefer w even through pop-shell recommends to Super+b
+        control-center = [ "<Super>comma" ];
+        www = [ "<Super>w" ]; # Prefer w even through
         home = [ ];
         email = [ ];
         # terminal = [ "<Super>t" ]; I don't know why this won't work. So use cosutom keybinding
-        search = [ "<Super>f" ]; # pop-shell sets to file manager, but replace to overview
+        search = [ "<Super>f" ];
         custom-keybindings = [
           "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
           "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/"
@@ -171,41 +172,28 @@ in
         command = "gtk-launch btop.desktop";
       };
 
-      # https://github.com/pop-os/shell/blob/master_noble/schemas/org.gnome.shell.extensions.pop-shell.gschema.xml
-      "org/gnome/shell/extensions/pop-shell" = {
-        tile-by-default = true;
+      activate-launcher = [ "<Alt>space" ];
 
-        # Keybindings: https://github.com/pop-os/shell/blob/master_noble/scripts/configure.sh
-
-        # https://www.reddit.com/r/pop_os/comments/mt5kgf/how_to_change_default_keybind_for/
-        activate-launcher = [ "<Alt>space" ];
-
-        active-hint = true;
-      };
-
-      "org/gnome/shell/extensions/clipboard-history" = {
-        history-size = 100;
-        toggle-menu = [ "<Super>v" ]; # default: ['<Super><Shift>v']
-        cache-only-favorites = true;
-      };
+      active-hint = true;
+    };
 
-      "org/gnome/shell/extensions/just-perfection" = {
-        startup-status = 0;
+    "org/gnome/shell/extensions/clipboard-history" = {
+      history-size = 100;
+      toggle-menu = [ "<Super>v" ]; # default: ['<Super><Shift>v']
+      cache-only-favorites = true;
+    };
 
-        clock-menu-position = 1;
-        clock-menu-position-offset = 15;
-      };
+    "org/gnome/shell/extensions/just-perfection" = {
+      startup-status = 0;
 
-      "org/gnome/mutter" = {
-        experimental-features = [ "scale-monitor-framebuffer" ];
+      clock-menu-position = 1;
+      clock-menu-position-offset = 15;
+    };
 
-        dynamic-workspaces = false;
+    "org/gnome/mutter" = {
+      experimental-features = [ "scale-monitor-framebuffer" ];
 
-        # Disable default Super runs GNOME overview with search
-        # https://ubuntuforums.org/showthread.php?t=2405352
-        # The feature is useful, but frustrated when using pop-shell shortcuts. Super modifier is mostly used now
-        overlay-key = "";
-      };
+      dynamic-workspaces = false;
 
       "org/gnome/mutter/keybindings" = {
         toggle-tiled-left = [ ];

diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix
@@ -193,17 +193,7 @@ in
     ])
     ++ (with pkgs.gnomeExtensions; [
       appindicator
-
-      # Should be changed from default CSS to another to avoid https://github.com/pop-os/shell/issues/132
-      # https://github.com/pop-os/shell/blob/cfa0c55e84b7ce339e5ce83832f76fee17e99d51/light.css#L20-L24
-      # Apple same color as nord(Nordic) https://github.com/EliverLara/Nordic/blob/5c53654fb6f3e0266ad8c481a099091e92f28274/gnome-shell/_colors.scss#L14-L15
-      (pop-shell.overrideAttrs (prev: {
-        preFixup =
-          prev.preFixup
-          + ''
-            echo '.pop-shell-search-element:select{ background: #8fbcbb !important; color: #fefefe !important; }' >> $out/share/gnome-shell/extensions/[email protected]/light.css
-          '';
-      }))
+      material-shell
       clipboard-history
       kimpanel
       just-perfection

diff --git a/nixos/desktop/xremap.nix b/nixos/desktop/xremap.nix
@@ -33,17 +33,6 @@
           };
         }
       ];
-
-      # Disabled while using Alt-Space for pop-shell launcher
-      # Keymap for key combo rebinds
-      # keymap = [
-      #   {
-      #     name = "Gnome lancher";
-      #     remap = {
-      #       "Alt-Space" = "LEFTMETA";
-      #     };
-      #   }
-      # ];
     };
   };
 }