andy/linux-nixos-hyprland-config-dotfiles
Template
1
0
Fork 0
mirror of https://github.com/XNM1/linux-nixos-hyprland-config-dotfiles.git synced 2025-09-15 09:45:58 +03:00
Code Activity

Compare commits

base: andy:6940f6d19581c75b66480f5b056a07ab8e4d93d9
Branches Tags
andy:main
...
compare: andy:main
Branches Tags
andy:main

4 Commits
6940f6d195 ... main

Author SHA1 Message Date
xnm
426bad68f2 feat(fish): 🎣 Add fzf key bindings integration 
Add fzf key bindings function file with support for:
- File search widget (Ctrl+T)
- Command history search (Ctrl+R) (replaced by custom implementation)
- Directory navigation (Alt+C) (replaced by custom implementation)

Bindings work in both normal and insert modes, providing
fuzzy search capabilities for fish shell navigation and
command history.
 2025-09-13 14:22:16 +03:00
xnm
47f66398b6 chore(config): 🎨 restructure lazygit theme configuration 
Move theme settings under `gui` section to match latest lazygit
configuration format. This aligns with the updated configuration
structure introduced in recent versions.

The color values remain unchanged - only the nesting structure has been
modified to maintain compatibility with lazygit's configuration schema
requirements.
 2025-09-06 17:18:56 +03:00
xnm
7a4c582b85 feat(terminal-utils): 📦 Add posting CLI tool 
Add `posting` to terminal utilities package set and configure two
Catppuccin Macchiato color scheme variants (mauve and teal) for the
tool.
 2025-09-06 17:17:14 +03:00
xnm
4845b84fc5 feat(utils): 📦 Move sqlx-cli and mermaid-cli to terminal utilities 
Add sqlx-cli and mermaid-cli to terminal-utils.nix while removing them
from
utils.nix to consolidate database and diagramming tools in the
appropriate
utility category.

- Move sqlx-cli (database migrations) to terminal utilities
- Move mermaid-cli (diagram generation) to terminal utilities
- Remove commented git-secrets from terminal utilities

This reorganization groups related development tools together for better
maintainability and logical organization of utility packages.
 2025-09-06 16:49:32 +03:00
8 changed files with 337 additions and 25 deletions
Expand all files Collapse all files

2
home/.config/fish/functions/fish_user_key_bindings.fish
View File

@@ -1,4 +1,6 @@
function fish_user_key_bindings
fzf_key_bindings
# Execute this once per mode that emacs bindings should be used in
fish_default_key_bindings -M insert

231
home/.config/fish/functions/fzf_key_bindings.fish Normal file
View File

@@ -0,0 +1,231 @@
### key-bindings.fish ###
# ____ ____
# / __/___ / __/
# / /_/_ / / /_
# / __/ / /_/ __/
# /_/ /___/_/ key-bindings.fish
#
# - $FZF_TMUX_OPTS
# - $FZF_CTRL_T_COMMAND
# - $FZF_CTRL_T_OPTS
# - $FZF_CTRL_R_OPTS
# - $FZF_ALT_C_COMMAND
# - $FZF_ALT_C_OPTS
# Key bindings
# ------------
# The oldest supported fish version is 3.1b1. To maintain compatibility, the
# command substitution syntax $(cmd) should never be used, even behind a version
# check, otherwise the source command will fail on fish versions older than 3.4.0.
function fzf_key_bindings
# Check fish version
set -l fish_ver (string match -r '^(\d+).(\d+)' $version 2> /dev/null; or echo 0\n0\n0)
if test \( "$fish_ver[2]" -lt 3 \) -o \( "$fish_ver[2]" -eq 3 -a "$fish_ver[3]" -lt 1 \)
echo "This script requires fish version 3.1b1 or newer." >&2
return 1
else if not type -q fzf
echo "fzf was not found in path." >&2
return 1
end
function __fzf_defaults
# $argv[1]: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS
# $argv[2..]: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS
test -n "$FZF_TMUX_HEIGHT"; or set -l FZF_TMUX_HEIGHT 40%
string join ' ' -- \
"--height $FZF_TMUX_HEIGHT --min-height=20+ --bind=ctrl-z:ignore" $argv[1] \
(test -r "$FZF_DEFAULT_OPTS_FILE"; and string join -- ' ' <$FZF_DEFAULT_OPTS_FILE) \
$FZF_DEFAULT_OPTS $argv[2..-1]
end
function __fzfcmd
test -n "$FZF_TMUX_HEIGHT"; or set -l FZF_TMUX_HEIGHT 40%
if test -n "$FZF_TMUX_OPTS"
echo "fzf-tmux $FZF_TMUX_OPTS -- "
else if test "$FZF_TMUX" = 1
echo "fzf-tmux -d$FZF_TMUX_HEIGHT -- "
else
echo fzf
end
end
function __fzf_parse_commandline -d 'Parse the current command line token and return split of existing filepath, fzf query, and optional -option= prefix'
set -l fzf_query ''
set -l prefix ''
set -l dir '.'
# Set variables containing the major and minor fish version numbers, using
# a method compatible with all supported fish versions.
set -l -- fish_major (string match -r -- '^\d+' $version)
set -l -- fish_minor (string match -r -- '^\d+\.(\d+)' $version)[2]
# fish v3.3.0 and newer: Don't use option prefix if " -- " is preceded.
set -l -- match_regex '(?<fzf_query>[\s\S]*?(?=\n?$)$)'
set -l -- prefix_regex '^-[^\s=]+=|^-(?!-)\S'
if test "$fish_major" -eq 3 -a "$fish_minor" -lt 3
or string match -q -v -- '* -- *' (string sub -l (commandline -Cp) -- (commandline -p))
set -- match_regex "(?<prefix>$prefix_regex)?$match_regex"
end
# Set $prefix and expanded $fzf_query with preserved trailing newlines.
if test "$fish_major" -ge 4
# fish v4.0.0 and newer
string match -q -r -- $match_regex (commandline --current-token --tokens-expanded | string collect -N)
else if test "$fish_major" -eq 3 -a "$fish_minor" -ge 2
# fish v3.2.0 - v3.7.1 (last v3)
string match -q -r -- $match_regex (commandline --current-token --tokenize | string collect -N)
eval set -- fzf_query (string escape -n -- $fzf_query | string replace -r -a '^\\\(?=~)|\\\(?=\$\w)' '')
else
# fish older than v3.2.0 (v3.1b1 - v3.1.2)
set -l -- cl_token (commandline --current-token --tokenize | string collect -N)
set -- prefix (string match -r -- $prefix_regex $cl_token)
set -- fzf_query (string replace -- "$prefix" '' $cl_token | string collect -N)
eval set -- fzf_query (string escape -n -- $fzf_query | string replace -r -a '^\\\(?=~)|\\\(?=\$\w)|\\\n\\\n$' '')
end
if test -n "$fzf_query"
# Normalize path in $fzf_query, set $dir to the longest existing directory.
if test \( "$fish_major" -ge 4 \) -o \( "$fish_major" -eq 3 -a "$fish_minor" -ge 5 \)
# fish v3.5.0 and newer
set -- fzf_query (path normalize -- $fzf_query)
set -- dir $fzf_query
while not path is -d $dir
set -- dir (path dirname $dir)
end
else
# fish older than v3.5.0 (v3.1b1 - v3.4.1)
if test "$fish_major" -eq 3 -a "$fish_minor" -ge 2
# fish v3.2.0 - v3.4.1
string match -q -r -- '(?<fzf_query>^[\s\S]*?(?=\n?$)$)' \
(string replace -r -a -- '(?<=/)/|(?<!^)/+(?!\n)$' '' $fzf_query | string collect -N)
else
# fish v3.1b1 - v3.1.2
set -- fzf_query (string replace -r -a -- '(?<=/)/|(?<!^)/+(?!\n)$' '' $fzf_query | string collect -N)
eval set -- fzf_query (string escape -n -- $fzf_query | string replace -r '\\\n$' '')
end
set -- dir $fzf_query
while not test -d "$dir"
set -- dir (dirname -z -- "$dir" | string split0)
end
end
if not string match -q -- '.' $dir; or string match -q -r -- '^\./|^\.$' $fzf_query
# Strip $dir from $fzf_query - preserve trailing newlines.
if test "$fish_major" -ge 4
# fish v4.0.0 and newer
string match -q -r -- '^'(string escape --style=regex -- $dir)'/?(?<fzf_query>[\s\S]*)' $fzf_query
else if test "$fish_major" -eq 3 -a "$fish_minor" -ge 2
# fish v3.2.0 - v3.7.1 (last v3)
string match -q -r -- '^/?(?<fzf_query>[\s\S]*?(?=\n?$)$)' \
(string replace -- "$dir" '' $fzf_query | string collect -N)
else
# fish older than v3.2.0 (v3.1b1 - v3.1.2)
set -- fzf_query (string replace -- "$dir" '' $fzf_query | string collect -N)
eval set -- fzf_query (string escape -n -- $fzf_query | string replace -r -a '^/?|\\\n$' '')
end
end
end
string escape -n -- "$dir" "$fzf_query" "$prefix"
end
# Store current token in $dir as root for the 'find' command
function fzf-file-widget -d "List files and folders"
set -l commandline (__fzf_parse_commandline)
set -lx dir $commandline[1]
set -l fzf_query $commandline[2]
set -l prefix $commandline[3]
set -lx FZF_DEFAULT_OPTS (__fzf_defaults \
"--reverse --walker=file,dir,follow,hidden --scheme=path" \
"$FZF_CTRL_T_OPTS --multi --print0")
set -lx FZF_DEFAULT_COMMAND "$FZF_CTRL_T_COMMAND"
set -lx FZF_DEFAULT_OPTS_FILE
set -l result (eval (__fzfcmd) --walker-root=$dir --query=$fzf_query | string split0)
and commandline -rt -- (string join -- ' ' $prefix(string escape -- $result))' '
commandline -f repaint
end
function fzf-history-widget -d "Show command history"
set -l -- command_line (commandline)
set -l -- current_line (commandline -L)
set -l -- total_lines (count $command_line)
set -l -- fzf_query (string escape -- $command_line[$current_line])
set -lx FZF_DEFAULT_OPTS (__fzf_defaults '' \
'--nth=2..,.. --scheme=history --multi --wrap-sign="\t↳ "' \
'--bind=\'shift-delete:execute-silent(eval history delete --exact --case-sensitive -- (string escape -n -- {+} | string replace -r -a "^\d*\\\\\\t|(?<=\\\\\\n)\\\\\\t" ""))+reload(eval $FZF_DEFAULT_COMMAND)\'' \
"--bind=ctrl-r:toggle-sort --highlight-line $FZF_CTRL_R_OPTS" \
'--accept-nth=2.. --read0 --print0 --with-shell='(status fish-path)\\ -c)
set -lx FZF_DEFAULT_OPTS_FILE
set -lx FZF_DEFAULT_COMMAND
if type -q perl
set -a FZF_DEFAULT_OPTS --tac
set FZF_DEFAULT_COMMAND 'builtin history -z --reverse | command perl -0 -pe \'s/^/$.\t/g; s/\n/\n\t/gm\''
else
set FZF_DEFAULT_COMMAND \
'set -l h (builtin history -z --reverse | string split0);' \
'for i in (seq (count $h) -1 1);' \
'string join0 -- $i\t(string replace -a -- \n \n\t $h[$i] | string collect);' \
end
end
# Merge history from other sessions before searching
test -z "$fish_private_mode"; and builtin history merge
if set -l result (eval $FZF_DEFAULT_COMMAND \| (__fzfcmd) --query=$fzf_query | string split0)
if test "$total_lines" -eq 1
commandline -- (string replace -a -- \n\t \n $result)
else
set -l a (math $current_line - 1)
set -l b (math $current_line + 1)
commandline -- $command_line[1..$a] (string replace -a -- \n\t \n $result)
commandline -a -- '' $command_line[$b..-1]
end
end
commandline -f repaint
end
function fzf-cd-widget -d "Change directory"
set -l commandline (__fzf_parse_commandline)
set -lx dir $commandline[1]
set -l fzf_query $commandline[2]
set -l prefix $commandline[3]
set -lx FZF_DEFAULT_OPTS (__fzf_defaults \
"--reverse --walker=dir,follow,hidden --scheme=path" \
"$FZF_ALT_C_OPTS --no-multi --print0")
set -lx FZF_DEFAULT_OPTS_FILE
set -lx FZF_DEFAULT_COMMAND "$FZF_ALT_C_COMMAND"
if set -l result (eval (__fzfcmd) --query=$fzf_query --walker-root=$dir | string split0)
cd -- $result
commandline -rt -- $prefix
end
commandline -f repaint
end
bind \cr fzf-history-widget
bind -M insert \cr fzf-history-widget
if not set -q FZF_CTRL_T_COMMAND; or test -n "$FZF_CTRL_T_COMMAND"
bind \ct fzf-file-widget
bind -M insert \ct fzf-file-widget
end
if not set -q FZF_ALT_C_COMMAND; or test -n "$FZF_ALT_C_COMMAND"
bind \ec fzf-cd-widget
bind -M insert \ec fzf-cd-widget
end
end
### end: key-bindings.fish ###

45
home/.config/lazygit/config.yml
View File

@@ -1,23 +1,24 @@
theme:
activeBorderColor:
- '#8bd5ca'
- bold
inactiveBorderColor:
- '#a5adcb'
optionsTextColor:
- '#8aadf4'
selectedLineBgColor:
- '#363a4f'
cherryPickedCommitBgColor:
- '#494d64'
cherryPickedCommitFgColor:
- '#8bd5ca'
unstagedChangesColor:
- '#ed8796'
defaultFgColor:
- '#cad3f5'
searchingActiveBorderColor:
- '#eed49f'
gui:
theme:
activeBorderColor:
- '#8bd5ca'
- bold
inactiveBorderColor:
- '#a5adcb'
optionsTextColor:
- '#8aadf4'
selectedLineBgColor:
- '#363a4f'
cherryPickedCommitBgColor:
- '#494d64'
cherryPickedCommitFgColor:
- '#8bd5ca'
unstagedChangesColor:
- '#ed8796'
defaultFgColor:
- '#cad3f5'
searchingActiveBorderColor:
- '#eed49f'
authorColors:
'*': '#b7bdf8'
authorColors:
'*': '#b7bdf8'

1
home/.config/posting/config.yaml Normal file
View File

@@ -0,0 +1 @@
theme: "catppuccin-macchiato-teal"

38
home/.local/share/posting/themes/catppuccin-macchiato-mauve.yaml Normal file
View File

@@ -0,0 +1,38 @@
name: "catppuccin-macchiato-mauve"
primary: "#c6a0f6" # buttons, fixed table columns
secondary: "#c6a0f6" # method selector, some minor labels
accent: "#e3cffb" # header text, scrollbars, cursors, focus highlights
background: "#24273a" # background colors
surface: "#363a4f" # panels, etc
error: "#ed8796" # error messages
success: "#a6da95" # success messages
warning: "#eed49f" # warning messages
dark: "true"
text_area:
cursor: "reverse #f4dbd6"
cursor_line: "underline #cad3f5"
selection: "reverse #939ab7"
gutter: "bold #a6da95"
matched_bracket: "reverse #b8c0e0"
url:
base: "italic #8aadf4"
protocol: "bold #8bd5ca"
separator: "#cad3f5"
syntax:
json_key: "italic #8aadf4"
json_number: "#f5a97f"
json_string: "#a6da95"
json_boolean: "#91d7e3"
json_null: "#939ab7"
method:
get: "bold #8aadf4"
post: "bold #a6da95"
put: "bold #eed49f"
delete: "bold #ed8796"
patch: "bold #8bd5ca"
options: "bold #b7bdf8"
head: "bold #c6a0f6"

38
home/.local/share/posting/themes/catppuccin-macchiato-teal.yaml Normal file
View File

@@ -0,0 +1,38 @@
name: "catppuccin-macchiato-teal"
primary: "#8bd5ca" # buttons, fixed table columns
secondary: "#8bd5ca" # method selector, some minor labels
accent: "#b1e3db" # header text, scrollbars, cursors, focus highlights
background: "#24273a" # background colors
surface: "#363a4f" # panels, etc
error: "#ed8796" # error messages
success: "#a6da95" # success messages
warning: "#eed49f" # warning messages
dark: "true"
text_area:
cursor: "reverse #f4dbd6"
cursor_line: "underline #cad3f5"
selection: "reverse #939ab7"
gutter: "bold #a6da95"
matched_bracket: "reverse #b8c0e0"
url:
base: "italic #8aadf4"
protocol: "bold #8bd5ca"
separator: "#cad3f5"
syntax:
json_key: "italic #8aadf4"
json_number: "#f5a97f"
json_string: "#a6da95"
json_boolean: "#91d7e3"
json_null: "#939ab7"
method:
get: "bold #8aadf4"
post: "bold #a6da95"
put: "bold #eed49f"
delete: "bold #ed8796"
patch: "bold #8bd5ca"
options: "bold #b7bdf8"
head: "bold #c6a0f6"

5
nixos/terminal-utils.nix
View File

@@ -9,10 +9,13 @@
git
lazygit
delta
sqlx-cli
mermaid-cli
posting
license-generator
git-ignore
gitleaks
git-secrets
# git-secrets
pass-git-helper
jujutsu
jjui

2
nixos/utils.nix
View File

@@ -14,7 +14,5 @@
surrealdb-migrations
surrealist
trunk
sqlx-cli
mermaid-cli
];
}