1
1
Fork 0

Compare commits

..

No commits in common. "254522d3fbfc2ffe0abdacf92db6cec70d92af4d" and "d33828fd978dd0b46d2c2947a4ca52bcc9f6a5ab" have entirely different histories.

12 changed files with 67 additions and 129 deletions

View file

@ -65,7 +65,7 @@
nix-vscode-extensions = flake "github:nix-community/nix-vscode-extensions" // unstable "nixpkgs"; nix-vscode-extensions = flake "github:nix-community/nix-vscode-extensions" // unstable "nixpkgs";
nixd = flake "github:nix-community/nixd" // unstable "nixpkgs"; nixd = flake "github:nix-community/nixd" // unstable "nixpkgs";
stylix-unstable = flake "github:danth/stylix" // unstable "nixpkgs"; stylix-unstable = flake "github:danth/stylix" // unstable "nixpkgs";
walker = flake "github:abenz1267/walker?ref=v0.12.8" // unstable "nixpkgs"; walker = flake "github:abenz1267/walker?ref=v0.10.15" // unstable "nixpkgs";
### Branches ### Branches
nixpkgs-dcsunset = flake "github:DCsunset/nixpkgs/update-freerdp3"; nixpkgs-dcsunset = flake "github:DCsunset/nixpkgs/update-freerdp3";

26
flake.lock generated
View file

@ -3259,21 +3259,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_16": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_2": { "systems_2": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
@ -3564,20 +3549,19 @@
"flake-parts": "flake-parts_5", "flake-parts": "flake-parts_5",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs-unstable"
], ]
"systems": "systems_16"
}, },
"locked": { "locked": {
"lastModified": 1737394200, "lastModified": 1733834481,
"narHash": "sha256-Opd7Ok/MIg9boStHXXFVzMucI2pzvkRDPmHmJDHeKa0=", "narHash": "sha256-4vHkhZztC6bpRnuwd9ACp3EvOXDB+8E7NOqRISjaEuE=",
"owner": "abenz1267", "owner": "abenz1267",
"repo": "walker", "repo": "walker",
"rev": "2d354641fb43f1e54eec3a2337e8159b71fd08ed", "rev": "db2ed94cc101a4f0a21f0b57c4e8f13d548e770d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "abenz1267", "owner": "abenz1267",
"ref": "v0.12.8", "ref": "v0.10.15",
"repo": "walker", "repo": "walker",
"type": "github" "type": "github"
} }

View file

@ -151,7 +151,7 @@
}; };
walker = { walker = {
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";
url = "github:abenz1267/walker?ref=v0.12.8"; url = "github:abenz1267/walker?ref=v0.10.15";
}; };
}; };
outputs = inputs: inputs.flakegen ./flake.in.nix inputs; outputs = inputs: inputs.flakegen ./flake.in.nix inputs;

View file

@ -111,6 +111,8 @@ in {
(key "Backspace" "Mod" center-column) (key "Backspace" "Mod" center-column)
(key "Bracketleft" "Mod" (switch-layout "prev")) (key "Bracketleft" "Mod" (switch-layout "prev"))
(key "Bracketright" "Mod" (switch-layout "next")) (key "Bracketright" "Mod" (switch-layout "next"))
(key "C" "Mod" (spawn [walker "--modules" "clipboard"]))
(key "C" "Mod+Ctrl" (spawn [bash "-c" "${rm} ~/.cache/walker/clipboard.gob && ${notify-send} menu 'Clipboard cleared' --urgency low"]))
(key "Delete" "Ctrl+Alt" (spawn [loginctl "terminate-user" config.custom.username])) (key "Delete" "Ctrl+Alt" (spawn [loginctl "terminate-user" config.custom.username]))
(key "Delete" "Mod" (spawn [playerctl] "play-pause")) (key "Delete" "Mod" (spawn [playerctl] "play-pause"))
(key "Down" "Mod" (spawn [swayosd-client "--brightness" "lower"])) (key "Down" "Mod" (spawn [swayosd-client "--brightness" "lower"]))
@ -153,9 +155,8 @@ in {
(key "T" "Mod" (spawn ghostty)) (key "T" "Mod" (spawn ghostty))
(key "Tab" "Mod" switch-focus-between-floating-and-tiling) (key "Tab" "Mod" switch-focus-between-floating-and-tiling)
(key "Up" "Mod" (spawn [swayosd-client "--brightness" "raise"])) (key "Up" "Mod" (spawn [swayosd-client "--brightness" "raise"]))
(key "V" "Mod" (spawn [walker "--modules" "clipboard"])) (key "V" "Mod" (spawn virt-manager))
(key "V" "Mod+Ctrl" (spawn vm)) (key "V" "Mod+Ctrl" (spawn vm))
(key "V" "Mod+Shift" (spawn [bash "-c" "${rm} ~/.cache/walker/clipboard.gob && ${notify-send} menu 'Clipboard cleared' --urgency low"]))
(key "W" "Mod" focus-window-or-workspace-up) (key "W" "Mod" focus-window-or-workspace-up)
(key "W" "Mod+Shift" move-window-up-or-to-workspace-up) (key "W" "Mod+Shift" move-window-up-or-to-workspace-up)
(key "WheelScrollDown" "Mod" focus-window-or-workspace-down) (key "WheelScrollDown" "Mod" focus-window-or-workspace-down)

View file

@ -38,7 +38,7 @@ in {
# https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingsinputmouseaccel-profile # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingsinputmouseaccel-profile
mouse = { mouse = {
accel-profile = "adaptive"; accel-profile = "adaptive";
accel-speed = -0.7; accel-speed = -0.5;
}; };
# https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingsinputtouchpadaccel-profile # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingsinputtouchpadaccel-profile
@ -54,7 +54,7 @@ in {
# https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingsinputtrackballaccel-profile # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingsinputtrackballaccel-profile
trackball = { trackball = {
accel-profile = "adaptive"; accel-profile = "adaptive";
accel-speed = -0.5; accel-speed = 0.5;
middle-emulation = true; middle-emulation = true;
}; };
}; };

View file

@ -28,9 +28,6 @@ in {
# https://ghostty.org/docs/config/reference#adw-toolbar-style # https://ghostty.org/docs/config/reference#adw-toolbar-style
adw-toolbar-style = "flat"; adw-toolbar-style = "flat";
# https://ghostty.org/docs/config/reference#confirm-close-surface
confirm-close-surface = false;
# https://ghostty.org/docs/config/reference#cursor-style-blink # https://ghostty.org/docs/config/reference#cursor-style-blink
cursor-style-blink = false; cursor-style-blink = false;
@ -52,9 +49,6 @@ in {
# https://ghostty.org/docs/config/reference#mouse-hide-while-typing # https://ghostty.org/docs/config/reference#mouse-hide-while-typing
mouse-hide-while-typing = true; mouse-hide-while-typing = true;
# https://ghostty.org/docs/config/reference#mouse-scroll-multiplier
mouse-scroll-multiplier = 2;
# https://ghostty.org/docs/config/reference#shell-integration-features # https://ghostty.org/docs/config/reference#shell-integration-features
shell-integration-features = "no-cursor"; shell-integration-features = "no-cursor";

View file

@ -40,8 +40,6 @@ in {
### Overrides ### Overrides
# https://starship.rs/config/#prompt # https://starship.rs/config/#prompt
add_newline = false; add_newline = false;
command_timeout = 1000 * 60; # Milliseconds
scan_timeout = 100; # Milliseconds
format = concatStrings [ format = concatStrings [
# Top left # Top left

View file

@ -7,12 +7,8 @@
}: }:
with lib; let with lib; let
cfg = config.custom.programs.walker; cfg = config.custom.programs.walker;
hm = config.home-manager.users.${config.custom.username};
in { in {
options.custom.programs.walker = { options.custom.programs.walker.enable = mkOption {default = false;};
enable = mkOption {default = false;};
icons = mkOption {default = ["edit-find" "terminal"];};
};
config.home-manager.users.${config.custom.username} = mkIf cfg.enable { config.home-manager.users.${config.custom.username} = mkIf cfg.enable {
imports = [inputs.walker.homeManagerModules.default]; imports = [inputs.walker.homeManagerModules.default];
@ -28,49 +24,32 @@ in {
runAsService = true; runAsService = true;
# https://github.com/abenz1267/walker/wiki/Basic-Configuration # https://github.com/abenz1267/walker/wiki/Basic-Configuration
# https://github.com/abenz1267/walker/blob/master/internal/config/config.default.toml # https://github.com/abenz1267/walker/blob/master/internal/config/config.default.json
config = { config = {
activation_mode.disabled = true; # Key chords activation_mode.disabled = true; # Key chords
close_when_open = true;
disable_click_to_close = true;
force_keyboard_focus = true; force_keyboard_focus = true;
hotreload_theme = true; list.placeholder = "";
ignore_mouse = true; search.placeholder = "";
list = { # HACK: Window client required to send Esc key on Hyprland
placeholder = ""; #// as_window = true; # Disable layer
};
search = {
placeholder = "";
resume_last_query = true;
};
# https://github.com/abenz1267/walker/wiki/Modules # https://github.com/abenz1267/walker/wiki/Modules
# https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/tree/master/Papirus/64x64 # https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/tree/master/Papirus/64x64
disabled = [ disabled = [
"ai"
"commands" "commands"
"custom_commands" "custom_commands"
"finder"
"websearch" # Replaced by custom plugin "websearch" # Replaced by custom plugin
"windows" "windows"
]; ];
builtins = let builtins = {
in {
applications = { applications = {
# BUG: Ghost entries are still visible with single module
actions.enabled = false; actions.enabled = false;
hide_without_query = true; hide_actions_with_empty_query = true;
placeholder = "";
show_generic = false;
switcher_only = false;
};
bookmarks = {
icon = "user-bookmarks";
placeholder = ""; placeholder = "";
prefix = "b";
switcher_only = false; switcher_only = false;
}; };
@ -91,7 +70,7 @@ in {
dmenu = { dmenu = {
keep_sort = true; keep_sort = true;
placeholder = "Input"; placeholder = "";
switcher_only = true; switcher_only = true;
}; };
@ -104,7 +83,7 @@ in {
finder = { finder = {
icon = "filetypes"; icon = "filetypes";
placeholder = ""; placeholder = "";
prefix = "//"; prefix = "/";
show_icon_when_single = true; show_icon_when_single = true;
switcher_only = false; switcher_only = false;
}; };
@ -127,46 +106,29 @@ in {
switcher = { switcher = {
icon = "application-default-icon"; icon = "application-default-icon";
prefix = "/"; prefix = "?";
show_icon_when_single = true; show_icon_when_single = true;
}; };
symbols = {
placeholder = "";
prefix = "sym";
switcher_only = false;
}; };
translation = {
icon = "translator";
placeholder = "";
prefix = "tr";
switcher_only = false;
};
websearch = {
placeholder = "system-search";
switcher_only = false;
entries = [{}];
};
};
# TODO: Keybinds
# https://github.com/abenz1267/walker/wiki/Keybinds
# https://github.com/abenz1267/walker/wiki/Plugins # https://github.com/abenz1267/walker/wiki/Plugins
plugins = [ plugins = [
{
# Search engines by keyword prefix # Search engines by keyword prefix
{
name = "search"; name = "search";
placeholder = ""; placeholder = "";
show_icon_when_single = true; show_icon_when_single = true;
switcher_only = false; switcher_only = true;
src = "${pkgs.writeShellApplication { src = "${pkgs.writeShellApplication {
name = "search"; name = "search";
text = readFile ./search.sh; text = readFile ./search.sh;
runtimeInputs = with pkgs; [coreutils jq xdg-utils];
runtimeInputs = with pkgs; [
coreutils
jq
xdg-utils
];
}}/bin/search '%TERM%'"; }}/bin/search '%TERM%'";
} }
]; ];
@ -176,17 +138,21 @@ in {
theme = { theme = {
style = '' style = ''
#box { #box {
border: ${toString config.custom.border}px #073642 solid;
font: larger ${config.custom.settings.fonts.sans-serif}; font: larger ${config.custom.settings.fonts.sans-serif};
} }
placeholder {
font: larger ${config.custom.settings.fonts.monospace};
}
${readFile ./style.css} ${readFile ./style.css}
''; '';
# https://github.com/abenz1267/walker/blob/master/internal/config/layout.default.toml #!! Inherit from default layout
# https://github.com/abenz1267/walker/blob/master/internal/config/layout.default.json
layout.ui.window = let layout.ui.window = let
w = 750; w = 750;
h = 300; h = 250;
in { in {
width = w; width = w;
height = h; height = h;
@ -196,6 +162,12 @@ in {
width = -1; width = -1;
height = -1; height = -1;
ai_scroll = {
# BUG: AiScroll H/VScrollbarPolicy applies to Scroll widget
h_scrollbar_policy = "external";
v_scrollbar_policy = "external";
};
scroll = { scroll = {
h_align = "fill"; h_align = "fill";
h_scrollbar_policy = "external"; h_scrollbar_policy = "external";
@ -210,6 +182,11 @@ in {
max_height = h; max_height = h;
item = { item = {
icon = {
icon_size = "larger"; # 64px
pixel_size = 32; # Downscale
};
text = { text = {
sub = { sub = {
hide = true; # Subtext hide = true; # Subtext
@ -218,30 +195,16 @@ in {
}; };
}; };
}; };
};
};
};
};
# # HACK: Create theme files for module prompt icons search = {
# #?? MODULE.theme = "icon-ICON" input = {
# # https://github.com/abenz1267/walker/blob/bb584eab3b0cc48ebfbac1a5da019864d74781c4/nix/hm-module.nix#L86 icons = false;
# xdg.configFile = listToAttrs (flatten (forEach cfg.icons ( };
# icon: [ };
# { };
# name = "walker/themes/icon-${icon}.css"; };
# value = {text = hm.programs.walker.theme.style;}; };
# } };
# {
# name = "walker/themes/icon-${icon}.json";
# value = {
# text = builtins.toJSON (recursiveUpdate hm.programs.walker.theme.layout {
# ui.window.box.search.prompt.icon = icon;
# });
# };
# }
# ]
# )));
# HACK: Allow child processes to live, otherwise applications launched through service are killed on stop # HACK: Allow child processes to live, otherwise applications launched through service are killed on stop
# https://www.freedesktop.org/software/systemd/man/latest/systemd.kill.html#KillMode= # https://www.freedesktop.org/software/systemd/man/latest/systemd.kill.html#KillMode=

View file

@ -94,7 +94,7 @@ case "$1" in
;; ;;
'k '*) 'k '*)
label="Kagi" label="Kagi"
icon="plasma-search" icon="kagi"
url="https://kagi.com/search?q=" url="https://kagi.com/search?q="
query="${1:2}" query="${1:2}"
;; ;;
@ -249,11 +249,10 @@ case "$1" in
query="${1:2}" query="${1:2}"
;; ;;
*) *)
exit label="Search"
# label="Search" icon="globe-symbolic"
# icon="globe-symbolic" url="https://search.brave.com/search?q="
# url="https://search.brave.com/search?q=" query="$1"
# query="$1"
;; ;;
esac esac

View file

@ -1,7 +1,6 @@
/*** /***
/* !! Inherits system GTK theme /* !! Inherits system GTK theme
https://github.com/abenz1267/walker/blob/master/internal/config/themes/colors.css https://github.com/abenz1267/walker/blob/master/internal/config/themes/bare.css
https://github.com/abenz1267/walker/blob/master/internal/config/themes/default.css
https://docs.gtk.org/gtk4/css-properties.html https://docs.gtk.org/gtk4/css-properties.html
***/ ***/
@ -13,6 +12,7 @@ https://docs.gtk.org/gtk4/css-properties.html
/* Visible window overlay */ /* Visible window overlay */
#box { #box {
background: #002b36; background: #002b36;
border: 2px #073642 solid;
border-radius: 30px; border-radius: 30px;
} }

View file

@ -3,13 +3,13 @@ https://github.com/lassekongo83/adw-colors/blob/main/themes/solarized-dark/gtk.c
https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.2/named-colors.html https://gnome.pages.gitlab.gnome.org/libadwaita/doc/1.2/named-colors.html
***/ ***/
@define-color accent_bg_color #d33682; @define-color accent_bg_color #6c71c4;
@define-color accent_color #d33682; @define-color accent_color #6c71c4;
@define-color accent_fg_color #ffffff; @define-color accent_fg_color #ffffff;
@define-color card_bg_color #123a44; @define-color card_bg_color #123a44;
@define-color card_fg_color #fdf6e3; @define-color card_fg_color #fdf6e3;
@define-color destructive_bg_color #b58900; @define-color destructive_bg_color #d33682;
@define-color destructive_color #b58900; @define-color destructive_color #d33682;
@define-color destructive_fg_color #eee8d5; @define-color destructive_fg_color #eee8d5;
@define-color dialog_bg_color @popover_bg_color; @define-color dialog_bg_color @popover_bg_color;
@define-color dialog_fg_color @popover_fg_color; @define-color dialog_fg_color @popover_fg_color;

View file

@ -114,7 +114,6 @@ in {
gnome-tweaks # GNOME extras gnome-tweaks # GNOME extras
gnome-usage # System monitor gnome-usage # System monitor
gradience # GTK theme editor gradience # GTK theme editor
gtk4.dev # GTK4 icon browser
gtkcord4 # Discord client gtkcord4 # Discord client
gtkterm # Serial terminal gtkterm # Serial terminal
helvum # Pipewire patchbay helvum # Pipewire patchbay