task | reformatted with nixfmt
This commit is contained in:
parent
e3fea64660
commit
c3a0a0847f
119 changed files with 1010 additions and 2135 deletions
|
|
@ -1,9 +1,5 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [./bash_complition.nix];
|
||||
{ config, pkgs, ... }: {
|
||||
imports = [ ./bash_complition.nix ];
|
||||
home.file.".bash_local".source = files/bash/bash_local;
|
||||
home.file.".bash_aliases".source = files/bash/bash_aliases;
|
||||
home.file.".bash_functions".source = files/bash/bash_functions;
|
||||
|
|
@ -11,7 +7,8 @@
|
|||
home.file.".bash_keychain".source = files/bash/bash_keychain;
|
||||
home.file.".bash_logout".source = files/bash/bash_logout;
|
||||
home.file.".bash_motd".source = files/bash/bash_motd;
|
||||
home.file.".bash_motd_ownscript.sh".source = files/bash/bash_motd_ownscript.sh;
|
||||
home.file.".bash_motd_ownscript.sh".source =
|
||||
files/bash/bash_motd_ownscript.sh;
|
||||
home.file.".bash_profile".source = files/bash/bash_profile;
|
||||
home.file.".bashrc".source = files/bash/bashrc;
|
||||
home.file.".bash_ssh".source = files/bash/bash_ssh;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }: {
|
||||
home.file = {
|
||||
doascomplete = {
|
||||
enable = true;
|
||||
|
|
@ -10,36 +10,36 @@
|
|||
_init_completion -s || return
|
||||
|
||||
local i mode=normal
|
||||
[[ ''$1 == *doasedit ]] && mode=edit
|
||||
[[ $1 == *doasedit ]] && mode=edit
|
||||
|
||||
[[ ''$mode == normal ]] &&
|
||||
[[ $mode == normal ]] &&
|
||||
for ((i = 1; i <= cword; i++)); do
|
||||
if [[ ''${words[i]} != -* ]]; then
|
||||
local PATH=''$PATH:/sbin:/usr/sbin:/usr/local/sbin
|
||||
local PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
|
||||
local root_command=''${words[i]}
|
||||
_command_offset ''$i
|
||||
_command_offset $i
|
||||
return
|
||||
fi
|
||||
[[ ''${words[i]} == -@(!(-*)[uUgCp]) ]] &&
|
||||
((i++))
|
||||
done
|
||||
|
||||
case "''$prev" in
|
||||
case "$prev" in
|
||||
-u)
|
||||
COMPREPLY=(''$(compgen -u -- "''$cur"))
|
||||
COMPREPLY=($(compgen -u -- "$cur"))
|
||||
return
|
||||
;;
|
||||
esac
|
||||
|
||||
''$split && return
|
||||
$split && return
|
||||
|
||||
if [[ ''$cur == -* ]]; then
|
||||
local opts=''$(_parse_help "''$1")
|
||||
COMPREPLY=(''$(compgen -W ' ''${opts:-''$(_parse_usage "''$1")}' -- "''$cur"))
|
||||
if [[ $cur == -* ]]; then
|
||||
local opts=$(_parse_help "$1")
|
||||
COMPREPLY=($(compgen -W ' ''${opts:-$(_parse_usage "$1")}' -- "$cur"))
|
||||
[[ ''${COMPREPLY-} == *= ]] && compopt -o nospace
|
||||
return
|
||||
fi
|
||||
if [[ ''$mode == edit ]]; then
|
||||
if [[ $mode == edit ]]; then
|
||||
_filedir
|
||||
fi
|
||||
} &&
|
||||
|
|
@ -105,26 +105,26 @@
|
|||
taskcommand='task rc.verbose:nothing rc.confirmation:no rc.hooks:off'
|
||||
|
||||
_task_get_tags() {
|
||||
''$taskcommand _tags
|
||||
$taskcommand _tags
|
||||
}
|
||||
|
||||
_task_get_config() {
|
||||
''$taskcommand _config
|
||||
$taskcommand _config
|
||||
}
|
||||
|
||||
_task_offer_priorities() {
|
||||
COMPREPLY=( ''$(compgen -W "L M H" -- ''${cur/*:/}) )
|
||||
COMPREPLY=( $(compgen -W "L M H" -- ''${cur/*:/}) )
|
||||
}
|
||||
|
||||
_task_offer_projects() {
|
||||
COMPREPLY=( ''$(compgen -W "''$(''$taskcommand _projects)" -- ''${cur/*:/}) )
|
||||
COMPREPLY=( $(compgen -W "$($taskcommand _projects)" -- ''${cur/*:/}) )
|
||||
}
|
||||
|
||||
_task_offer_contexts() {
|
||||
COMPREPLY=( ''$(compgen -W "''$(''$taskcommand _context) define delete list none show" -- ''$cur) )
|
||||
COMPREPLY=( $(compgen -W "$($taskcommand _context) define delete list none show" -- $cur) )
|
||||
}
|
||||
|
||||
_task_context_alias=''$(''$taskcommand show | grep alias.*context | cut -d' ' -f1 | cut -d. -f2)
|
||||
_task_context_alias=$($taskcommand show | grep alias.*context | cut -d' ' -f1 | cut -d. -f2)
|
||||
|
||||
_task()
|
||||
{
|
||||
|
|
@ -144,25 +144,25 @@
|
|||
# echo "prev='''$prev'"
|
||||
# echo "prev2='''$prev2'"
|
||||
|
||||
abbrev_min=''$(''$taskcommand show | grep "abbreviation.minimum" | awk {'print ''$2'})
|
||||
commands_aliases=''$(echo ''$(''$taskcommand _commands; ''$taskcommand _aliases) | tr " " "\n"|sort|tr "\n" " ")
|
||||
opts="''$commands_aliases ''$(''$taskcommand _columns)"
|
||||
abbrev_min=$($taskcommand show | grep "abbreviation.minimum" | awk {'print $2'})
|
||||
commands_aliases=$(echo $($taskcommand _commands; $taskcommand _aliases) | tr " " "\n"|sort|tr "\n" " ")
|
||||
opts="$commands_aliases $($taskcommand _columns)"
|
||||
|
||||
case "''${prev}" in
|
||||
''$_task_context_alias|cont|conte|contex|context)
|
||||
$_task_context_alias|cont|conte|contex|context)
|
||||
_task_offer_contexts
|
||||
return 0
|
||||
;;
|
||||
:)
|
||||
case "''${prev2}" in
|
||||
pri|prior|priori|priorit|priority)
|
||||
if [ ''${#prev2} -ge ''$abbrev_min ]; then
|
||||
if [ ''${#prev2} -ge $abbrev_min ]; then
|
||||
_task_offer_priorities
|
||||
fi
|
||||
return 0
|
||||
;;
|
||||
pro|proj|proje|projec|project)
|
||||
if [ ''${#prev2} -ge ''$abbrev_min ]; then
|
||||
if [ ''${#prev2} -ge $abbrev_min ]; then
|
||||
_task_offer_projects
|
||||
fi
|
||||
return 0
|
||||
|
|
@ -187,13 +187,13 @@
|
|||
:)
|
||||
case "''${prev}" in
|
||||
pri|prior|priori|priorit|priority)
|
||||
if [ ''${#prev} -ge ''$abbrev_min ]; then
|
||||
if [ ''${#prev} -ge $abbrev_min ]; then
|
||||
_task_offer_priorities
|
||||
fi
|
||||
return 0
|
||||
;;
|
||||
pro|proj|proje|projec|project)
|
||||
if [ ''${#prev} -ge ''$abbrev_min ]; then
|
||||
if [ ''${#prev} -ge $abbrev_min ]; then
|
||||
_task_offer_projects
|
||||
fi
|
||||
return 0
|
||||
|
|
@ -212,24 +212,24 @@
|
|||
esac
|
||||
;;
|
||||
+*)
|
||||
local tags=''$(_task_get_tags | sed 's/^/+/')
|
||||
COMPREPLY=( ''$(compgen -W "''${tags}" -- ''${cur}) )
|
||||
local tags=$(_task_get_tags | sed 's/^/+/')
|
||||
COMPREPLY=( $(compgen -W "''${tags}" -- ''${cur}) )
|
||||
return 0
|
||||
;;
|
||||
-*)
|
||||
local tags=''$(_task_get_tags | sed 's/^/-/')
|
||||
COMPREPLY=( ''$(compgen -W "''${tags}" -- ''${cur}) )
|
||||
local tags=$(_task_get_tags | sed 's/^/-/')
|
||||
COMPREPLY=( $(compgen -W "''${tags}" -- ''${cur}) )
|
||||
return 0
|
||||
;;
|
||||
rc.*)
|
||||
local config=''$(_task_get_config | sed -e 's/^/rc\./' -e 's/''$/:/')
|
||||
COMPREPLY=( ''$(compgen -W "''${config}" -- ''${cur}) )
|
||||
local config=$(_task_get_config | sed -e 's/^/rc\./' -e 's/$/:/')
|
||||
COMPREPLY=( $(compgen -W "''${config}" -- ''${cur}) )
|
||||
return 0
|
||||
;;
|
||||
*)
|
||||
case "''${prev}" in
|
||||
import)
|
||||
COMPREPLY=( ''$(compgen -o "default" -- ''${cur}) )
|
||||
COMPREPLY=( $(compgen -o "default" -- ''${cur}) )
|
||||
return 0
|
||||
;;
|
||||
esac
|
||||
|
|
@ -238,7 +238,7 @@
|
|||
;;
|
||||
esac
|
||||
|
||||
COMPREPLY=( ''$(compgen -W "''${opts}" -- ''${cur}) )
|
||||
COMPREPLY=( $(compgen -W "''${opts}" -- ''${cur}) )
|
||||
return 0
|
||||
}
|
||||
complete -o nospace -F _task task
|
||||
|
|
@ -272,7 +272,7 @@
|
|||
|
||||
function __get_help_items()
|
||||
{
|
||||
echo -e "''$( __get_commands ) interval hints date duration dom"
|
||||
echo -e "$( __get_commands ) interval hints date duration dom"
|
||||
}
|
||||
|
||||
function __get_options()
|
||||
|
|
@ -283,7 +283,7 @@
|
|||
function __get_ids()
|
||||
{
|
||||
local count
|
||||
count="''$( timew get dom.tracked.count )"
|
||||
count="$( timew get dom.tracked.count )"
|
||||
if [[ "''${count}" -eq "0" ]] ; then
|
||||
echo ""
|
||||
else
|
||||
|
|
@ -293,12 +293,12 @@
|
|||
|
||||
function __get_tags()
|
||||
{
|
||||
timew tags | tail -n +4 -- | sed -e "s|[[:space:]]*-''$||"
|
||||
timew tags | tail -n +4 -- | sed -e "s|[[:space:]]*-$||"
|
||||
}
|
||||
|
||||
function __get_extensions()
|
||||
{
|
||||
timew extensions | awk '{if(NR>6)print ''$1}'
|
||||
timew extensions | awk '{if(NR>6)print $1}'
|
||||
}
|
||||
|
||||
function __has_entered_id()
|
||||
|
|
@ -314,7 +314,7 @@
|
|||
|
||||
function __has_entered_subcommand()
|
||||
{
|
||||
local subcommands=''$( __get_subcommands "''${1}" )
|
||||
local subcommands=$( __get_subcommands "''${1}" )
|
||||
|
||||
for word in "''${COMP_WORDS[@]}" ; do
|
||||
for cmd in ''${subcommands} ; do
|
||||
|
|
@ -329,7 +329,7 @@
|
|||
|
||||
function __has_entered_help_item()
|
||||
{
|
||||
local items=''$( __get_help_items )
|
||||
local items=$( __get_help_items )
|
||||
|
||||
for word in "''${COMP_WORDS[@]:2}" ; do
|
||||
for item in ''${items} ; do
|
||||
|
|
@ -358,17 +358,17 @@
|
|||
local line wordlist
|
||||
|
||||
declare -a wordlist
|
||||
while IFS=''$'\n' read -r line ; do
|
||||
while IFS=$'\n' read -r line ; do
|
||||
wordlist+=( "''${line}" )
|
||||
done <<< "''$( __get_tags )"
|
||||
done <<< "$( __get_tags )"
|
||||
|
||||
declare -a completions
|
||||
while read -r line ; do
|
||||
completions+=( "''${line}" )
|
||||
done < <( compgen -W "''$(printf '%q ' "''${wordlist[@]}")" -- "''${cur}" 2>/dev/null )
|
||||
done < <( compgen -W "$(printf '%q ' "''${wordlist[@]}")" -- "''${cur}" 2>/dev/null )
|
||||
|
||||
for completion in "''${completions[@]}" ; do
|
||||
COMPREPLY+=( "''$(printf "%q" "''${completion}")" )
|
||||
COMPREPLY+=( "$(printf "%q" "''${completion}")" )
|
||||
done
|
||||
}
|
||||
|
||||
|
|
@ -385,7 +385,7 @@
|
|||
wordlist=""
|
||||
;;
|
||||
annotate|continue|delete|join|lengthen|move|resize|shorten|split)
|
||||
wordlist=''$( __get_ids )
|
||||
wordlist=$( __get_ids )
|
||||
;;
|
||||
export|gaps|start|stop|summary|tags|track)
|
||||
__complete_tag
|
||||
|
|
@ -393,40 +393,40 @@
|
|||
;;
|
||||
modify)
|
||||
if __has_entered_subcommand "''${first}" ; then
|
||||
wordlist=''$( __get_ids )
|
||||
wordlist=$( __get_ids )
|
||||
else
|
||||
wordlist=''$( __get_subcommands "''${first}" )
|
||||
wordlist=$( __get_subcommands "''${first}" )
|
||||
fi
|
||||
;;
|
||||
tag|untag)
|
||||
if __is_entering_id ; then
|
||||
wordlist=''$( __get_ids )
|
||||
wordlist=$( __get_ids )
|
||||
elif __has_entered_id ; then
|
||||
__complete_tag
|
||||
return
|
||||
else
|
||||
wordlist=''$( __get_ids )
|
||||
wordlist=$( __get_ids )
|
||||
fi
|
||||
;;
|
||||
report)
|
||||
wordlist=''$( __get_extensions )
|
||||
wordlist=$( __get_extensions )
|
||||
;;
|
||||
help)
|
||||
if __has_entered_help_item ; then
|
||||
wordlist=""
|
||||
else
|
||||
wordlist=''$( __get_help_items )
|
||||
wordlist=$( __get_help_items )
|
||||
fi
|
||||
;;
|
||||
-*)
|
||||
wordlist=''$( __get_options )
|
||||
wordlist=$( __get_options )
|
||||
;;
|
||||
*)
|
||||
wordlist=''$( __get_commands )
|
||||
wordlist=$( __get_commands )
|
||||
;;
|
||||
esac
|
||||
|
||||
COMPREPLY=(''$( compgen -W "''${wordlist}" -- "''${cur}" ))
|
||||
COMPREPLY=($( compgen -W "''${wordlist}" -- "''${cur}" ))
|
||||
}
|
||||
|
||||
complete -F _timew timew
|
||||
|
|
|
|||
|
|
@ -1,13 +1,7 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
{ config, pkgs, ... }: {
|
||||
#home.packages = with pkgs; [ btop ];
|
||||
programs.btop = {
|
||||
enable = true;
|
||||
settings = {
|
||||
proc_gradient = false;
|
||||
};
|
||||
settings = { proc_gradient = false; };
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,100 +1,98 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }: {
|
||||
programs.neovim = {
|
||||
plugins = with pkgs.vimPlugins; [
|
||||
{
|
||||
plugin = bufferline-nvim;
|
||||
type = "lua";
|
||||
config = ''
|
||||
require("bufferline").setup({
|
||||
options = {
|
||||
close_command = "bdelete! %d", -- can be a string | function, see "Mouse actions"
|
||||
right_mouse_command = "bdelete! %d", -- can be a string | function, see "Mouse actions"
|
||||
offsets = { { filetype = "NvimTree", text = "", padding = 1 } },
|
||||
separator_style = "thin", -- | "thick" | "thin" | { 'any', 'any' },
|
||||
plugins = with pkgs.vimPlugins; [{
|
||||
plugin = bufferline-nvim;
|
||||
type = "lua";
|
||||
config = ''
|
||||
require("bufferline").setup({
|
||||
options = {
|
||||
close_command = "bdelete! %d", -- can be a string | function, see "Mouse actions"
|
||||
right_mouse_command = "bdelete! %d", -- can be a string | function, see "Mouse actions"
|
||||
offsets = { { filetype = "NvimTree", text = "", padding = 1 } },
|
||||
separator_style = "thin", -- | "thick" | "thin" | { 'any', 'any' },
|
||||
},
|
||||
highlights = {
|
||||
fill = {
|
||||
fg = "#ff0000",
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
highlights = {
|
||||
fill = {
|
||||
fg = "#ff0000",
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
background = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
|
||||
buffer_visible = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
|
||||
close_button = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
close_button_visible = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
|
||||
tab_selected = {
|
||||
fg = { attribute = "fg", highlight = "Normal" },
|
||||
bg = { attribute = "bg", highlight = "Normal" },
|
||||
},
|
||||
tab = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
tab_close = {
|
||||
fg = { attribute = "fg", highlight = "TabLineSel" },
|
||||
bg = { attribute = "bg", highlight = "Normal" },
|
||||
},
|
||||
|
||||
duplicate_selected = {
|
||||
fg = { attribute = "fg", highlight = "TabLineSel" },
|
||||
bg = { attribute = "bg", highlight = "TabLineSel" },
|
||||
italic = true,
|
||||
},
|
||||
duplicate_visible = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
italic = true,
|
||||
},
|
||||
duplicate = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
italic = true,
|
||||
},
|
||||
|
||||
modified = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
modified_selected = {
|
||||
fg = { attribute = "fg", highlight = "Normal" },
|
||||
bg = { attribute = "bg", highlight = "Normal" },
|
||||
},
|
||||
modified_visible = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
|
||||
separator = {
|
||||
fg = { attribute = "bg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
separator_selected = {
|
||||
fg = { attribute = "bg", highlight = "Normal" },
|
||||
bg = { attribute = "bg", highlight = "Normal" },
|
||||
},
|
||||
indicator_selected = {
|
||||
fg = { attribute = "fg", highlight = "LspDiagnosticsDefaultHint" },
|
||||
bg = { attribute = "bg", highlight = "Normal" },
|
||||
},
|
||||
background = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
})
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
buffer_visible = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
|
||||
close_button = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
close_button_visible = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
|
||||
tab_selected = {
|
||||
fg = { attribute = "fg", highlight = "Normal" },
|
||||
bg = { attribute = "bg", highlight = "Normal" },
|
||||
},
|
||||
tab = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
tab_close = {
|
||||
fg = { attribute = "fg", highlight = "TabLineSel" },
|
||||
bg = { attribute = "bg", highlight = "Normal" },
|
||||
},
|
||||
|
||||
duplicate_selected = {
|
||||
fg = { attribute = "fg", highlight = "TabLineSel" },
|
||||
bg = { attribute = "bg", highlight = "TabLineSel" },
|
||||
italic = true,
|
||||
},
|
||||
duplicate_visible = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
italic = true,
|
||||
},
|
||||
duplicate = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
italic = true,
|
||||
},
|
||||
|
||||
modified = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
modified_selected = {
|
||||
fg = { attribute = "fg", highlight = "Normal" },
|
||||
bg = { attribute = "bg", highlight = "Normal" },
|
||||
},
|
||||
modified_visible = {
|
||||
fg = { attribute = "fg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
|
||||
separator = {
|
||||
fg = { attribute = "bg", highlight = "TabLine" },
|
||||
bg = { attribute = "bg", highlight = "TabLine" },
|
||||
},
|
||||
separator_selected = {
|
||||
fg = { attribute = "bg", highlight = "Normal" },
|
||||
bg = { attribute = "bg", highlight = "Normal" },
|
||||
},
|
||||
indicator_selected = {
|
||||
fg = { attribute = "fg", highlight = "LspDiagnosticsDefaultHint" },
|
||||
bg = { attribute = "bg", highlight = "Normal" },
|
||||
},
|
||||
},
|
||||
})
|
||||
'';
|
||||
}];
|
||||
};
|
||||
}
|
||||
# vim: shiftwidth=2 tabstop=2 expandtab
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
{ pkgs, config, ... }: {
|
||||
catppuccin = {
|
||||
enable = true;
|
||||
flavor = "mocha";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
{ config, pkgs, ... }: {
|
||||
imports = [
|
||||
./bash.nix
|
||||
./btop.nix
|
||||
|
|
@ -94,9 +90,7 @@
|
|||
zip
|
||||
];
|
||||
services = {
|
||||
syncthing = {
|
||||
tray.enable = true;
|
||||
};
|
||||
syncthing = { tray.enable = true; };
|
||||
gpg-agent = {
|
||||
enable = true;
|
||||
defaultCacheTtl = 1800;
|
||||
|
|
@ -108,7 +102,8 @@
|
|||
enable = true;
|
||||
enableBashIntegration = true;
|
||||
agents = "ssh";
|
||||
keys = "id_aur id_dsa id_ed25519 id_rsa 56913AD86A18257132AA9F03928BC0B78C1BF5AA";
|
||||
keys =
|
||||
"id_aur id_dsa id_ed25519 id_rsa 56913AD86A18257132AA9F03928BC0B78C1BF5AA";
|
||||
inheritType = "any";
|
||||
};
|
||||
home.file.".links/links.cfg".source = files/links.cfg;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,5 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
programs.lazygit = {
|
||||
settings = {
|
||||
os.editPreset = "lvim";
|
||||
};
|
||||
};
|
||||
{ pkgs, config, ... }: {
|
||||
programs.lazygit = { settings = { os.editPreset = "lvim"; }; };
|
||||
programs.git = {
|
||||
enable = true;
|
||||
aliases = {
|
||||
|
|
@ -17,9 +9,7 @@
|
|||
st = "status";
|
||||
last = "cat-file commit HEAD";
|
||||
};
|
||||
diff-so-fancy = {
|
||||
enable = true;
|
||||
};
|
||||
diff-so-fancy = { enable = true; };
|
||||
extraConfig = {
|
||||
core = {
|
||||
user = "Don Harper";
|
||||
|
|
@ -27,9 +17,7 @@
|
|||
editor = "${pkgs.lunarvim}/bin/lvim";
|
||||
sshCommand = "${pkgs.openssh}/bin/ssh -i ~/.ssh/git";
|
||||
};
|
||||
safe = {
|
||||
directory = "/home/don/src/nixos/duckland/.git";
|
||||
};
|
||||
safe = { directory = "/home/don/src/nixos/duckland/.git"; };
|
||||
status = {
|
||||
submoduleSummary = "true";
|
||||
short = "true";
|
||||
|
|
@ -38,21 +26,14 @@
|
|||
name = "Don Harper";
|
||||
email = "duck@duckland.org";
|
||||
};
|
||||
push = {
|
||||
default = "simple";
|
||||
};
|
||||
pull = {
|
||||
rebase = "false";
|
||||
};
|
||||
push = { default = "simple"; };
|
||||
pull = { rebase = "false"; };
|
||||
git-extras = {
|
||||
github-personal-access-token = "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";
|
||||
};
|
||||
fetch = {
|
||||
prune = "true";
|
||||
};
|
||||
init = {
|
||||
defaultBranch = "main";
|
||||
github-personal-access-token =
|
||||
"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";
|
||||
};
|
||||
fetch = { prune = "true"; };
|
||||
init = { defaultBranch = "main"; };
|
||||
credential = {
|
||||
"https://github.com" = {
|
||||
helper = "!${pkgs.gh}/bin/gh auth git-credential";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{...}: {
|
||||
{ ... }: {
|
||||
programs.gpg = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [khal];
|
||||
{ pkgs, ... }: {
|
||||
home.packages = with pkgs; [ khal ];
|
||||
xdg.configFile."khal/config".text = ''
|
||||
[calendars]
|
||||
[[work]]
|
||||
|
|
|
|||
|
|
@ -1,18 +1,11 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
{ config, pkgs, ... }: {
|
||||
programs.khard = {
|
||||
enable = true;
|
||||
settings = {
|
||||
general = {
|
||||
default_action = "list";
|
||||
editor = "${pkgs.neovim}/bin/nvim";
|
||||
merge_editor = [
|
||||
"${pkgs.neovim}/bin/nvim"
|
||||
"-d"
|
||||
];
|
||||
merge_editor = [ "${pkgs.neovim}/bin/nvim" "-d" ];
|
||||
};
|
||||
"contact table" = {
|
||||
display = "first_name";
|
||||
|
|
@ -22,24 +15,11 @@
|
|||
show_uids = "no";
|
||||
sort = "last_name";
|
||||
localize_dates = "yes";
|
||||
preferred_phone_number_type = [
|
||||
"pref"
|
||||
"cell"
|
||||
"home"
|
||||
];
|
||||
preferred_email_address_type = [
|
||||
"pref"
|
||||
"work"
|
||||
"home"
|
||||
];
|
||||
preferred_phone_number_type = [ "pref" "cell" "home" ];
|
||||
preferred_email_address_type = [ "pref" "work" "home" ];
|
||||
};
|
||||
vcard = {
|
||||
private_objects = [
|
||||
"Jabber"
|
||||
"Skype"
|
||||
"Twitter"
|
||||
"Mastodon"
|
||||
];
|
||||
private_objects = [ "Jabber" "Skype" "Twitter" "Mastodon" ];
|
||||
preferred_version = "3.0";
|
||||
search_in_source_files = "no";
|
||||
skip_unparsable = "no";
|
||||
|
|
|
|||
|
|
@ -1,14 +1,10 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
{ pkgs, config, ... }: {
|
||||
xdg.configFile."lf/icons".source = ./icons;
|
||||
|
||||
programs.lf = {
|
||||
enable = true;
|
||||
commands = {
|
||||
editor-open = ''$$EDITOR $f'';
|
||||
editor-open = "$$EDITOR $f";
|
||||
mkdir = ''
|
||||
''${{
|
||||
printf "Directory Name: "
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [liquidprompt];
|
||||
{ pkgs, ... }: {
|
||||
home.packages = with pkgs; [ liquidprompt ];
|
||||
xdg.configFile."liquidpromptrc".text = ''
|
||||
source ~/.config/liquidprompt.theme
|
||||
LOCAL_RCFILE=$HOME/.config/liquidpromptrc.local
|
||||
|
|
|
|||
|
|
@ -1,9 +1,5 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
home.packages = with pkgs; [listadmin];
|
||||
{ config, pkgs, ... }: {
|
||||
home.packages = with pkgs; [ listadmin ];
|
||||
home.file."listadmin.ini" = {
|
||||
enable = true;
|
||||
target = ".listadmin.ini";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
{ config, pkgs, ... }: {
|
||||
accounts.email.accounts = {
|
||||
"don@donharper.org" = {
|
||||
primary = true;
|
||||
|
|
@ -17,7 +13,7 @@
|
|||
programs.notmuch = {
|
||||
enable = true;
|
||||
new = {
|
||||
tags = ["unread"];
|
||||
tags = [ "unread" ];
|
||||
ignore = [
|
||||
".mbsyncstate"
|
||||
".uidvalidity"
|
||||
|
|
@ -26,11 +22,7 @@
|
|||
".mbsyncstate.lock"
|
||||
];
|
||||
};
|
||||
extraConfig = {
|
||||
database = {
|
||||
path = "/home/don/Mail";
|
||||
};
|
||||
};
|
||||
extraConfig = { database = { path = "/home/don/Mail"; }; };
|
||||
};
|
||||
|
||||
xdg.configFile."neomutt/neomuttrc".source = ./files/neomutt/neomuttrc;
|
||||
|
|
@ -49,9 +41,7 @@
|
|||
OnUnitActiveSec = "5m";
|
||||
AccuracySec = "1m";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = ["timers.target"];
|
||||
};
|
||||
Install = { WantedBy = [ "timers.target" ]; };
|
||||
};
|
||||
|
||||
services.mbsync = {
|
||||
|
|
@ -60,9 +50,7 @@
|
|||
Environment = "PATH=/run/current-system/sw/bin";
|
||||
Type = "oneshot";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = ["mbsync.timer"];
|
||||
};
|
||||
Install = { WantedBy = [ "mbsync.timer" ]; };
|
||||
};
|
||||
|
||||
services."mbsync-all" = {
|
||||
|
|
@ -71,9 +59,7 @@
|
|||
Environment = "PATH=/run/current-system/sw/bin";
|
||||
Type = "oneshot";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = ["mbsync-all.timer"];
|
||||
};
|
||||
Install = { WantedBy = [ "mbsync-all.timer" ]; };
|
||||
};
|
||||
|
||||
timers."mbsync-all" = {
|
||||
|
|
@ -81,9 +67,7 @@
|
|||
AccuracySec = "1m";
|
||||
OnUnitActiveSec = "14m";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = ["timers.target"];
|
||||
};
|
||||
Install = { WantedBy = [ "timers.target" ]; };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,8 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
{ pkgs, config, ... }: {
|
||||
services = {
|
||||
mopidy = {
|
||||
enable = true;
|
||||
extensionPackages = with pkgs; [
|
||||
mopidy-mpd
|
||||
mopidy-subidy
|
||||
mopidy-moped
|
||||
];
|
||||
extensionPackages = with pkgs; [ mopidy-mpd mopidy-subidy mopidy-moped ];
|
||||
settings = {
|
||||
http = {
|
||||
enabled = true;
|
||||
|
|
@ -26,9 +18,7 @@
|
|||
password = "D4u5c3k!@";
|
||||
albumartistsort = false;
|
||||
};
|
||||
mpd = {
|
||||
enabled = true;
|
||||
};
|
||||
mpd = { enabled = true; };
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
{ config, pkgs, ... }: {
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
defaultEditor = false;
|
||||
|
|
@ -63,7 +59,5 @@
|
|||
vimux
|
||||
];
|
||||
};
|
||||
imports = [
|
||||
./bufferline.nix
|
||||
];
|
||||
imports = [ ./bufferline.nix ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
{ config, pkgs, ... }: {
|
||||
programs.newsboat = {
|
||||
enable = true;
|
||||
autoReload = true;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }: {
|
||||
home.packages = with pkgs; [
|
||||
taskwarrior2
|
||||
taskwarrior-tui
|
||||
|
|
@ -13,9 +13,7 @@
|
|||
dataLocation = "~/.task";
|
||||
config = {
|
||||
weekstart = "Monday";
|
||||
burndown = {
|
||||
cumulative = 0;
|
||||
};
|
||||
burndown = { cumulative = 0; };
|
||||
journal = {
|
||||
info = "no";
|
||||
time = "yes";
|
||||
|
|
@ -35,8 +33,10 @@
|
|||
report = {
|
||||
_reviewed = {
|
||||
columns = "uuid";
|
||||
description = "Tasksh review report. Adjust the filter to your needs.";
|
||||
filter = "( reviewed.none: or reviewed.before:now-4weeks ) and ( +PENDING or +WAITING ) and -someday and project.not:books";
|
||||
description =
|
||||
"Tasksh review report. Adjust the filter to your needs.";
|
||||
filter =
|
||||
"( reviewed.none: or reviewed.before:now-4weeks ) and ( +PENDING or +WAITING ) and -someday and project.not:books";
|
||||
sort = "reviewed+,modified+";
|
||||
};
|
||||
mine = {
|
||||
|
|
@ -48,25 +48,33 @@
|
|||
};
|
||||
next.filter = " status:pending limit:page -BLOCKED -someday -WAITING";
|
||||
inbox = {
|
||||
columns = " id,start.age,entry.age,depends,priority,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency";
|
||||
columns =
|
||||
" id,start.age,entry.age,depends,priority,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency";
|
||||
description = "list inbox items";
|
||||
filter = " status:pending limit:10 -BLOCKED -someday -WAITING proj:inbox";
|
||||
labels = " ID,Active,Age,Deps,P,Project,Tag,Recur,S,Due,Until,Description,Urg";
|
||||
filter =
|
||||
" status:pending limit:10 -BLOCKED -someday -WAITING proj:inbox";
|
||||
labels =
|
||||
" ID,Active,Age,Deps,P,Project,Tag,Recur,S,Due,Until,Description,Urg";
|
||||
sort = " urgency-";
|
||||
context = " 0";
|
||||
};
|
||||
waiting = {
|
||||
columns = " id,start.age,entry.age,depends,priority,project,tags,recur,wait,due,until.remaining,description,urgency";
|
||||
columns =
|
||||
" id,start.age,entry.age,depends,priority,project,tags,recur,wait,due,until.remaining,description,urgency";
|
||||
description = "Waiting";
|
||||
filter = " status.not:deleted status.not:completed -BLOCKED -someday +WAITING";
|
||||
labels = " ID,Active,Age,Deps,P,Project,Tag,Recur,Wait til,Due,Until,Description,Urg";
|
||||
filter =
|
||||
" status.not:deleted status.not:completed -BLOCKED -someday +WAITING";
|
||||
labels =
|
||||
" ID,Active,Age,Deps,P,Project,Tag,Recur,Wait til,Due,Until,Description,Urg";
|
||||
sort = " wait";
|
||||
};
|
||||
nnext = {
|
||||
columns = " id,start.age,entry.age,depends,priority,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency";
|
||||
columns =
|
||||
" id,start.age,entry.age,depends,priority,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency";
|
||||
description = "Next 10 list";
|
||||
filter = " status:pending limit:10 -BLOCKED -someday -WAITING";
|
||||
labels = " ID,Active,Age,Deps,P,Project,Tag,Recur,S,Due,Until,Description,Urg";
|
||||
labels =
|
||||
" ID,Active,Age,Deps,P,Project,Tag,Recur,S,Due,Until,Description,Urg";
|
||||
sort = " urgency-";
|
||||
};
|
||||
title = {
|
||||
|
|
@ -78,23 +86,28 @@
|
|||
sort = " description+";
|
||||
};
|
||||
anext = {
|
||||
columns = " id,start.age,entry.age,depends,priority,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency";
|
||||
columns =
|
||||
" id,start.age,entry.age,depends,priority,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency";
|
||||
description = "Next 10 list";
|
||||
filter = " status:pending limit:10 -BLOCKED -WAITING";
|
||||
labels = " ID,Active,Age,Deps,P,Project,Tag,Recur,S,Due,Until,Description,Urg";
|
||||
labels =
|
||||
" ID,Active,Age,Deps,P,Project,Tag,Recur,S,Due,Until,Description,Urg";
|
||||
sort = " urgency-";
|
||||
};
|
||||
last = {
|
||||
columns = " id,start.age,entry.age,depends,priority,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency";
|
||||
columns =
|
||||
" id,start.age,entry.age,depends,priority,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency";
|
||||
description = "Oldest 10 list";
|
||||
filter = " status:pending limit:10 -BLOCKED -someday -WAITING";
|
||||
labels = " ID,Active,Age,Deps,P,Project,Tag,Recur,S,Due,Until,Description,Urg";
|
||||
labels =
|
||||
" ID,Active,Age,Deps,P,Project,Tag,Recur,S,Due,Until,Description,Urg";
|
||||
sort = " entry+";
|
||||
};
|
||||
inboxdash = {
|
||||
columns = " id,project,description.count";
|
||||
description = "Inbox for dashboards";
|
||||
filter = " status:pending limit:10 -BLOCKED -someday -WAITING proj:inbox";
|
||||
filter =
|
||||
" status:pending limit:10 -BLOCKED -someday -WAITING proj:inbox";
|
||||
labels = " ID,Project,Description";
|
||||
sort = " urgency-";
|
||||
};
|
||||
|
|
@ -106,7 +119,8 @@
|
|||
sort = " urgency-";
|
||||
};
|
||||
mail = {
|
||||
columns = " id,priority,project,due.relative,until.remaining,description.count,urgency";
|
||||
columns =
|
||||
" id,priority,project,due.relative,until.remaining,description.count,urgency";
|
||||
description = "Next 5 list";
|
||||
filter = " status:pending limit:5 -BLOCKED -someday -WAITING";
|
||||
labels = " ID,P,Project,Due,Until,Description,Urg";
|
||||
|
|
@ -115,13 +129,15 @@
|
|||
followup = {
|
||||
columns = " id,start.age,entry.age,priority,project,description";
|
||||
description = "Someday list";
|
||||
filter = " status.not:completed status.not:deleted -BLOCKED +followup";
|
||||
filter =
|
||||
" status.not:completed status.not:deleted -BLOCKED +followup";
|
||||
labels = " ID,Active,Age,P,Project,Description";
|
||||
sort = " project,urgency-";
|
||||
context = " 0";
|
||||
};
|
||||
someday = {
|
||||
columns = " id,start.age,entry.age,priority,project,description,urgency";
|
||||
columns =
|
||||
" id,start.age,entry.age,priority,project,description,urgency";
|
||||
description = "Someday list";
|
||||
filter = " status:pending -BLOCKED +someday limit:page -WAITING";
|
||||
labels = " ID,Active,Age,P,Project,Description,Urg";
|
||||
|
|
@ -133,7 +149,8 @@
|
|||
taskd = {
|
||||
ca = "/home/don/.task/ca.cert.pem";
|
||||
certificate = "/home/don/.task/don_harper.cert.pem";
|
||||
credentials = "duckland.org/Don Harper/de27c234-6217-4e8b-83c1-2ea840bac55f";
|
||||
credentials =
|
||||
"duckland.org/Don Harper/de27c234-6217-4e8b-83c1-2ea840bac55f";
|
||||
key = "/home/don/.task/don_harper.key.pem";
|
||||
server = "task.duckland.org:53589";
|
||||
recurrence = "on";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }: {
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
aggressiveResize = true;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,4 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
{ config, pkgs, ... }: {
|
||||
programs.topgrade = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }: {
|
||||
programs.vifm = {
|
||||
enable = true;
|
||||
extraConfig = ''
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue