chore: Prepare for multi configuration and cleanup
This commit is contained in:
parent
81134126a9
commit
4986770f16
40 changed files with 77 additions and 76 deletions
8
nix/programs/individual_configs/default.nix
Normal file
8
nix/programs/individual_configs/default.nix
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
imports = [
|
||||
./kitty.nix
|
||||
./yazi.nix
|
||||
./fish.nix
|
||||
./ncspot.nix
|
||||
];
|
||||
}
|
||||
141
nix/programs/individual_configs/fish.nix
Normal file
141
nix/programs/individual_configs/fish.nix
Normal file
|
|
@ -0,0 +1,141 @@
|
|||
{
|
||||
xdg.configFile."fish/config.fish" = {
|
||||
text =
|
||||
''
|
||||
if status is-interactive
|
||||
# Commands to run in interactive sessions can go here
|
||||
end
|
||||
|
||||
# =============================================================================
|
||||
#
|
||||
# Utility functions for zoxide.
|
||||
#
|
||||
|
||||
export NIX_PATH="$NIX_PATH:$HOME/gits/dotFiles/nix/."
|
||||
|
||||
set EDITOR "neovide --no-fork"
|
||||
|
||||
alias rebuild='sudo nixos-rebuild switch --flake /home/dashie/gits/dotFiles/nix/.'
|
||||
alias ls='lsd'
|
||||
alias :q='exit'
|
||||
alias gh='git push origin'
|
||||
alias gl='git pull origin'
|
||||
alias gm='git commit -m'
|
||||
alias ga="git add -A"
|
||||
alias g+='bear -- g++ -Wextra -Werror -std=c++20'
|
||||
alias s="kitty +kitten ssh"
|
||||
alias zl='z "" '
|
||||
alias jo='joshuto'
|
||||
alias nv='neovide'
|
||||
alias cr='cargo run'
|
||||
alias grep='rg'
|
||||
alias cat='bat'
|
||||
alias find='fd'
|
||||
alias rm='rip'
|
||||
|
||||
set fish_greeting
|
||||
# pwd based on the value of _ZO_RESOLVE_SYMLINKS.
|
||||
function __zoxide_pwd
|
||||
builtin pwd -L
|
||||
end
|
||||
|
||||
# A copy of fish's internal cd function. This makes it possible to use
|
||||
# `alias cd=z` without causing an infinite loop.
|
||||
if ! builtin functions --query __zoxide_cd_internal
|
||||
if builtin functions --query cd
|
||||
builtin functions --copy cd __zoxide_cd_internal
|
||||
else
|
||||
alias __zoxide_cd_internal='builtin cd'
|
||||
end
|
||||
end
|
||||
|
||||
# cd + custom logic based on the value of _ZO_ECHO.
|
||||
function __zoxide_cd
|
||||
__zoxide_cd_internal $argv
|
||||
end
|
||||
|
||||
# =============================================================================
|
||||
#
|
||||
# Hook configuration for zoxide.
|
||||
#
|
||||
|
||||
# Initialize hook to add new entries to the database.
|
||||
function __zoxide_hook --on-variable PWD
|
||||
test -z "$fish_private_mode"
|
||||
and command zoxide add -- (__zoxide_pwd)
|
||||
end
|
||||
|
||||
# =============================================================================
|
||||
#
|
||||
# When using zoxide with --no-cmd, alias these internal functions as desired.
|
||||
#
|
||||
|
||||
if test -z $__zoxide_z_prefix
|
||||
set __zoxide_z_prefix 'z!'
|
||||
end
|
||||
set __zoxide_z_prefix_regex ^(string escape --style=regex $__zoxide_z_prefix)
|
||||
|
||||
# Jump to a directory using only keywords.
|
||||
function __zoxide_z
|
||||
set -l argc (count $argv)
|
||||
if test $argc -eq 0
|
||||
__zoxide_cd $HOME
|
||||
else if test "$argv" = -
|
||||
__zoxide_cd -
|
||||
else if test $argc -eq 1 -a -d $argv[1]
|
||||
__zoxide_cd $argv[1]
|
||||
else if set -l result (string replace --regex $__zoxide_z_prefix_regex \'\' $argv[-1]); and test -n $result
|
||||
__zoxide_cd $result
|
||||
else
|
||||
set -l result (command zoxide query --exclude (__zoxide_pwd) -- $argv)
|
||||
and __zoxide_cd $result
|
||||
end
|
||||
end
|
||||
|
||||
# Completions.
|
||||
function __zoxide_z_complete
|
||||
set -l tokens (commandline --current-process --tokenize)
|
||||
set -l curr_tokens (commandline --cut-at-cursor --current-process --tokenize)
|
||||
|
||||
if test (count $tokens) -le 2 -a (count $curr_tokens) -eq 1
|
||||
# If there are < 2 arguments, use `cd` completions.
|
||||
complete --do-complete "\'\' "(commandline --cut-at-cursor --current-token) | string match --regex '.*/$'
|
||||
else if test (count $tokens) -eq (count $curr_tokens); and ! string match --quiet --regex $__zoxide_z_prefix_regex. $tokens[-1]
|
||||
# If the last argument is empty and the one before doesn't start with
|
||||
# $__zoxide_z_prefix, use interactive selection.
|
||||
set -l query $tokens[2..-1]
|
||||
set -l result (zoxide query --exclude (__zoxide_pwd) --interactive -- $query)
|
||||
and echo $__zoxide_z_prefix$result
|
||||
commandline --function repaint
|
||||
end
|
||||
end
|
||||
complete --command __zoxide_z --no-files --arguments '(__zoxide_z_complete)'
|
||||
|
||||
# Jump to a directory using interactive search.
|
||||
function __zoxide_zi
|
||||
set -l result (command zoxide query --interactive -- $argv)
|
||||
and __zoxide_cd $result
|
||||
end
|
||||
|
||||
# =============================================================================
|
||||
#
|
||||
# Commands for zoxide. Disable these using --no-cmd.
|
||||
#
|
||||
|
||||
abbr --erase z &>/dev/null
|
||||
alias z=__zoxide_z
|
||||
|
||||
abbr --erase zi &>/dev/null
|
||||
alias zi=__zoxide_zi
|
||||
|
||||
# =============================================================================
|
||||
#
|
||||
# To initialize zoxide, add this to your configuration (usually
|
||||
# ~/.config/fish/config.fish):
|
||||
#
|
||||
# zoxide init fish | source
|
||||
|
||||
direnv hook fish | source
|
||||
'';
|
||||
};
|
||||
}
|
||||
62
nix/programs/individual_configs/kitty.nix
Normal file
62
nix/programs/individual_configs/kitty.nix
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{
|
||||
programs.kitty = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
enable_audio_bell = "no";
|
||||
window_alert_on_bell = "no";
|
||||
background_opacity = "0.8";
|
||||
cursor_blink_interval = "0";
|
||||
window_padding_width = "1";
|
||||
shell_integration = "yes";
|
||||
sync_with_monitor = "no";
|
||||
|
||||
font_family = "JetBrainsMono Nerd Font Mono";
|
||||
bold_font = "JetBrainsMono Nerd Font Mono Extra Bold";
|
||||
italic_font = "JetBrainsMono Nerd Font Mono Extra Italic";
|
||||
bold_italic_font = "JetBrainsMono Nerd Font Mono Extra Bold Italic";
|
||||
|
||||
background = "#1a1b25";
|
||||
foreground = "#c5c8c6";
|
||||
|
||||
selection_background = "#b2ceee";
|
||||
selection_foreground = "#080808";
|
||||
|
||||
url_color = "#73daca";
|
||||
cursor = "#c0caf5";
|
||||
cursor_text_color = "#1a1b25";
|
||||
|
||||
active_tab_background = "#7aa2f7";
|
||||
active_tab_foreground = "#16161e";
|
||||
inactive_tab_background = "#292e42";
|
||||
inactive_tab_foreground = "#545c7e";
|
||||
|
||||
active_border_color = "#7aa2f7";
|
||||
inactive_border_color = "#292e42";
|
||||
|
||||
color0 = "#15161e";
|
||||
color1 = "#c94448";
|
||||
color2 = "#9ece6a";
|
||||
color3 = "#e0af68";
|
||||
color4 = "#7aa2f7";
|
||||
color5 = "#bb9af7";
|
||||
color6 = "#7dcfff";
|
||||
color7 = "#a9b1d6";
|
||||
|
||||
color8 = "#414868";
|
||||
color9 = "#f2201f";
|
||||
color10 = "#9ece6a";
|
||||
color11 = "#e0af68";
|
||||
color12 = "#7aa2f7";
|
||||
color13 = "#bb9af7";
|
||||
color14 = "#7dcfff";
|
||||
color15 = "#c0caf5";
|
||||
|
||||
color16 = "#ff9e64";
|
||||
color17 = "#db4b4b";
|
||||
|
||||
shell = "fish";
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
40
nix/programs/individual_configs/ncspot.nix
Normal file
40
nix/programs/individual_configs/ncspot.nix
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
{
|
||||
xdg.configFile."ncspot/config.toml" = {
|
||||
text = ''
|
||||
notify = true
|
||||
shuffle = true
|
||||
cover_max_scale = 2
|
||||
audio_cache_size = 50000
|
||||
initial_screen = "library"
|
||||
library_tabs = ["playlists"]
|
||||
[theme]
|
||||
background = "#1a1b26"
|
||||
primary = "#c0caf5"
|
||||
secondary = "#1a1b26"
|
||||
title = "#e0af68"
|
||||
playing = "#7dcfff"
|
||||
playing_selected = "#73daca"
|
||||
playing_bg = "#1a1b26"
|
||||
highlight = "#73daca"
|
||||
highlight_bg = "#1a1b26"
|
||||
error = "#c0caf5"
|
||||
error_bg = "#f7768e"
|
||||
statusbar = "#24283b"
|
||||
statusbar_progress = "#73daca"
|
||||
statusbar_bg = "#7dcfff"
|
||||
|
||||
cmdline_bg = "#24283b"
|
||||
search_match = "#bb9af7"
|
||||
|
||||
[keybindings]
|
||||
"j" = "move left 1"
|
||||
"k" = "move down 1"
|
||||
"l" = "move up 1"
|
||||
";" = "move right 1"
|
||||
|
||||
[notification_format]
|
||||
title = "%artists"
|
||||
body = "%title"
|
||||
'';
|
||||
};
|
||||
}
|
||||
1494
nix/programs/individual_configs/yazi.nix
Normal file
1494
nix/programs/individual_configs/yazi.nix
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue