delta/dotfiles
1
0
Fork 0
mirror of https://github.com/deltathetawastaken/dotfiles.git synced 2025-12-06 07:16:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

teleport + fish promt fixes + ssh+kitten fix

Browse source
This commit is contained in:
Your Name 2024-04-28 19:40:43 +03:00
parent cf61b7fa9b
commit 26596a1310
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
hosts/generic.nix
View file

@ -41,7 +41,9 @@ let
in { in {
environment.sessionVariables = { environment.sessionVariables = {
FLAKE = "/home/delta/Documents/dotfiles"; FLAKE = "/home/delta/Documents/dotfiles";
TELEPORT_LOGIN= "${inputs.secrets.work.tp-login}";
}; };
environment.variables.EDITOR = "hx";
users.users.delta = { users.users.delta = {
@ -60,10 +62,12 @@ in {
substituters = [ substituters = [
"https://shwewo.cachix.org" "https://shwewo.cachix.org"
"https://anyrun.cachix.org" "https://anyrun.cachix.org"
# "https://nyx.chaotic.cx/"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"shwewo.cachix.org-1:84cIX7ETlqQwAWHBnd51cD4BeUVXCyGbFdtp+vLxKOo=" "shwewo.cachix.org-1:84cIX7ETlqQwAWHBnd51cD4BeUVXCyGbFdtp+vLxKOo="
"anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
# "nyx.chaotic.cx-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8=" "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
]; ];
}; };
package = unstable.nixUnstable; package = unstable.nixUnstable;
@ -79,10 +83,11 @@ in {
helix micro helix micro
fishPlugins.grc grc fishPlugins.grc grc
fishPlugins.autopair fishPlugins.autopair
fishPlugins.z zoxide #better fishPlugins.z
fishPlugins.tide starship # my fish promt
fishPlugins.sponge fishPlugins.sponge
fishPlugins.fzf-fish fishPlugins.fzf-fish
fishPlugins.puffer
bat #for fzf-fish plugin bat #for fzf-fish plugin
fzf #for fzf-fish plugin fzf #for fzf-fish plugin
fd #for fzf-fish plugin fd #for fzf-fish plugin
@ -104,11 +109,11 @@ in {
]; ];
environment.variables.EDITOR = "hx";
programs.command-not-found.enable = false; programs.command-not-found.enable = false;
programs.fish = { programs.fish = {
enable = true; enable = true;
useBabelfish = true;
shellAliases = { shellAliases = {
rebuild = "nh os switch"; rebuild = "nh os switch";
rollback = "sudo nixos-rebuild switch --rollback --flake ~/Documents/dotfiles/"; rollback = "sudo nixos-rebuild switch --rollback --flake ~/Documents/dotfiles/";
@ -116,13 +121,15 @@ in {
ls = "${pkgs.lsd}/bin/lsd"; ls = "${pkgs.lsd}/bin/lsd";
search = "nix-search -d -m 5 -p"; search = "nix-search -d -m 5 -p";
ltree = "${pkgs.lsd}/bin/lsd --tree"; ltree = "${pkgs.lsd}/bin/lsd --tree";
#nix = "any-nix-shell fish --info-right | source && ${pkgs.nixUnstable}/bin/nix"; unpack = "aunpack";
#nix-shell = "any-nix-shell fish --info-right | source && ${pkgs.nixUnstable}/bin/nix-shell"; where = "which";
}; };
promptInit = '' promptInit = ''
set TERM "xterm-256color" set TERM "xterm-256color"
set fish_greeting set fish_greeting
tide configure --auto --style=Lean --prompt_colors='16 colors' --show_time=No --lean_prompt_height='Two lines' --prompt_connection=Disconnected --prompt_spacing=Compact --icons='Few icons' --transient=No export STARSHIP_CONFIG=/etc/starship.toml
${pkgs.zoxide}/bin/zoxide init fish | source
source (${pkgs.starship}/bin/starship init fish --print-full-init | psub)
any-nix-shell fish --info-right | source any-nix-shell fish --info-right | source
''; '';
}; };
@ -143,6 +150,10 @@ in {
security.rtkit.enable = true; security.rtkit.enable = true;
boot.tmp.cleanOnBoot = true; boot.tmp.cleanOnBoot = true;
environment.etc."starship.toml".text = ''
add_newline = false
'';
environment.etc."htoprc".text = '' environment.etc."htoprc".text = ''
config_reader_min_version=3 config_reader_min_version=3
fields=0 48 46 47 49 1 fields=0 48 46 47 49 1