Setup Bash with Starship
This commit is contained in:
parent
1f2119ca25
commit
a1f35cf72d
26
flake.lock
26
flake.lock
|
@ -39,11 +39,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1725753098,
|
"lastModified": 1726665257,
|
||||||
"narHash": "sha256-/NO/h/qD/eJXAQr/fHA4mdDgYsNT9thHQ+oT6KPi2ac=",
|
"narHash": "sha256-rEzEZtd3iyVo5RJ1OGujOlnywNf3gsrOnjAn1NLciD4=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "aquamarine",
|
"repo": "aquamarine",
|
||||||
"rev": "e4a13203112a036fc7f437d391c7810f3dd5ab52",
|
"rev": "752d0fbd141fabb5a1e7f865199b80e6e76f8d8e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -99,11 +99,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726440980,
|
"lastModified": 1726823634,
|
||||||
"narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
|
"narHash": "sha256-rU8Yy62KSLU8Q2J64F+50OJKORNdogxbXl2w4rFw13o=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
|
"rev": "4803bf558bdf20cb067aceb8830b7ad70113f4e3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -153,11 +153,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726568694,
|
"lastModified": 1726825661,
|
||||||
"narHash": "sha256-p062OTW1DpebeGVwoOvgjtwfC21sWLnF1KVcHk5phwY=",
|
"narHash": "sha256-bnUrJnpDHtfnb6gJwJPBS74kVXnZrecpNbVlq75Oqeg=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "e72ae6b25fe019404df31e783ae980f80d3eaa3c",
|
"rev": "9e98fb0167f8bc6c5eb4510a65b42aaa3b743421",
|
||||||
"revCount": 5225,
|
"revCount": 5241,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland"
|
"url": "https://github.com/hyprwm/Hyprland"
|
||||||
|
@ -355,11 +355,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726569072,
|
"lastModified": 1726824598,
|
||||||
"narHash": "sha256-x33fIaVSJGc/kLiXh+a8x97GrMN1DtnRd8Ar50sDaNs=",
|
"narHash": "sha256-kFWCW7nD9RoUbrlNW1lE9ElmtSmWD/E9HMNJ7z3fJ8o=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "48b58426a0fb447bad367813e742247dc860bed6",
|
"rev": "cf86f6490757943388c0770c3a68845b172e8f76",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -9,22 +9,6 @@
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
distrobox
|
distrobox
|
||||||
texliveFull
|
|
||||||
nmap
|
|
||||||
arp-scan
|
|
||||||
chromium
|
|
||||||
stress
|
|
||||||
jellyfin-media-player
|
|
||||||
gocryptfs
|
|
||||||
cmake
|
|
||||||
virt-manager
|
|
||||||
wol
|
|
||||||
dig
|
|
||||||
file
|
|
||||||
zip
|
|
||||||
yubioath-flutter
|
|
||||||
obsidian
|
|
||||||
OVMFFull
|
|
||||||
];
|
];
|
||||||
|
|
||||||
services.hyprpaper = {
|
services.hyprpaper = {
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
];
|
];
|
||||||
programs.ssh.matchBlocks."*".identityFile = "/home/server/.secrets/SSH/Kell/id_ed25519";
|
programs.ssh.matchBlocks."*".identityFile = "/home/server/.secrets/SSH/Kell/id_ed25519";
|
||||||
|
|
||||||
|
|
||||||
dconf.settings = {
|
dconf.settings = {
|
||||||
"org/virt-manager/virt-manager/connections" = {
|
"org/virt-manager/virt-manager/connections" = {
|
||||||
autoconnect = ["qemu:///system"];
|
autoconnect = ["qemu:///system"];
|
||||||
|
|
|
@ -0,0 +1,77 @@
|
||||||
|
{ config, inputs, pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
programs.starship = {
|
||||||
|
enable = true;
|
||||||
|
enableBashIntegration = true;
|
||||||
|
enableZshIntegration = false;
|
||||||
|
settings = {
|
||||||
|
add_newline = false;
|
||||||
|
format = "$nix_shell$username$hostname[](bg:#0F7FCF fg:prev_bg)$directory$git_branch$git_status[](fg:prev_bg) ";
|
||||||
|
right_format = "";
|
||||||
|
username = {
|
||||||
|
show_always = true;
|
||||||
|
style_user = "bg:#121213";
|
||||||
|
style_root = "bg:#EA2C38";
|
||||||
|
format = "[ $user]($style)";
|
||||||
|
disabled = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
hostname = {
|
||||||
|
disabled = false;
|
||||||
|
ssh_only = false;
|
||||||
|
format = "[@$hostname ]($style)";
|
||||||
|
style = "bg:#121213";
|
||||||
|
};
|
||||||
|
|
||||||
|
directory = {
|
||||||
|
style = "bg:#0F7FCF fg:#080808";
|
||||||
|
format = "[ $path ]($style)";
|
||||||
|
truncation_length = 3;
|
||||||
|
truncation_symbol = ".../";
|
||||||
|
};
|
||||||
|
|
||||||
|
git_branch = {
|
||||||
|
symbol = "";
|
||||||
|
style = "bg:#DFD460 fg:#080808";
|
||||||
|
format = "[](fg:prev_bg bg:#DFD460)[ $symbol $branch ]($style)";
|
||||||
|
};
|
||||||
|
|
||||||
|
git_status = {
|
||||||
|
style = "bg:#DFD460 fg:#080808";
|
||||||
|
format = "[$all_status$ahead_behind ]($style)";
|
||||||
|
};
|
||||||
|
|
||||||
|
nix_shell = {
|
||||||
|
symbol = "";
|
||||||
|
style = "bg:#0F7FCF fg:#080808";
|
||||||
|
format = "[ $symbol ]($style)[](fg:#0F7FCF bg:#121213)";
|
||||||
|
disabled = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
programs.bash = {
|
||||||
|
enable = true;
|
||||||
|
enableCompletion = true;
|
||||||
|
historySize = 10000000;
|
||||||
|
historyFile = "${config.xdg.dataHome}/bash/history";
|
||||||
|
initExtra = ''
|
||||||
|
bind 'set show-all-if-ambiguous on'
|
||||||
|
bind 'set completion-ignore-case on'
|
||||||
|
bind 'TAB:menu-complete'
|
||||||
|
bind '"\e[A": history-search-backward'
|
||||||
|
bind '"\e[B": history-search-forward'
|
||||||
|
'';
|
||||||
|
shellAliases = {
|
||||||
|
ll = "ls -lhat";
|
||||||
|
ls = "ls --color=auto";
|
||||||
|
lf = ''cd "$(${pkgs.lf}/bin/lf -print-last-dir)"'';
|
||||||
|
wget = ''wget --hsts-file = "$XDG_DATA_HOME/wget-hsts"'';
|
||||||
|
python = "python3";
|
||||||
|
vim = "nvim";
|
||||||
|
v = ''nvim -c ':lua require("oil").open()' && cd "$(cat /tmp/oil_dir 2> /dev/null || pwd)"'';
|
||||||
|
rg = "rg -i --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'";
|
||||||
|
reset = "tput reset";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -3,6 +3,7 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
(import ../zsh { inherit inputs config pkgs; })
|
(import ../zsh { inherit inputs config pkgs; })
|
||||||
|
(import ../bash { inherit inputs config pkgs; })
|
||||||
../git
|
../git
|
||||||
../nvim
|
../nvim
|
||||||
../email
|
../email
|
||||||
|
|
|
@ -21,12 +21,24 @@
|
||||||
evince
|
evince
|
||||||
loupe
|
loupe
|
||||||
gimp
|
gimp
|
||||||
# obs-studio
|
obs-studio
|
||||||
inkscape
|
inkscape
|
||||||
gnome-calendar
|
gnome-calendar
|
||||||
file-roller
|
file-roller
|
||||||
zip
|
zip
|
||||||
heroic
|
heroic
|
||||||
|
cmake
|
||||||
|
jellyfin-media-player
|
||||||
|
chromium
|
||||||
|
nmap
|
||||||
|
arp-scan
|
||||||
|
virt-manager
|
||||||
|
wol
|
||||||
|
dig
|
||||||
|
file
|
||||||
|
zip
|
||||||
|
yubioath-flutter
|
||||||
|
obsidian
|
||||||
];
|
];
|
||||||
|
|
||||||
services.kdeconnect = {
|
services.kdeconnect = {
|
||||||
|
|
|
@ -50,11 +50,6 @@
|
||||||
)}"
|
)}"
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
programs.command-not-found.enable = true;
|
|
||||||
programs.zoxide = {
|
|
||||||
enable = true;
|
|
||||||
enableZshIntegration = true;
|
|
||||||
};
|
|
||||||
programs.fzf = { enable = true; };
|
programs.fzf = { enable = true; };
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
Loading…
Reference in New Issue