geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 7 Pull requests Releases Activity

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
Geoffrey Frogeye 2023-12-20 14:09:57 +01:00
commit bc0945228d
25 changed files with 527 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

36
hm/common.nix
View file

@ -54,13 +54,13 @@ in
TIME_STYLE = "+%Y-%m-%d %H:%M:%S";
# Less colors
LESS = "-R";
LESS_TERMCAP_mb = "$'\E[1;31m'"; # begin blink
LESS_TERMCAP_md = "$'\E[1;36m'"; # begin bold
LESS_TERMCAP_me = "$'\E[0m'"; # reset bold/blink
LESS_TERMCAP_so = "$'\E[01;44;33m'"; # begin reverse video
LESS_TERMCAP_se = "$'\E[0m'"; # reset reverse video
LESS_TERMCAP_us = "$'\E[1;32m'"; # begin underline
LESS_TERMCAP_ue = "$'\E[0m'"; # reset underline
LESS_TERMCAP_mb = "$(echo $'\\E[1;31m')"; # begin blink
LESS_TERMCAP_md = "$(echo $'\\E[1;36m')"; # begin bold
LESS_TERMCAP_me = "$(echo $'\\E[0m')"; # reset bold/blink
LESS_TERMCAP_so = "$(echo $'\\E[01;44;33m')"; # begin reverse video
LESS_TERMCAP_se = "$(echo $'\\E[0m')"; # reset reverse video
LESS_TERMCAP_us = "$(echo $'\\E[1;32m')"; # begin underline
LESS_TERMCAP_ue = "$(echo $'\\E[0m')"; # reset underline
# Fzf
FZF_COMPLETION_OPTS = "${lib.strings.concatStringsSep " " config.programs.fzf.fileWidgetOptions}";
};
@ -138,7 +138,7 @@ in
# TODO Maybe make nixpkg wrapper instead? So it also works from dmenu
# Could also accept my fate... Home-manager doesn't necessarily make it easy to put things out of the home directory
historySize = 100000;
historyFile = "${config.xdg.cacheHome}/shell_history";
historyFile = "${config.xdg.stateHome}/shell_history";
in
{
@ -196,7 +196,10 @@ in
duration = "$( test -n \"$__TIMER\" && echo $(( $EPOCHREALTIME - $\{__TIMER:-EPOCHREALTIME})) || echo 0 )";
# UPST Implement this properly in home-manager, would allow for bash support
};
extraUpdatePS1 = ''unset __TIMER'';
extraUpdatePS1 = ''
unset __TIMER
echo -en "\033]0; $USER@$HOST $PWD\007"
'';
};
gpg = {
enable = true;
@ -245,6 +248,7 @@ in
less.enable = true;
git = {
enable = true;
package = pkgs.gitFull;
aliases = {
"git" = "!exec git"; # In case I write one too many git
};
@ -339,9 +343,9 @@ in
enableZshIntegration = true;
pinentryFlavor = "gtk2"; # Falls back to curses when needed
};
# TODO Doesn't activate units by default. For now, we'll consider this as a safety feature.
# TODO Syncs a bit too often, also constantly asks for passphrase, which is annoying.
git-sync = {
enable = true;
enable = false;
repositories = {
dotfiles = {
path = "${config.xdg.configHome}/dotfiles";
@ -408,6 +412,7 @@ in
powerline-go
# terminal essentials
file
moreutils
man
unzip
@ -462,7 +467,6 @@ in
khard
khal
todoman
syncthing
# TODO Lots of redundancy with other way things are defined here
@ -472,8 +476,8 @@ in
];
sessionVariables = {
# Favourite commands
PAGER = "${pkgs.less}/bin/less";
EDITOR = "${pkgs.neovim}/bin/nvim";
PAGER = "less";
EDITOR = "nvim";
# Extra config
BOOT9_PATH = "${config.xdg.dataHome}/citra-emu/sysdata/boot9.bin";
@ -489,7 +493,7 @@ in
YARN_DISABLE_SELF_UPDATE_CHECK = "true"; # This also disable the creation of a ~/.yarnrc file
} // lib.optionalAttrs config.frogeye.desktop.xorg {
# Favourite commands
VISUAL = "${pkgs.neovim}/bin/nvim";
VISUAL = "nvim";
BROWSER = "${config.programs.qutebrowser.package}/bin/qutebrowser";
# Extra config
@ -503,7 +507,7 @@ in
(builtins.toString ./scripts)
];
file = {
".face" = {
".face" = { # TODO Doesn't show on NixOS. See https://wiki.archlinux.org/title/LightDM#Changing_your_avatar ?
source = pkgs.runCommand "face.png" { } "${pkgs.inkscape}/bin/inkscape ${./face.svg} -w 1024 -o $out";
};
};