Merge branch 'master' of github.com:mrjones2014/dotfiles

mrjones2014 · May 30, 2024 · 2799a01 · 2799a01
2 parents 44c75de + 8449f0f
commit 2799a01
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 62 deletions.
diff --git a/home-manager/home.nix b/home-manager/home.nix
@@ -62,7 +62,6 @@
     ./modules/arkenfox.nix
     ./shared.nix
     ./modules/_1password-shell.nix
-    ./modules/rofi.nix
     ./modules/espanso.nix
     ./modules/wezterm.nix
     ./modules/librewolf.nix

diff --git a/home-manager/modules/arkenfox.nix b/home-manager/modules/arkenfox.nix
@@ -1,5 +1,14 @@
 { inputs, isLinux, ... }: {
   imports = [ inputs.arkenfox.hmModules.default ];
+  # TODO this doesn't work
+  home.file.".local/share/gnome-shell/search-providers/firefox-search-provider.ini".text =
+    ''
+      [Shell Search Provider]
+      DesktopId=firefox.desktop
+      BusName=org.mozilla.Firefox.SearchProvider
+      ObjectPath=/org/mozilla/Firefox/SearchProvider
+      Version=2
+    '';
   programs.firefox = {
     enable = isLinux;
     arkenfox = {
@@ -15,6 +24,8 @@
         "browser.urlbar.suggest.pocket" = false;
         # always show bookmarks toolbar
         "browser.toolbars.bookmarks.visibility" = "always";
+        # GNOME search provider
+        "browser.gnome-search-provider.enabled" = true;
       };
       arkenfox = {
         enable = isLinux;

diff --git a/home-manager/modules/gnome/dconf.nix b/home-manager/modules/gnome/dconf.nix
@@ -29,6 +29,8 @@ in {
         "[email protected]"
         "no-overview@fthx"
         "gTile@vibou"
+        "[email protected]"
+        "[email protected]"
       ];
     };
     "org/gnome/desktop/interface" = {
@@ -64,5 +66,8 @@ in {
       move-to-monitor-down = [ "<Shift><Control><Alt>j" ];
     };
     "org/gnome/desktop/peripherals/touchpad" = { send-events = "enabled"; };
+    "org/gnome/shell/extensions/search-light" = {
+      shortcut-search = [ "<Super>space" ];
+    };
   };
 }
diff --git a/home-manager/modules/gnome/default.nix b/home-manager/modules/gnome/default.nix
@@ -27,7 +27,6 @@
     MimeType=x-scheme-handler/sgnl;x-scheme-handler/signalcaptcha;
     Categories=Network;InstantMessaging;Chat;
   '';
-  home.packages = [ pkgs.flameshot ];
   gtk = {
     gtk2 = {
       configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";

diff --git a/home-manager/modules/rofi.nix b/home-manager/modules/rofi.nix
diff --git a/home-manager/modules/wezterm.nix b/home-manager/modules/wezterm.nix
@@ -16,9 +16,7 @@ in {
       local os_name = ${if isLinux then "'linux'" else "'macos'"}
       local smart_splits = wezterm.plugin.require('https://github.com/mrjones2014/smart-splits.nvim')
 
-      -- macOS specific settings
-      -- this setting behaves weirdly on linux
-      config.hide_mouse_cursor_when_typing = os_name == 'macos'
+      config.hide_mouse_cursor_when_typing = true
       if os_name == 'macos' then
         config.window_decorations = 'RESIZE'
       end

diff --git a/nixos-modules/desktop_environment.nix b/nixos-modules/desktop_environment.nix
@@ -31,6 +31,8 @@
       tray-icons-reloaded
       no-overview
       gtile
+      search-light
+      quick-web-search
     ];
   };
 }
diff --git a/nixos-modules/theme.nix b/nixos-modules/theme.nix
@@ -35,7 +35,6 @@ in {
       programs = {
         # My Neovim Lua is not generated by Nix
         neovim.tokyonight.enable = false;
-        rofi.tokyonight.variant = "big1";
       };
     })
   ];