Login shell updates
Fix login shell to bash, remove passthrough. Set Konsole default command to launch fish, for use as interactive shell without potential issues that come from being the login shell Move some configured shell utilities to their own files in shell directory, stop importing zsh config (replaced by fish)
This commit is contained in:
parent
8c5c6ee528
commit
1e3bbe954e
|
@ -41,7 +41,6 @@
|
|||
inherit inputs;
|
||||
username = "pixelifytica";
|
||||
hostName = "Legion";
|
||||
loginShell = "bash";
|
||||
};
|
||||
modules = [ ./system/default.nix ];
|
||||
};
|
||||
|
@ -51,7 +50,6 @@
|
|||
inherit inputs;
|
||||
username = "pixelifytica";
|
||||
hostName = "Vanguard";
|
||||
loginShell = "bash";
|
||||
};
|
||||
modules = [ ./system/default.nix ];
|
||||
};
|
||||
|
@ -60,7 +58,6 @@
|
|||
inherit inputs;
|
||||
username = "pixelifytica";
|
||||
hostName = "Northstar";
|
||||
loginShell = "bash";
|
||||
};
|
||||
modules = [ ./system/default.nix ];
|
||||
};
|
||||
|
@ -70,7 +67,6 @@
|
|||
inherit inputs;
|
||||
username = "elitherl";
|
||||
hostName = "Tone";
|
||||
loginShell = "bash";
|
||||
};
|
||||
modules = [ ./system/default.nix ];
|
||||
};
|
||||
|
@ -79,7 +75,6 @@
|
|||
inherit inputs;
|
||||
username = "elitherl";
|
||||
hostName = "Ronin";
|
||||
loginShell = "bash";
|
||||
};
|
||||
modules = [ ./system/default.nix ];
|
||||
};
|
||||
|
|
|
@ -5,7 +5,6 @@
|
|||
inputs,
|
||||
username,
|
||||
hostName,
|
||||
loginShell,
|
||||
...
|
||||
}:
|
||||
{
|
||||
|
@ -110,9 +109,8 @@
|
|||
inherit authorizedKeys;
|
||||
};
|
||||
${username} = {
|
||||
shell = pkgs.${loginShell};
|
||||
group = "users";
|
||||
isNormalUser = true;
|
||||
group = "users";
|
||||
description = "Evie Litherland-Smith";
|
||||
extraGroups = [
|
||||
"networkmanager"
|
||||
|
@ -185,9 +183,9 @@
|
|||
localBinInPath = true;
|
||||
};
|
||||
programs = {
|
||||
${loginShell} = lib.mkIf (loginShell != "bash") { enable = true; };
|
||||
command-not-found.enable = false;
|
||||
ssh.startAgent = true;
|
||||
fish.enable = true;
|
||||
nano = {
|
||||
enable = true;
|
||||
syntaxHighlight = true;
|
||||
|
|
|
@ -1,4 +1,9 @@
|
|||
{ pkgs, fonts, ... }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
fonts,
|
||||
...
|
||||
}:
|
||||
{
|
||||
home.packages = [ pkgs.yakuake ];
|
||||
programs.konsole = {
|
||||
|
@ -8,6 +13,7 @@
|
|||
profiles.onelight = {
|
||||
name = "One-Light";
|
||||
colorScheme = "onelight";
|
||||
command = "${config.programs.fish}/bin/fish";
|
||||
font = {
|
||||
name = fonts.monospace.name;
|
||||
size = fonts.sizes.terminal;
|
||||
|
|
10
system/home/shell/bat.nix
Normal file
10
system/home/shell/bat.nix
Normal file
|
@ -0,0 +1,10 @@
|
|||
{ ... }:
|
||||
{
|
||||
programs.bat = {
|
||||
enable = true;
|
||||
config = {
|
||||
theme = "OneHalfLight";
|
||||
style = "plain,numbers,changes";
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,12 +1,16 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
imports = [
|
||||
./bat.nix
|
||||
./bottom.nix
|
||||
./direnv.nix
|
||||
./eza.nix
|
||||
./fastfetch.nix
|
||||
./fzf.nix
|
||||
./git.nix
|
||||
./readline.nix
|
||||
./ssh.nix
|
||||
./starship.nix
|
||||
./zsh.nix
|
||||
];
|
||||
home.packages = with pkgs; [
|
||||
rclone
|
||||
|
@ -14,53 +18,11 @@
|
|||
du-dust
|
||||
];
|
||||
programs = {
|
||||
bash = {
|
||||
enable = true;
|
||||
enableCompletion = true;
|
||||
};
|
||||
bat = {
|
||||
enable = true;
|
||||
config = {
|
||||
theme = "OneHalfLight";
|
||||
style = "plain,numbers,changes";
|
||||
};
|
||||
};
|
||||
eza = {
|
||||
enable = true;
|
||||
git = true;
|
||||
icons = true;
|
||||
extraOptions = [ "--octal-permissions" ];
|
||||
};
|
||||
direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
bash.enable = true;
|
||||
fish.enable = true;
|
||||
fd.enable = true;
|
||||
fzf = {
|
||||
enable = true;
|
||||
defaultCommand = "${pkgs.fd}/bin/fd --type f";
|
||||
changeDirWidgetCommand = "${pkgs.fd}/bin/fd --type d";
|
||||
fileWidgetCommand = "${pkgs.fd}/bin/fd --type f";
|
||||
};
|
||||
jq.enable = true;
|
||||
nix-index.enable = true;
|
||||
readline = {
|
||||
enable = true;
|
||||
variables = {
|
||||
bell-style = "visible";
|
||||
blink-matching-paren = "On";
|
||||
colored-completion-prefix = "On";
|
||||
colored-stats = "On";
|
||||
completion-ignore-case = "On";
|
||||
completion-map-case = "On";
|
||||
editing-mode = "emacs";
|
||||
expand-tilde = "On";
|
||||
horizontal-scroll-mode = "On";
|
||||
mark-directories = "On";
|
||||
mark-symlinked-directories = "On";
|
||||
visible-stats = "On";
|
||||
};
|
||||
};
|
||||
ripgrep.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
7
system/home/shell/direnv.nix
Normal file
7
system/home/shell/direnv.nix
Normal file
|
@ -0,0 +1,7 @@
|
|||
{ ... }:
|
||||
{
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
}
|
9
system/home/shell/eza.nix
Normal file
9
system/home/shell/eza.nix
Normal file
|
@ -0,0 +1,9 @@
|
|||
{ ... }:
|
||||
{
|
||||
programs.eza = {
|
||||
enable = true;
|
||||
git = true;
|
||||
icons = true;
|
||||
extraOptions = [ "--octal-permissions" ];
|
||||
};
|
||||
}
|
7
system/home/shell/fish.nix
Normal file
7
system/home/shell/fish.nix
Normal file
|
@ -0,0 +1,7 @@
|
|||
{ ... }:
|
||||
{
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
interactiveShellInit = "enable_transience";
|
||||
};
|
||||
}
|
9
system/home/shell/fzf.nix
Normal file
9
system/home/shell/fzf.nix
Normal file
|
@ -0,0 +1,9 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
programs.fzf = {
|
||||
enable = true;
|
||||
defaultCommand = "${pkgs.fd}/bin/fd --type f";
|
||||
changeDirWidgetCommand = "${pkgs.fd}/bin/fd --type d";
|
||||
fileWidgetCommand = "${pkgs.fd}/bin/fd --type f";
|
||||
};
|
||||
}
|
20
system/home/shell/readline.nix
Normal file
20
system/home/shell/readline.nix
Normal file
|
@ -0,0 +1,20 @@
|
|||
{ ... }:
|
||||
{
|
||||
programs.readline = {
|
||||
enable = true;
|
||||
variables = {
|
||||
bell-style = "visible";
|
||||
blink-matching-paren = "On";
|
||||
colored-completion-prefix = "On";
|
||||
colored-stats = "On";
|
||||
completion-ignore-case = "On";
|
||||
completion-map-case = "On";
|
||||
editing-mode = "emacs";
|
||||
expand-tilde = "On";
|
||||
horizontal-scroll-mode = "On";
|
||||
mark-directories = "On";
|
||||
mark-symlinked-directories = "On";
|
||||
visible-stats = "On";
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,8 +1,9 @@
|
|||
{ ... }:
|
||||
{
|
||||
programs.fish.interactiveShellInit = "enable_transience";
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableTransience = false;
|
||||
enableTransience = true;
|
||||
settings = {
|
||||
add_newline = true;
|
||||
aws.symbol = " ";
|
||||
|
|
Loading…
Reference in a new issue