From cb9c91c7a7715ef62aea163040278e1b92457ca8 Mon Sep 17 00:00:00 2001 From: kenji Date: Sat, 27 Dec 2025 13:27:47 -0600 Subject: [PATCH] fix: some stff --- apps/matugen/config.toml | 2 +- apps/matugen/home.nix | 8 +- apps/matugen/templates/walker | 207 +++++++++++++++++++++ apps/neovim/neovim.nix | 3 +- apps/walker/default.nix | 2 - apps/walker/home.nix | 38 ++-- apps/walker/style.nix | 337 +++++++++++++++++++++------------- home/hakase.nix | 7 +- 8 files changed, 448 insertions(+), 156 deletions(-) delete mode 100644 apps/walker/default.nix diff --git a/apps/matugen/config.toml b/apps/matugen/config.toml index fdbc801..36ce544 100644 --- a/apps/matugen/config.toml +++ b/apps/matugen/config.toml @@ -22,6 +22,6 @@ output_path = "~/.config/starship.toml" [templates.walker] input_path = "~/.config/matugen/templates/walker" -output_path = "~/.config/walker/themes/nixos/matugen.css" +output_path = "~/.config/walker/themes/nixos/style.css" diff --git a/apps/matugen/home.nix b/apps/matugen/home.nix index 8e9c040..fcfbdbd 100644 --- a/apps/matugen/home.nix +++ b/apps/matugen/home.nix @@ -1,9 +1,12 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + ... +}: { home.packages = with pkgs; [ matugen psmisc # for killall ]; - home.file.".config/matugen/config.toml" = { source = ./config.toml; }; @@ -16,4 +19,5 @@ programs.ghostty.settings.theme = "matugen"; programs.starship.enable = true; wayland.windowManager.hyprland.settings.source = ["./matugen.conf"]; + programs.walker.config.theme = "nixos"; } diff --git a/apps/matugen/templates/walker b/apps/matugen/templates/walker index e69de29..727a052 100644 --- a/apps/matugen/templates/walker +++ b/apps/matugen/templates/walker @@ -0,0 +1,207 @@ +@define-color window_bg_color {{colors.surface_container.default.hex}}; +@define-color accent_bg_color {{colors.primary.default.hex}}; +@define-color theme_fg_color {{colors.on_surface.default.hex}}; +@define-color error_bg_color {{colors.error.default.hex}}; +@define-color error_fg_color {{colors.on_error.default.hex}}; + +* { + all: unset; +} + +popover { + background: lighter(@window_bg_color); + border: 1px solid darker(@accent_bg_color); + border-radius: 18px; + padding: 10px; +} + +.normal-icons { + -gtk-icon-size: 16px; +} + +.large-icons { + -gtk-icon-size: 32px; +} + +scrollbar { + opacity: 0; +} + +.box-wrapper { + box-shadow: + 0 19px 38px rgba(0, 0, 0, 0.3), + 0 15px 12px rgba(0, 0, 0, 0.22); + background: @window_bg_color; + padding: 20px; + border-radius: 20px; + border: 1px solid darker(@accent_bg_color); +} + +.preview-box, +.elephant-hint, +.placeholder { + color: @theme_fg_color; +} + +.box { +} + +.search-container { + border-radius: 10px; +} + +.input placeholder { + opacity: 0.5; +} + +.input selection { + background: lighter(lighter(lighter(@window_bg_color))); +} + +.input { + caret-color: @theme_fg_color; + background: lighter(@window_bg_color); + padding: 10px; + color: @theme_fg_color; +} + +.input:focus, +.input:active { +} + +.content-container { +} + +.placeholder { +} + +.scroll { +} + +.list { + color: @theme_fg_color; +} + +child { +} + +.item-box { + border-radius: 10px; + padding: 10px; +} + +.item-quick-activation { + background: alpha(@accent_bg_color, 0.25); + border-radius: 5px; + padding: 10px; +} + +/* child:hover .item-box, */ +child:selected .item-box { + background: alpha(@accent_bg_color, 0.25); +} + +.item-text-box { +} + +.item-subtext { + font-size: 12px; + opacity: 0.5; +} + +.providerlist .item-subtext { + font-size: unset; + opacity: 0.75; +} + +.item-image-text { + font-size: 28px; +} + +.preview { + border: 1px solid alpha(@accent_bg_color, 0.25); + /* padding: 10px; */ + border-radius: 10px; + color: @theme_fg_color; +} + +.calc .item-text { + font-size: 24px; +} + +.calc .item-subtext { +} + +.symbols .item-image { + font-size: 24px; +} + +.todo.done .item-text-box { + opacity: 0.25; +} + +.todo.urgent { + font-size: 24px; +} + +.todo.active { + font-weight: bold; +} + +.bluetooth.disconnected { + opacity: 0.5; +} + +.preview .large-icons { + -gtk-icon-size: 64px; +} + +.keybinds { + padding-top: 10px; + border-top: 1px solid lighter(@window_bg_color); + font-size: 12px; + color: @theme_fg_color; +} + +.global-keybinds { +} + +.item-keybinds { +} + +.keybind { +} + +.keybind-button { + opacity: 0.5; +} + +.keybind-button:hover { + opacity: 0.75; + cursor: pointer; +} + +.keybind-bind { + text-transform: lowercase; + opacity: 0.35; +} + +.keybind-label { + padding: 2px 4px; + border-radius: 4px; + border: 1px solid @theme_fg_color; +} + +.error { + padding: 10px; + background: @error_bg_color; + color: @error_fg_color; +} + +:not(.calc).current { + font-style: italic; +} + +.preview-content.archlinuxpkgs { + font-family: monospace; +} diff --git a/apps/neovim/neovim.nix b/apps/neovim/neovim.nix index 3e960d2..211f763 100644 --- a/apps/neovim/neovim.nix +++ b/apps/neovim/neovim.nix @@ -1,9 +1,10 @@ { inputs, system, + pkgs, ... }: { home.packages = [ - inputs.nixovim.packages.${system}.full + inputs.nixovim.packages.${pkgs.system}.full ]; } diff --git a/apps/walker/default.nix b/apps/walker/default.nix deleted file mode 100644 index 2c63c08..0000000 --- a/apps/walker/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -{ -} diff --git a/apps/walker/home.nix b/apps/walker/home.nix index cf17f39..d59d6f7 100644 --- a/apps/walker/home.nix +++ b/apps/walker/home.nix @@ -5,37 +5,35 @@ ... }: { imports = [ - inputs.walker.homeManagerModules.default - ./style.nix + # ./style.nix ]; programs.walker = { enable = true; runAsService = true; - package = inputs.walker.packages.${pkgs.system}.default; # CSS Implementation using Stylix Colors config = { hide_action_hints = true; - icons.theme = config.gtk.iconTheme.name; - - placeholders.default = { - input = "Search"; - list = "No Results"; - }; - - providers.prefixes = [ - { - provider = "websearch"; - prefix = "+"; - } - { - provider = "providerlist"; - prefix = "_"; - } - ]; + # icons.theme = config.gtk.iconTheme.name; + # + # placeholders.default = { + # input = "Search"; + # list = "No Results"; + # }; + # + # providers.prefixes = [ + # { + # provider = "websearch"; + # prefix = "+"; + # } + # { + # provider = "providerlist"; + # prefix = "_"; + # } + # ]; }; }; } diff --git a/apps/walker/style.nix b/apps/walker/style.nix index 18274ed..8526c94 100644 --- a/apps/walker/style.nix +++ b/apps/walker/style.nix @@ -1,131 +1,210 @@ {config, ...}: { - programs.walker = { - theme.style = '' - @import "matugen.css"; - * { - all: unset; - } - - * { - font-family: monospace; - font-size: 18px; - /* Fixed: Text color must be visible on the background */ - color: @on_surface; - } - - scrollbar { - opacity: 0; - } - - .normal-icons { - -gtk-icon-size: 16px; - } - - .large-icons { - -gtk-icon-size: 32px; - } - - .box-wrapper { - /* base00 -> surface */ - background: alpha(@surface, 0.95); - padding: 20px; - /* base0E -> secondary (often pink/purple in Firewatch themes) */ - border: 2px solid @secondary; - } - - .preview-box { - } - - .box { - } - - .search-container { - /* base00 -> surface */ - background: @surface; - padding: 10px; - } - - .input placeholder { - opacity: 0.5; - } - - .input { - } - - .input:focus, - .input:active { - box-shadow: none; - outline: none; - } - - .content-container { - } - - .placeholder { - } - - .scroll { - } - - .list { - } - - child, - child > * { - } - - child:hover .item-box { - /* Added hover effect for better usability */ - background: @surface_bright; - } - - child:selected .item-box { - /* Selected background */ - background: @surface_container_high; - } - - child:selected .item-box * { - /* base0D -> primary */ - color: @primary; - } - - .item-box { - padding-left: 14px; - } - - .item-text-box { - all: unset; - padding: 14px 0; - } - - .item-text { - } - - .item-subtext { - font-size: 0px; - min-height: 0px; - margin: 0px; - padding: 0px; - } - - .item-image { - margin-right: 14px; - -gtk-icon-transform: scale(0.9); - } - - .current { - font-style: italic; - } - - .keybind-hints { - /* base01 -> surface_container */ - background: @surface_container; - padding: 10px; - margin-top: 10px; - } - - .preview { - } - ''; - }; + # themes."nixos".style = '' + # @define-color window_bg_color #1f1f28; + # @define-color accent_bg_color #54546d; + # @define-color theme_fg_color #f2ecbc; + # @define-color error_bg_color #C34043; + # @define-color error_fg_color #DCD7BA; + # + # * { + # all: unset; + # } + # + # popover { + # background: lighter(@window_bg_color); + # border: 1px solid darker(@accent_bg_color); + # border-radius: 18px; + # padding: 10px; + # } + # + # .normal-icons { + # -gtk-icon-size: 16px; + # } + # + # .large-icons { + # -gtk-icon-size: 32px; + # } + # + # scrollbar { + # opacity: 0; + # } + # + # .box-wrapper { + # box-shadow: + # 0 19px 38px rgba(0, 0, 0, 0.3), + # 0 15px 12px rgba(0, 0, 0, 0.22); + # background: @window_bg_color; + # padding: 20px; + # border-radius: 20px; + # border: 1px solid darker(@accent_bg_color); + # } + # + # .preview-box, + # .elephant-hint, + # .placeholder { + # color: @theme_fg_color; + # } + # + # .box { + # } + # + # .search-container { + # border-radius: 10px; + # } + # + # .input placeholder { + # opacity: 0.5; + # } + # + # .input selection { + # background: lighter(lighter(lighter(@window_bg_color))); + # } + # + # .input { + # caret-color: @theme_fg_color; + # background: lighter(@window_bg_color); + # padding: 10px; + # color: @theme_fg_color; + # } + # + # .input:focus, + # .input:active { + # } + # + # .content-container { + # } + # + # .placeholder { + # } + # + # .scroll { + # } + # + # .list { + # color: @theme_fg_color; + # } + # + # child { + # } + # + # .item-box { + # border-radius: 10px; + # padding: 10px; + # } + # + # .item-quick-activation { + # background: alpha(@accent_bg_color, 0.25); + # border-radius: 5px; + # padding: 10px; + # } + # + # /* child:hover .item-box, */ + # child:selected .item-box { + # background: alpha(@accent_bg_color, 0.25); + # } + # + # .item-text-box { + # } + # + # .item-subtext { + # font-size: 12px; + # opacity: 0.5; + # } + # + # .providerlist .item-subtext { + # font-size: unset; + # opacity: 0.75; + # } + # + # .item-image-text { + # font-size: 28px; + # } + # + # .preview { + # border: 1px solid alpha(@accent_bg_color, 0.25); + # /* padding: 10px; */ + # border-radius: 10px; + # color: @theme_fg_color; + # } + # + # .calc .item-text { + # font-size: 24px; + # } + # + # .calc .item-subtext { + # } + # + # .symbols .item-image { + # font-size: 24px; + # } + # + # .todo.done .item-text-box { + # opacity: 0.25; + # } + # + # .todo.urgent { + # font-size: 24px; + # } + # + # .todo.active { + # font-weight: bold; + # } + # + # .bluetooth.disconnected { + # opacity: 0.5; + # } + # + # .preview .large-icons { + # -gtk-icon-size: 64px; + # } + # + # .keybinds { + # padding-top: 10px; + # border-top: 1px solid lighter(@window_bg_color); + # font-size: 12px; + # color: @theme_fg_color; + # } + # + # .global-keybinds { + # } + # + # .item-keybinds { + # } + # + # .keybind { + # } + # + # .keybind-button { + # opacity: 0.5; + # } + # + # .keybind-button:hover { + # opacity: 0.75; + # cursor: pointer; + # } + # + # .keybind-bind { + # text-transform: lowercase; + # opacity: 0.35; + # } + # + # .keybind-label { + # padding: 2px 4px; + # border-radius: 4px; + # border: 1px solid @theme_fg_color; + # } + # + # .error { + # padding: 10px; + # background: @error_bg_color; + # color: @error_fg_color; + # } + # + # :not(.calc).current { + # font-style: italic; + # } + # + # .preview-content.archlinuxpkgs { + # font-family: monospace; + # } ''; } diff --git a/home/hakase.nix b/home/hakase.nix index 302000f..cd9087a 100644 --- a/home/hakase.nix +++ b/home/hakase.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: { +{ + pkgs, + inputs, + ... +}: { imports = [ ../modules/home/terminal.nix ../modules/home/apps.nix @@ -7,6 +11,7 @@ ../modules/home/waybar.nix ../modules/home/theme.nix ../modules/home/gaming.nix + inputs.walker.homeManagerModules.default ]; home.stateVersion = "25.05";