home: enable hm and fish program for root
Signed-off-by: Myned <dev@bjork.tech>
This commit is contained in:
parent
0b0b1bd8ea
commit
fd09638278
GPG key ID:
C7224454F7881A34
3 changed files with 220 additions and 136 deletions
|
|
@ -157,7 +157,22 @@
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
};
|
};
|
||||||
|
|
||||||
users.${config.custom.username} = {
|
users = {
|
||||||
|
root = {
|
||||||
|
# Inherit from user
|
||||||
|
programs.home-manager.enable = config.home-manager.users.${config.custom.username}.programs.home-manager.enable;
|
||||||
|
systemd.user.startServices = config.home-manager.users.${config.custom.username}.systemd.user.startServices;
|
||||||
|
nixpkgs.config = config.home-manager.users.${config.custom.username}.nixpkgs.config;
|
||||||
|
nix.gc = config.home-manager.users.${config.custom.username}.nix.gc;
|
||||||
|
|
||||||
|
home = {
|
||||||
|
username = "root";
|
||||||
|
homeDirectory = "/root";
|
||||||
|
stateVersion = config.home-manager.users.${config.custom.username}.home.stateVersion;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
${config.custom.username} = {
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
systemd.user.startServices = "sd-switch"; # Start/stop user services immediately
|
systemd.user.startServices = "sd-switch"; # Start/stop user services immediately
|
||||||
|
|
||||||
|
|
@ -180,4 +195,5 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,58 +14,176 @@ in {
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
|
promptInit = ''
|
||||||
|
# Disable greeting
|
||||||
|
set -g fish_greeting
|
||||||
|
|
||||||
|
# Prompt
|
||||||
|
function fish_prompt --description 'Write out the prompt'
|
||||||
|
set -l last_status $status
|
||||||
|
set -l normal (set_color normal)
|
||||||
|
set -l status_color (set_color brgreen)
|
||||||
|
set -l cwd_color (set_color $fish_color_cwd)
|
||||||
|
set -l vcs_color (set_color brpurple)
|
||||||
|
set -l prompt_status ""
|
||||||
|
|
||||||
|
# Since we display the prompt on a new line allow the directory names to be longer.
|
||||||
|
set -q fish_prompt_pwd_dir_length
|
||||||
|
or set -lx fish_prompt_pwd_dir_length 0
|
||||||
|
|
||||||
|
# Color the prompt differently when we're root
|
||||||
|
set -l suffix '❯'
|
||||||
|
if functions -q fish_is_root_user; and fish_is_root_user
|
||||||
|
if set -q fish_color_cwd_root
|
||||||
|
set cwd_color (set_color $fish_color_cwd_root)
|
||||||
|
end
|
||||||
|
set suffix '#'
|
||||||
|
end
|
||||||
|
|
||||||
|
# Color the prompt in red on error
|
||||||
|
if test $last_status -ne 0
|
||||||
|
set status_color (set_color $fish_color_error)
|
||||||
|
set prompt_status $status_color "[" $last_status "]" $normal
|
||||||
|
end
|
||||||
|
|
||||||
|
echo -s (prompt_login) ' ' $cwd_color (prompt_pwd) $vcs_color (fish_vcs_prompt) $normal ' ' $prompt_status
|
||||||
|
echo -n -s $status_color $suffix ' ' $normal
|
||||||
|
end
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
home-manager.users = {
|
||||||
|
# Inherit root abbreviations from user
|
||||||
|
root.programs.fish = {
|
||||||
|
enable = true;
|
||||||
|
shellAbbrs = config.home-manager.users.${config.custom.username}.programs.fish.shellAbbrs;
|
||||||
|
};
|
||||||
|
|
||||||
|
${config.custom.username}.programs.fish = let
|
||||||
|
any = expansion: {
|
||||||
|
inherit expansion;
|
||||||
|
position = "anywhere";
|
||||||
|
};
|
||||||
|
in {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
shellAbbrs = {
|
shellAbbrs = {
|
||||||
|
# Expand abbreviations anywhere in the shell
|
||||||
|
#?? sudo ABBREVIATION
|
||||||
|
"/e" = any "/etc";
|
||||||
|
"/en" = any "/etc/nixos";
|
||||||
|
"/h" = any "~";
|
||||||
|
"/hd" = any "~/.dev";
|
||||||
|
"/n" = any "/nix";
|
||||||
|
"/nv" = any "/nix/var";
|
||||||
|
"/nvn" = any "/nix/var/nix";
|
||||||
|
"/nvnp" = any "/nix/var/nix/profiles";
|
||||||
|
"/nvnps" = any "/nix/var/nix/profiles/system";
|
||||||
|
"/r" = any "/run";
|
||||||
|
"/rc" = any "/run/current-system";
|
||||||
|
|
||||||
|
reboot = any "systemctl reboot";
|
||||||
|
restart = any "systemctl reboot";
|
||||||
|
poweroff = any "systemctl poweroff";
|
||||||
|
shutdown = any "systemctl poweroff";
|
||||||
|
|
||||||
|
backup = any "borgmatic -v 1 create --progress --stats";
|
||||||
|
extract = any "borgmatic -v 1 extract --progress";
|
||||||
|
init = any "borgmatic init -e repokey-blake2";
|
||||||
|
key = any "borgmatic key export";
|
||||||
|
list = any "borgmatic -v 1 list";
|
||||||
|
restore = any "borgmatic -v 1 restore";
|
||||||
|
|
||||||
|
rsync = any "rsync --info=progress2";
|
||||||
|
|
||||||
|
jc = any "journalctl";
|
||||||
|
jcs = any "journalctl --system";
|
||||||
|
jcse = any "journalctl --system --pager-end";
|
||||||
|
jcseu = any "journalctl --system --pager-end --unit";
|
||||||
|
jcsf = any "journalctl --system --follow";
|
||||||
|
jcsfu = any "journalctl --system --follow --unit";
|
||||||
|
jcsi = any "journalctl --system --identifier";
|
||||||
|
jcst = any "journalctl --system --target";
|
||||||
|
jcsu = any "journalctl --system --unit";
|
||||||
|
jcu = any "journalctl --user";
|
||||||
|
jcue = any "journalctl --user --pager-end";
|
||||||
|
jcueu = any "journalctl --user --pager-end --unit";
|
||||||
|
jcuf = any "journalctl --user --follow";
|
||||||
|
jcufu = any "journalctl --user --follow --unit";
|
||||||
|
jcui = any "journalctl --user --identifier";
|
||||||
|
jcut = any "journalctl --user --target";
|
||||||
|
jcuu = any "journalctl --user --unit";
|
||||||
|
|
||||||
|
sc = any "systemctl";
|
||||||
|
scp = any "systemctl poweroff";
|
||||||
|
scr = any "systemctl reboot";
|
||||||
|
scs = any "systemctl --system";
|
||||||
|
scsd = any "systemctl --system disable";
|
||||||
|
scsdn = any "systemctl --system disable --now";
|
||||||
|
scse = any "systemctl --system reenable";
|
||||||
|
scsen = any "systemctl --system reenable --now";
|
||||||
|
scsh = any "systemctl --system show";
|
||||||
|
scsl = any "systemctl --system list-unit-files";
|
||||||
|
scsm = any "systemctl --system mask";
|
||||||
|
scsr = any "systemctl --system restart";
|
||||||
|
scsrr = any "systemctl --system reload-or-restart";
|
||||||
|
scss = any "systemctl --system status";
|
||||||
|
scst = any "systemctl --system stop";
|
||||||
|
scsu = any "systemctl --system unmask";
|
||||||
|
scu = any "systemctl --user";
|
||||||
|
scud = any "systemctl --user disable";
|
||||||
|
scudn = any "systemctl --user disable --now";
|
||||||
|
scue = any "systemctl --user reenable";
|
||||||
|
scuen = any "systemctl --user reenable --now";
|
||||||
|
scuh = any "systemctl --user show";
|
||||||
|
scul = any "systemctl --user list-unit-files";
|
||||||
|
scum = any "systemctl --user mask";
|
||||||
|
scur = any "systemctl --user restart";
|
||||||
|
scurr = any "systemctl --user reload-or-restart";
|
||||||
|
scus = any "systemctl --user status";
|
||||||
|
scut = any "systemctl --user stop";
|
||||||
|
scuu = any "systemctl --user unmask";
|
||||||
|
|
||||||
|
d = any "docker";
|
||||||
|
dc = any "docker compose";
|
||||||
|
dcd = any "docker compose down";
|
||||||
|
dce = any "docker compose exec";
|
||||||
|
dcl = any "docker compose logs";
|
||||||
|
dcp = any "docker compose pull";
|
||||||
|
dcu = any "docker compose up";
|
||||||
|
dcuf = any "docker compose up --force-recreate";
|
||||||
|
de = any "docker exec";
|
||||||
|
dei = any "docker exec --interactive";
|
||||||
|
deit = any "docker exec --interactive --tty";
|
||||||
|
det = any "docker exec --tty";
|
||||||
|
di = any "docker images";
|
||||||
|
dk = any "docker kill";
|
||||||
|
dn = any "docker network";
|
||||||
|
dnl = any "docker network ls";
|
||||||
|
dp = any "docker pull";
|
||||||
|
dps = any "docker ps";
|
||||||
|
dpsa = any "docker ps --all --size";
|
||||||
|
dr = any "docker rm";
|
||||||
|
ds = any "docker system";
|
||||||
|
dsp = any "docker system prune";
|
||||||
|
dspav = any "docker system prune --all --volumes";
|
||||||
|
|
||||||
c = "clear";
|
c = "clear";
|
||||||
e = "exit";
|
e = "exit";
|
||||||
m = "mosh";
|
m = "mosh";
|
||||||
s = "ssh";
|
s = "ssh";
|
||||||
i = "tailscale ip --4";
|
|
||||||
|
|
||||||
"/h" = "cd ~";
|
ip = "tailscale ip --4";
|
||||||
"/hd" = "cd ~/.dev";
|
|
||||||
"/e" = "cd /etc";
|
|
||||||
"/en" = "cd /etc/nixos";
|
|
||||||
"/n" = "cd /nix";
|
|
||||||
"/nv" = "cd /nix/var";
|
|
||||||
"/nvn" = "cd /nix/var/nix";
|
|
||||||
"/nvnp" = "cd /nix/var/nix/profiles";
|
|
||||||
"/nvnps" = "cd /nix/var/nix/profiles/system";
|
|
||||||
"/r" = "cd /run";
|
|
||||||
"/rc" = "cd /run/current-system";
|
|
||||||
|
|
||||||
f = "flakegen";
|
n = "nixos";
|
||||||
r = "rebuild";
|
nb = "nixos build";
|
||||||
rb = "rebuild boot";
|
nbb = "nixos build boot";
|
||||||
rbp = "rebuild boot && poweroff";
|
nbs = "nixos build switch";
|
||||||
rbr = "rebuild boot && reboot";
|
nbt = "nixos build test";
|
||||||
rs = "rebuild switch";
|
nd = "nixos diff";
|
||||||
rt = "rebuild test";
|
ng = "nixos generate";
|
||||||
t = "target";
|
nl = "nixos list";
|
||||||
u = "upgrade";
|
nr = "nixos repl";
|
||||||
ub = "upgrade boot";
|
|
||||||
ubp = "upgrade boot && poweroff";
|
|
||||||
ubr = "upgrade boot && reboot";
|
|
||||||
|
|
||||||
nd = "nvd diff /run/current-system /nix/var/nix/profiles/system";
|
|
||||||
no = "nh os";
|
|
||||||
nb = "flakegen && nh os boot";
|
|
||||||
nbr = "flakegen && nh os boot && reboot";
|
|
||||||
nbp = "flakegen && nh os boot && poweroff";
|
|
||||||
ns = "flakegen && nh os switch";
|
|
||||||
nt = "flakegen && nh os test";
|
|
||||||
|
|
||||||
jc = "journalctl";
|
|
||||||
sc = "systemctl";
|
|
||||||
|
|
||||||
d = "docker";
|
|
||||||
dc = "docker compose";
|
|
||||||
dcd = "docker compose down";
|
|
||||||
dce = "docker compose exec";
|
|
||||||
dcl = "docker compose logs";
|
|
||||||
dcp = "docker compose pull";
|
|
||||||
dcu = "docker compose up";
|
|
||||||
dcuf = "docker compose up --force-recreate";
|
|
||||||
ds = "docker system";
|
|
||||||
|
|
||||||
g = "git";
|
g = "git";
|
||||||
gb = "git bisect";
|
gb = "git bisect";
|
||||||
|
|
@ -119,43 +237,7 @@ in {
|
||||||
waydroid app launch com.YoStarEN.Arknights
|
waydroid app launch com.YoStarEN.Arknights
|
||||||
end
|
end
|
||||||
'';
|
'';
|
||||||
|
};
|
||||||
promptInit = ''
|
|
||||||
# Disable greeting
|
|
||||||
set -g fish_greeting
|
|
||||||
|
|
||||||
# Prompt
|
|
||||||
function fish_prompt --description 'Write out the prompt'
|
|
||||||
set -l last_status $status
|
|
||||||
set -l normal (set_color normal)
|
|
||||||
set -l status_color (set_color brgreen)
|
|
||||||
set -l cwd_color (set_color $fish_color_cwd)
|
|
||||||
set -l vcs_color (set_color brpurple)
|
|
||||||
set -l prompt_status ""
|
|
||||||
|
|
||||||
# Since we display the prompt on a new line allow the directory names to be longer.
|
|
||||||
set -q fish_prompt_pwd_dir_length
|
|
||||||
or set -lx fish_prompt_pwd_dir_length 0
|
|
||||||
|
|
||||||
# Color the prompt differently when we're root
|
|
||||||
set -l suffix '❯'
|
|
||||||
if functions -q fish_is_root_user; and fish_is_root_user
|
|
||||||
if set -q fish_color_cwd_root
|
|
||||||
set cwd_color (set_color $fish_color_cwd_root)
|
|
||||||
end
|
|
||||||
set suffix '#'
|
|
||||||
end
|
|
||||||
|
|
||||||
# Color the prompt in red on error
|
|
||||||
if test $last_status -ne 0
|
|
||||||
set status_color (set_color $fish_color_error)
|
|
||||||
set prompt_status $status_color "[" $last_status "]" $normal
|
|
||||||
end
|
|
||||||
|
|
||||||
echo -s (prompt_login) ' ' $cwd_color (prompt_pwd) $vcs_color (fish_vcs_prompt) $normal ' ' $prompt_status
|
|
||||||
echo -n -s $status_color $suffix ' ' $normal
|
|
||||||
end
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -35,20 +35,6 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
backup = "sudo borgmatic -v 1 create --progress --stats";
|
|
||||||
extract = "sudo borgmatic -v 1 extract --progress";
|
|
||||||
restore = "sudo borgmatic -v 1 restore";
|
|
||||||
list = "sudo borgmatic -v 1 list";
|
|
||||||
init = "sudo borgmatic init -e repokey-blake2";
|
|
||||||
key = "sudo borgmatic key export";
|
|
||||||
|
|
||||||
reboot = "sudo systemctl reboot";
|
|
||||||
restart = "sudo systemctl reboot";
|
|
||||||
poweroff = "sudo systemctl poweroff";
|
|
||||||
shutdown = "sudo systemctl poweroff";
|
|
||||||
|
|
||||||
rsync = "rsync --info=progress2";
|
|
||||||
|
|
||||||
# https://github.com/aksiksi/compose2nix?tab=readme-ov-file#usage
|
# https://github.com/aksiksi/compose2nix?tab=readme-ov-file#usage
|
||||||
# https://github.com/aksiksi/compose2nix?tab=readme-ov-file#agenix
|
# https://github.com/aksiksi/compose2nix?tab=readme-ov-file#agenix
|
||||||
compose2nix = concatStringsSep " " [
|
compose2nix = concatStringsSep " " [
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue