From d3ecfabad3b25adfb0e8c71b4ea0022300883f14 Mon Sep 17 00:00:00 2001 From: Mat Jones Date: Wed, 29 May 2024 17:35:49 -0400 Subject: [PATCH 1/2] fix(wezterm): Hide mouse cursor when typing on linux --- home-manager/modules/wezterm.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/home-manager/modules/wezterm.nix b/home-manager/modules/wezterm.nix index 1a79f309..6ab8f8f5 100644 --- 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 From 8449f0f4cca0f81258223d3e76c8e814ee1e5382 Mon Sep 17 00:00:00 2001 From: Mat Jones Date: Wed, 29 May 2024 21:45:09 -0400 Subject: [PATCH 2/2] feat(nixos): Switch back to search-light from rofi --- home-manager/home.nix | 1 - home-manager/modules/arkenfox.nix | 11 +++++ home-manager/modules/gnome/dconf.nix | 5 +++ home-manager/modules/gnome/default.nix | 1 - home-manager/modules/rofi.nix | 56 -------------------------- nixos-modules/desktop_environment.nix | 2 + nixos-modules/theme.nix | 1 - 7 files changed, 18 insertions(+), 59 deletions(-) delete mode 100644 home-manager/modules/rofi.nix diff --git a/home-manager/home.nix b/home-manager/home.nix index cdcf0580..16a6b887 100644 --- 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 index 6f0f35aa..59a1a7d8 100644 --- 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 index 99c6b6e2..e16f6d85 100644 --- a/home-manager/modules/gnome/dconf.nix +++ b/home-manager/modules/gnome/dconf.nix @@ -29,6 +29,8 @@ in { "dash-to-dock@micxgx.gmail.com" "no-overview@fthx" "gTile@vibou" + "search-light@icedman.github.com" + "quick@web.search" ]; }; "org/gnome/desktop/interface" = { @@ -64,5 +66,8 @@ in { move-to-monitor-down = [ "j" ]; }; "org/gnome/desktop/peripherals/touchpad" = { send-events = "enabled"; }; + "org/gnome/shell/extensions/search-light" = { + shortcut-search = [ "space" ]; + }; }; } diff --git a/home-manager/modules/gnome/default.nix b/home-manager/modules/gnome/default.nix index 51549fcd..472b6676 100644 --- 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 deleted file mode 100644 index ae496ceb..00000000 --- a/home-manager/modules/rofi.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ pkgs, config, isLinux, ... }: { - programs.rofi = { - enable = isLinux; - plugins = with pkgs; [ rofi-top rofi-calc rofi-power-menu ]; - terminal = "${config.programs.wezterm.package}/bin/wezterm"; - cycle = true; - extraConfig = { - modi = "combi,window,drun,calc"; - show-icons = true; - icon-theme = "Papirus-Dark"; - location = 0; - disable-history = false; - sidebar-mode = false; - display-drun = " "; - display-run = " "; - display-combi = " "; - display-window = " "; - - # vim keymaps - kb-row-up = "Control+p"; - kb-row-down = "Control+n"; - - # general settings - matching = "normal"; - tokenize = true; - drun-categories = ""; - drun-match-fields = "name,generic,exec,categories,keywords"; - drun-display-format = "{icon} {name}"; - window-format = "{icon} {name}"; - combi-display-format = "{mode} {icon} {name}"; - - drun-show-actions = false; - drun-url-launcher = "xdg-open"; - drun-use-desktop-cache = false; - drun-reload-desktop-cache = false; - drun-parse-user = true; - drun-parse-system = true; - combi-modi = "window,drun"; - combi-hide-mode-prefix = true; - }; - }; - dconf.settings = { - "org/gnome/settings-daemon/plugins/media-keys" = { - custom-keybindings = [ - "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/" - ]; - terminal = ""; - }; - "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = - { - binding = "space"; - command = "rofi -show combi"; - name = "rofi"; - }; - }; -} diff --git a/nixos-modules/desktop_environment.nix b/nixos-modules/desktop_environment.nix index d08cc494..1fd9d4a2 100644 --- 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 index c0f3e840..01ca2228 100644 --- 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"; }; }) ];