kitchen/rice
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: fix stylix complaints

Browse source
This commit is contained in:
buffet 2024-05-09 17:07:49 +02:00
parent d1c0520c0e
commit d4aaf962c6
2 changed files with 74 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
hosts/alice/hardware-configuration.nix
View file

@ -12,10 +12,12 @@
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
boot.initrd.kernelModules = [];
boot.kernelModules = [];
boot.extraModulePackages = [];
boot = {
initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
initrd.kernelModules = [];
kernelModules = [];
extraModulePackages = [];
};
fileSystems."/" = {
device = "UUID=288cfd6e-dd6d-4ac4-bc2f-36c1309f8619";

134
users/buffet/bash.nix
View file

@ -8,75 +8,77 @@ in {
INPUTRC = inputrc;
};
programs.direnv.enableBashIntegration = true;
programs.fzf.enableBashIntegration = true;
programs = {
direnv.enableBashIntegration = true;
fzf.enableBashIntegration = true;
programs.bash = {
enable = true;
historyControl = ["erasedups" "ignorespace"];
bash = {
enable = true;
historyControl = ["erasedups" "ignorespace"];
shellAliases = {
e = "\"$EDITOR\"";
mkdir = "mkdir -p";
rg = "rg -S";
update = let
change-message = pkgs.writeScript "change-commit-message" ''
#!/bin/sh
sed -i '1s/.*/chore: update/' "$1"
'';
in "nix flake update --commit-lock-file && EDITOR=${change-message} git commit --amend";
shellAliases = {
e = "\"$EDITOR\"";
mkdir = "mkdir -p";
rg = "rg -S";
update = let
change-message = pkgs.writeScript "change-commit-message" ''
#!/bin/sh
sed -i '1s/.*/chore: update/' "$1"
'';
in "nix flake update --commit-lock-file && EDITOR=${change-message} git commit --amend";
};
shellOptions = [
"cdspell"
"checkjobs"
"extglob"
"globstar"
"histappend"
"nocaseglob"
];
bashrcExtra = ''
[[ -f ~/.profile ]] && . ~/.profile
'';
initExtra = ''
__prompt() {
local status="$?"
local row
local col
IFS=';' read -rs -dR -p $'\e[6n' row col >/dev/tty
if [[ $col != 1 ]]; then
printf '%s' $'\e[0;7m%\n\e[0m'
fi
PS1='\[\e[0;1m\]['
case $status in
0) PS1+='\[\e[32m\]' ;;
*) PS1+='\[\e[31m\]' ;;
esac
if [[ "$PWD" == "$HOME" ]]; then
PS1+="~"
elif [[ "$PWD" == / ]]; then
PS1+=/
else
PS1+="''${PWD##*/}"
fi
PS1+='\[\e[0;1m\]]\[\e[0m\]'
[[ $CONTAINER_ID ]] && PS1+="'"
PS1+=' '
}
PROMPT_COMMAND=__prompt
bind '"\C-o": "\C-a\C-k fg; if [[ $? == 1 ]]; then nvim; fi\n"'
bind '"\e\C-m": "\C-e | nvim\C-m"'
'';
};
shellOptions = [
"cdspell"
"checkjobs"
"extglob"
"globstar"
"histappend"
"nocaseglob"
];
bashrcExtra = ''
[[ -f ~/.profile ]] && . ~/.profile
'';
initExtra = ''
__prompt() {
local status="$?"
local row
local col
IFS=';' read -rs -dR -p $'\e[6n' row col >/dev/tty
if [[ $col != 1 ]]; then
printf '%s' $'\e[0;7m%\n\e[0m'
fi
PS1='\[\e[0;1m\]['
case $status in
0) PS1+='\[\e[32m\]' ;;
*) PS1+='\[\e[31m\]' ;;
esac
if [[ "$PWD" == "$HOME" ]]; then
PS1+="~"
elif [[ "$PWD" == / ]]; then
PS1+=/
else
PS1+="''${PWD##*/}"
fi
PS1+='\[\e[0;1m\]]\[\e[0m\]'
[[ $CONTAINER_ID ]] && PS1+="'"
PS1+=' '
}
PROMPT_COMMAND=__prompt
bind '"\C-o": "\C-a\C-k fg; if [[ $? == 1 ]]; then nvim; fi\n"'
bind '"\e\C-m": "\C-e | nvim\C-m"'
'';
};
};
}