From 15562083e2e161975ed43fbba2b3eb538b75b744 Mon Sep 17 00:00:00 2001 From: Victor Mignot Date: Wed, 14 Aug 2024 22:01:06 +0200 Subject: [PATCH] Switch from wofi to fuzzel --- .../home-manager/desktop/sway/default.nix | 11 ++- .../home-manager/desktop/sway/fuzzel.nix | 25 ++++++ .../home-manager/desktop/sway/wofi.nix | 79 ------------------- 3 files changed, 32 insertions(+), 83 deletions(-) create mode 100644 modules/workstation/home-manager/desktop/sway/fuzzel.nix delete mode 100644 modules/workstation/home-manager/desktop/sway/wofi.nix diff --git a/modules/workstation/home-manager/desktop/sway/default.nix b/modules/workstation/home-manager/desktop/sway/default.nix index dfffdda..f3c656d 100644 --- a/modules/workstation/home-manager/desktop/sway/default.nix +++ b/modules/workstation/home-manager/desktop/sway/default.nix @@ -10,7 +10,6 @@ with lib; let isQwerty = keymap == "us"; wlrRendererLine = if isNvidiaGpu then "export WLR_RENDERER=vulkan" else ""; - gnomeSchema = "org.gnome.desktop.interface"; monitorModule = types.submodule { options = { name = mkOption { type = types.str; }; @@ -27,7 +26,6 @@ let wl-clipboard clipman wf-recorder - qt5ct font-awesome jetbrains-mono xdg-utils @@ -50,7 +48,7 @@ in imports = [ ./swaylock.nix ./waybar.nix - ./wofi.nix + ./fuzzel.nix ./mako.nix ]; @@ -88,6 +86,11 @@ in }; }; + qt = { + enable = true; + platformTheme.name = "gtk"; + }; + wayland.windowManager.sway = { enable = true; systemd.enable = false; @@ -103,7 +106,7 @@ in down = "down"; terminal = "${pkgs.alacritty}/bin/alacritty"; - menu = "${pkgs.wofi}/bin/wofi --show drun,run"; + menu = "${pkgs.fuzzel}/bin/fuzzel"; fonts = { names = [ "pango:JetBrainsMono Nerd Font Mono" ]; diff --git a/modules/workstation/home-manager/desktop/sway/fuzzel.nix b/modules/workstation/home-manager/desktop/sway/fuzzel.nix new file mode 100644 index 0000000..4eafc87 --- /dev/null +++ b/modules/workstation/home-manager/desktop/sway/fuzzel.nix @@ -0,0 +1,25 @@ +{ pkgs, ... }: +{ + programs.fuzzel = { + enable = true; + settings = { + main = { + terminal = "${pkgs.alacritty}/bin/alacritty -e"; + font = "JetBrains Mono Nerd Font:size=12"; + line-height = 20; + lines = 10; + horizontal-pad = 20; + width = 50; + image-size-ratio = 0; + }; + colors = { + background = "2e3440ff"; + text = "eceff4ff"; + selection = "4c566aff"; + border = "5e81acff"; + selection-match = "d08770ff"; + selection-text = "d8dee9ff"; + }; + }; + }; +} diff --git a/modules/workstation/home-manager/desktop/sway/wofi.nix b/modules/workstation/home-manager/desktop/sway/wofi.nix deleted file mode 100644 index cbbef79..0000000 --- a/modules/workstation/home-manager/desktop/sway/wofi.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ - pkgs, - config, - lib, - ... -}: -with lib; -{ - programs.wofi = mkIf config.my.desktop.sway.enable { - enable = true; - - settings = { - allow_images = true; - allow_markup = true; - insensitive = true; - hide_scroll = true; - no_actions = false; - term = "${pkgs.alacritty}/bin/alacritty"; - width = "35%"; - lines = 8; - always_parse_args = true; - }; - - style = '' - #window { - background-color: transparent; - border-radius: 15px; - font-family: sans-serif; - animation: fadeIn; - animation-duration: 0.2s; - } - - @keyframes fadeIn { - from { opacity: 0; } - to { opacity: 1; } - } - - #outer-box { - margin: 15px; - border-radius: 15px; - background-color: #3b4252; - box-shadow: 0px 0px 5px 0 #0F0F0F; - } - - #inner-box { - color: #d8dee9; - padding: 10px; - padding-top: 5px; - } - - #input { - color: #e5e9f0; - border: 2px solid #5e81ac; - background-color: #4c566a; - padding: 6px; - margin: 15px; - margin-bottom: 0px; - font-size: 16px; - border-radius: 5px; - } - - #entry { - border-radius: 5px; - padding: 7px; - margin: 0px 5px 0px 5px; - } - - #text { - font-size: 16px; - padding: 7px; - color: #d8dee9; - } - - #img { - padding: 4px; - } - ''; - }; -}